You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/07/11 16:13:07 UTC
[geode] branch feature/GEODE-5363 created (now a01271b)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a change to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git.
at a01271b GEODE-5363: Rebase cleanup
This branch includes the following new commits:
new eb6aae0 GEODE-5363: Creates integration test source set.
new 63f0d88 GEODE-5363: Move integration tests to new directory.
new e1fa87e GEODE-5363: Creates distributed test source set.
new 35693ba GEODE-5363: Moves distributed tests into new source set.
new fd8e66e GEODE-5363: Moves distributed tests into new source set.
new dc3f323 GEODE-5363: Moves distributed tests into new source set.
new 1f4b251 GEODE-5363: Moves distributed tests into new source set.
new 2b6d256 GEODE-5363: Moves distributed tests into new source set.
new 87623b1 GEODE-5363: Moves performance tests into new source set.
new 9a02153 GEODE-5363: Moves pulse tests into new source sets.
new 4dc6086 GEODE-5363: Moves geode-junit tests into new source sets.
new a21d027 GEODE-5363: Moves geode-wan tests into new source sets.
new c618c3a GEODE-5363: Moves geode-cq tests into new source sets.
new 4b41ef6 GEODE-5363: Moves geode-lucene tests into new source sets.
new 76ad7b4 GEODE-5363: Moves geode-assembly tests into new source sets.
new 809792f GEODE-5363: Moves geode-modules tests into new source sets.
new c391aa6 GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets.
new c90d7e7 GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets.
new 3fd9c3f GEODE-5363: Moves geode-modules-session tests into new source sets.
new 62e0e72 GEODE-5363: Moves geode-web-api tests into new source sets.
new ad28899 GEODE-5363: Moves geode-web tests into new source sets.
new c3a8ec6 GEODE-5363: Moves geode-rebalancer tests into new source sets.
new dbdd63b GEODE-5363: Moves geode-protobuf tests into new source sets.
new 79a48be GEODE-5363: Moves geode-experimental-driver tests into new source sets.
new 10ecd0a GEODE-5363: Moves geode-old-client-support tests into new source sets.
new 3ab17cb GEODE-5363: Cleanup dependencies and format.
new 8bebc44 GEODE-5363: Don't use UnitTest category to run unit tests.
new 580cb2c GEODE-5363: Remove UnitTest category from unit tests.
new c4a5128 GEODE-5363: Cleanup unit tests.
new 3a3331e GEODE-5363: Run integration tests from new source set.
new 352d4ab GEODE-5363: Move codeAnalysis resources to integrationTest
new 76614c8 GEODE-5363: Removes IntegrationTest category.
new 6d7ecaf GEODE-5363: Fixes tomcat tests.
new 836dccd GEODE-5363: Ignore inner classes.
new 4951855 GEODE-5363: Cleanup
new 9368439 GEODE-5363: Fixes tomcat tests.
new 4523d8d GEODE-5363: Allow parallel tests.
new e2383f3 GEODE-5363: Rebase cleanup.
new 4dd085a GEODE-5363: Run distributed tests from new sourceSet
new 042d7ac GEODE-5363: Removes DistributedTest category.
new 2cd9583 GEODE-5363: Run acceptanceTest from new source set.
new 02d42d1 GEODE-5363: Remove acceptanceTest category
new 011a66a GEODE-5363: Remove parallel changes.
new bd5ceda GEODE-5363: Remove category filter.
new 05d2560 GEODE-5363: Run uiTests from new source set.
new a01271b GEODE-5363: Rebase cleanup
The 46 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 37/46: GEODE-5363: Allow parallel tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4523d8d5db576fbce7a4232216df72adf18e8e41
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 17:29:29 2018 -0700
GEODE-5363: Allow parallel tests.
---
gradle/test.gradle | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index e7e9e58..ea0192d 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -103,6 +103,12 @@ subprojects {
}
forkEvery 1
+
+ if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+ if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
[geode] 23/46: GEODE-5363: Moves geode-protobuf tests into new
source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit dbdd63b4a4eb64173407d69b4f379ecabfeeb611
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:23:25 2018 -0700
GEODE-5363: Moves geode-protobuf tests into new source sets.
---
geode-protobuf/build.gradle | 45 ++++++++++++++++++++++
.../v1/acceptance/CacheConnectionJUnitTest.java | 0
.../CacheConnectionTimeoutJUnitTest.java | 0
.../v1/acceptance/CacheMaxConnectionJUnitTest.java | 0
.../v1/acceptance/CacheOperationsJUnitTest.java | 0
.../LocatorConnectionAuthenticationDUnitTest.java | 0
.../v1/acceptance/LocatorConnectionDUnitTest.java | 0
.../GetAndPutJsonDocumentsDUnitTest.java | 0
.../protobuf/v1/AuthenticationIntegrationTest.java | 0
.../protobuf/v1/AuthorizationIntegrationTest.java | 0
.../v1/DisconnectClientIntegrationTest.java | 0
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 0
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 0
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 0
.../v1/ProtocolVersionIntegrationTest.java | 0
.../v1/ValueSerializerIntegrationTest.java | 0
.../PutIfAbsentRequestIntegrationTest.java | 0
.../PutAllRequestOperationHandlerJUnitTest.java | 3 +-
18 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index f0a0c49..a5cba86 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -30,3 +30,48 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ acceptanceTestCompile.extendsFrom testCompile
+ acceptanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+ acceptanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ acceptanceTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ acceptanceTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionJUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheConnectionTimeoutJUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheMaxConnectionJUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/CacheOperationsJUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionAuthenticationDUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java b/geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
rename to geode-protobuf/src/acceptanceTest/java/org/apache/geode/internal/protocol/protobuf/v1/acceptance/LocatorConnectionDUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java b/geode-protobuf/src/distributedTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
rename to geode-protobuf/src/distributedTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetAndPutJsonDocumentsDUnitTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthenticationIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/AuthorizationIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/DisconnectClientIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnGroupIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnMemberIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ExecuteFunctionOnRegionIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ProtocolVersionIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/ValueSerializerIntegrationTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java b/geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
similarity index 100%
rename from geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
rename to geode-protobuf/src/integrationTest/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestIntegrationTest.java
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 cc91ad6..21e99bb 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
@@ -43,7 +43,6 @@ import org.apache.geode.internal.protocol.protobuf.v1.Success;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.DecodingException;
import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.EncodingException;
import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilities;
-import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -107,7 +106,7 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
Result result = operationHandler.process(serializationService, generateTestRequest(false, true),
getNoAuthCacheExecutionContext(cacheStub));
- Assert.assertTrue(result instanceof Success);
+ assertTrue(result instanceof Success);
verify(regionMock).put(TEST_KEY1, TEST_VALUE1);
verify(regionMock).put(TEST_KEY2, TEST_VALUE2);
[geode] 20/46: GEODE-5363: Moves geode-web-api tests into new
source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 62e0e72b7201cb3ebd15358d78356d68ca5f7145
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:11:03 2018 -0700
GEODE-5363: Moves geode-web-api tests into new source sets.
---
geode-web-api/build.gradle | 33 ++++++++++++++++++++++
.../AnalyzeWebApiSerializablesJUnitTest.java | 0
2 files changed, 33 insertions(+)
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 346e3c8..c3d5bb2 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -72,3 +72,36 @@ war {
// from the runtime classpath
classpath configurations.runtime
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java b/geode-web-api/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
similarity index 100%
rename from geode-web-api/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
rename to geode-web-api/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWebApiSerializablesJUnitTest.java
[geode] 28/46: GEODE-5363: Remove UnitTest category from unit tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 580cb2c05930ba820f693e9aec2d351658ad3e90
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 14:25:37 2018 -0700
GEODE-5363: Remove UnitTest category from unit tests.
---
.../geode/modules/util/ClassLoaderObjectInputStreamTest.java | 1 -
.../management/internal/cli/commands/StartLocatorCommandTest.java | 1 -
.../management/internal/cli/commands/StartServerCommandTest.java | 1 -
.../test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java | 2 +-
.../java/org/apache/geode/annotations/ExperimentalJUnitTest.java | 1 -
.../java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java | 1 -
.../apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java | 1 -
.../test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java | 1 -
.../test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java | 1 -
.../geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java | 1 -
.../org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java | 1 -
.../geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java | 1 -
.../geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java | 1 -
.../apache/geode/connectors/jdbc/internal/RegionMappingTest.java | 1 -
.../org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java | 1 -
.../geode/connectors/jdbc/internal/SqlStatementFactoryTest.java | 1 -
.../connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java | 1 -
.../geode/connectors/jdbc/internal/TableMetaDataManagerTest.java | 1 -
.../connectors/jdbc/internal/cli/AlterConnectionCommandTest.java | 1 -
.../connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java | 1 -
.../connectors/jdbc/internal/cli/AlterMappingCommandTest.java | 1 -
.../connectors/jdbc/internal/cli/AlterMappingFunctionTest.java | 1 -
.../connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java | 1 -
.../connectors/jdbc/internal/cli/CreateMappingFunctionTest.java | 1 -
.../jdbc/internal/cli/DescribeConnectionCommandTest.java | 1 -
.../jdbc/internal/cli/DescribeConnectionFunctionTest.java | 1 -
.../connectors/jdbc/internal/cli/DescribeMappingCommandTest.java | 1 -
.../connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java | 1 -
.../jdbc/internal/cli/DestroyConnectionFunctionTest.java | 1 -
.../jdbc/internal/cli/DestroyMappingCommandFunctionTest.java | 1 -
.../jdbc/internal/cli/FunctionContextArgumentProviderTest.java | 1 -
.../connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java | 1 -
.../connectors/jdbc/internal/cli/ListConnectionCommandTest.java | 1 -
.../connectors/jdbc/internal/cli/ListConnectionFunctionTest.java | 1 -
.../geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java | 1 -
.../connectors/jdbc/internal/cli/ListMappingFunctionTest.java | 1 -
.../jdbc/internal/configuration/ConnectorServiceTest.java | 1 -
.../apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java | 1 -
.../jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java | 1 -
.../connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java | 1 -
.../apache/geode/distributed/AbstractLauncherServiceStateTest.java | 1 -
.../java/org/apache/geode/distributed/AbstractLauncherTest.java | 1 -
.../org/apache/geode/distributed/DistributedSystemJUnitTest.java | 2 +-
.../org/apache/geode/distributed/LocatorLauncherBuilderTest.java | 1 -
.../java/org/apache/geode/distributed/LocatorLauncherTest.java | 1 -
.../java/org/apache/geode/distributed/LocatorStateTest.java | 1 -
.../org/apache/geode/distributed/ServerLauncherBuilderTest.java | 1 -
.../java/org/apache/geode/distributed/ServerLauncherTest.java | 1 -
.../distributed/ServerLauncherWaitOnServerMultiThreadedTest.java | 1 -
.../distributed/internal/AtomicLongWithTerminalStateJUnitTest.java | 1 -
.../geode/distributed/internal/ClusterDistributionManagerTest.java | 1 -
.../apache/geode/distributed/internal/DistributionAdvisorTest.java | 1 -
.../geode/distributed/internal/DistributionConfigJUnitTest.java | 2 +-
.../apache/geode/distributed/internal/DistributionMessageTest.java | 2 +-
.../internal/InternalConfigurationPersistenceServiceTest.java | 1 -
.../geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java | 2 +-
.../apache/geode/distributed/internal/ProductUseLogJUnitTest.java | 2 +-
.../apache/geode/distributed/internal/ReplyProcessor21Test.java | 2 +-
.../apache/geode/distributed/internal/ServerLocatorJUnitTest.java | 2 +-
.../geode/distributed/internal/StartupMessageDataJUnitTest.java | 2 +-
.../geode/distributed/internal/deadlock/DeadlockDetectorTest.java | 1 -
.../distributed/internal/deadlock/DependencyGraphJUnitTest.java | 1 -
.../distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java | 1 -
.../distributed/internal/membership/InternalRoleJUnitTest.java | 2 +-
.../geode/distributed/internal/membership/NetViewJUnitTest.java | 2 +-
.../distributed/internal/membership/gms/GMSMemberJUnitTest.java | 2 +-
.../membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java | 2 +-
.../gms/auth/GMSAuthenticatorWithSecurityManagerTest.java | 2 +-
.../internal/membership/gms/membership/StatRecorderJUnitTest.java | 2 +-
.../partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java | 1 -
.../geode/internal/cache/versions/RegionVersionVectorTest.java | 1 -
.../apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java | 1 -
geode-core/src/test/java/org/apache/geode/DataSerializerTest.java | 2 +-
geode-core/src/test/java/org/apache/geode/InstantiatorTest.java | 1 -
.../src/test/java/org/apache/geode/SystemFailureJUnitTest.java | 2 +-
.../src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java | 1 -
.../java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java | 1 -
.../java/org/apache/geode/cache/AttributesFactoryJUnitTest.java | 1 -
.../test/java/org/apache/geode/cache/DiskAccessExceptionTest.java | 1 -
.../test/java/org/apache/geode/cache/ExpirationAttributesTest.java | 1 -
.../FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java | 1 -
.../cache/MembershipAttributesAreSerializableRegressionTest.java | 2 +-
.../src/test/java/org/apache/geode/cache/OperationJUnitTest.java | 1 -
.../java/org/apache/geode/cache/RegionNameValidationJUnitTest.java | 1 -
.../src/test/java/org/apache/geode/cache/RegionShortcutTest.java | 1 -
.../test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java | 1 -
.../org/apache/geode/cache/client/internal/AbstractOpTest.java | 2 +-
.../geode/cache/client/internal/ConnectionConnectorTest.java | 1 -
.../geode/cache/client/internal/ConnectionFactoryJUnitTest.java | 1 -
.../geode/cache/client/internal/OpExecutorImplJUnitTest.java | 2 +-
.../geode/cache/client/internal/QueueConnectionImplJUnitTest.java | 2 +-
.../geode/cache/client/internal/ServerBlackListJUnitTest.java | 2 +-
.../SingleHopClientExecutorSubmitTaskWithExceptionTest.java | 2 +-
.../org/apache/geode/cache/client/internal/TXFailoverOpTest.java | 1 -
.../client/internal/locator/LocatorStatusResponseJUnitTest.java | 2 +-
.../java/org/apache/geode/cache/configuration/CacheConfigTest.java | 1 -
.../org/apache/geode/cache/configuration/DeclarableTypeTest.java | 1 -
.../org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java | 1 -
.../java/org/apache/geode/cache/execute/FunctionExceptionTest.java | 1 -
.../src/test/java/org/apache/geode/cache/query/IndexTypeTest.java | 2 +-
.../geode/cache/query/functional/JavaSerializationJUnitTest.java | 1 -
.../cache/query/internal/CompiledAggregateFunctionJUnitTest.java | 1 -
.../org/apache/geode/cache/query/internal/CompiledInJUnitTest.java | 1 -
.../geode/cache/query/internal/CompiledIteratorDefJUnitTest.java | 1 -
.../geode/cache/query/internal/NWayMergeResultsJUnitTest.java | 1 -
.../geode/cache/query/internal/QueryExecutionContextJUnitTest.java | 1 -
.../cache/query/internal/QueryObjectSerializationJUnitTest.java | 1 -
.../query/internal/RestrictedMethodInvocationAuthorizerTest.java | 2 +-
.../org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java | 1 -
.../cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java | 1 -
.../query/internal/ResultsCollectionWrapperLimitJUnitTest.java | 1 -
.../cache/query/internal/SelectResultsComparatorJUnitTest.java | 1 -
.../cache/query/internal/StructBagLimitBehaviourJUnitTest.java | 1 -
.../org/apache/geode/cache/query/internal/StructSetJUnitTest.java | 1 -
.../geode/cache/query/internal/aggregate/AggregatorJUnitTest.java | 1 -
.../geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java | 1 -
.../geode/cache/query/internal/index/HashIndexSetJUnitTest.java | 1 -
.../geode/cache/query/internal/index/IndexElemArrayJUnitTest.java | 1 -
.../cache/query/internal/index/MemoryIndexStoreJUnitTest.java | 1 -
.../index/MemoryIndexStoreWithInplaceModificationJUnitTest.java | 1 -
.../org/apache/geode/cache/query/internal/parse/OQLParserTest.java | 1 -
.../geode/cache/query/internal/types/TypeUtilsJUnitTest.java | 1 -
.../geode/cache/server/internal/ConnectionCountProbeJUnitTest.java | 1 -
.../org/apache/geode/cache/server/internal/LoadMonitorTest.java | 1 -
.../geode/cache/util/StringPrefixPartitionResolverJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/AbstractConfigTest.java | 1 -
.../src/test/java/org/apache/geode/internal/AssertJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/ClassPathLoaderTest.java | 1 -
.../test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java | 1 -
.../org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java | 1 -
geode-core/src/test/java/org/apache/geode/internal/DSCODETest.java | 2 +-
.../java/org/apache/geode/internal/DataSerializableJUnitTest.java | 2 +-
.../org/apache/geode/internal/DataSerializerHolderJUnitTest.java | 1 -
.../java/org/apache/geode/internal/GemFireVersionJUnitTest.java | 1 -
.../org/apache/geode/internal/HeapDataOutputStreamJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/HeapDataOutputStreamTest.java | 2 +-
.../org/apache/geode/internal/InternalDataSerializerJUnitTest.java | 2 +-
.../geode/internal/InternalDataSerializerQuickcheckStringTest.java | 2 +-
.../internal/InternalDataSerializerSerializationWhitelistTest.java | 2 +-
.../test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/NanoTimerJUnitTest.java | 1 -
.../java/org/apache/geode/internal/ObjIdConcurrentMapTest.java | 1 -
.../src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java | 1 -
.../org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java | 1 -
.../org/apache/geode/internal/PutAllOperationContextJUnitTest.java | 1 -
.../java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java | 1 -
.../src/test/java/org/apache/geode/internal/VersionJUnitTest.java | 1 -
.../internal/admin/remote/DistributionLocatorIdJUnitTest.java | 1 -
.../geode/internal/admin/remote/RemoteGfManagerAgentTest.java | 1 -
.../org/apache/geode/internal/cache/AbstractDiskRegionTest.java | 1 -
.../geode/internal/cache/AbstractOplogDiskRegionEntryTest.java | 1 -
.../org/apache/geode/internal/cache/AbstractRegionJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/AbstractRegionMapTest.java | 1 -
.../geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java | 1 -
.../java/org/apache/geode/internal/cache/AbstractRegionTest.java | 1 -
.../java/org/apache/geode/internal/cache/BucketAdvisorTest.java | 1 -
.../apache/geode/internal/cache/BucketPersistenceAdvisorTest.java | 1 -
.../apache/geode/internal/cache/BucketRedundancyTrackerTest.java | 1 -
.../org/apache/geode/internal/cache/BucketRegionJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/CacheOperationMessageTest.java | 1 -
.../java/org/apache/geode/internal/cache/CacheProfileTest.java | 1 -
.../apache/geode/internal/cache/CacheServerLauncherJUnitTest.java | 1 -
.../java/org/apache/geode/internal/cache/ColocationHelperTest.java | 1 -
.../java/org/apache/geode/internal/cache/DestroyMessageTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java | 1 -
.../java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/DiskUsageTest.java | 1 -
.../apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/DistPeerTXStateStubTest.java | 1 -
.../apache/geode/internal/cache/DistributedCacheOperationTest.java | 1 -
.../geode/internal/cache/DistributedPutAllOperationTest.java | 1 -
.../cache/DistributedRegionFunctionStreamingMessageTest.java | 1 -
.../apache/geode/internal/cache/DistributedRegionJUnitTest.java | 1 -
.../geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/DistributedRegionTest.java | 1 -
.../geode/internal/cache/DistributedRemoveAllOperationTest.java | 1 -
.../java/org/apache/geode/internal/cache/EntryEventImplTest.java | 1 -
.../apache/geode/internal/cache/EntryEventSerializationTest.java | 1 -
.../apache/geode/internal/cache/EnumListenerEventJUnitTest.java | 1 -
.../apache/geode/internal/cache/EvictionAttributesImplTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java | 1 -
.../internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java | 1 -
.../java/org/apache/geode/internal/cache/FlusherThreadTest.java | 1 -
.../java/org/apache/geode/internal/cache/GemFireCacheImplTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/GridProfileTest.java | 1 -
.../org/apache/geode/internal/cache/InitialImageOperationTest.java | 1 -
.../geode/internal/cache/InternalCacheForClientAccessTest.java | 1 -
.../apache/geode/internal/cache/JtaAfterCompletionMessageTest.java | 1 -
.../geode/internal/cache/JtaBeforeCompletionMessageTest.java | 1 -
.../java/org/apache/geode/internal/cache/LocalDataSetTest.java | 1 -
.../geode/internal/cache/MemberFunctionStreamingMessageTest.java | 1 -
.../org/apache/geode/internal/cache/NonLocalRegionEntryTest.java | 1 -
.../apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java | 1 -
.../src/test/java/org/apache/geode/internal/cache/OplogTest.java | 1 -
.../apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java | 1 -
.../geode/internal/cache/PartitionAttributesImplJUnitTest.java | 1 -
.../geode/internal/cache/PartitionRegionConfigJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/PartitionRegionConfigTest.java | 1 -
.../geode/internal/cache/PartitionedRegionDataStoreTest.java | 1 -
.../geode/internal/cache/PartitionedRegionHelperJUnitTest.java | 1 -
.../geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java | 1 -
.../internal/cache/PartitionedRegionRedundancyTrackerTest.java | 1 -
.../org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java | 1 -
.../org/apache/geode/internal/cache/ProxyBucketRegionTest.java | 1 -
.../java/org/apache/geode/internal/cache/RegionCommitTest.java | 1 -
.../apache/geode/internal/cache/RequestFilterInfoMessageTest.java | 1 -
.../org/apache/geode/internal/cache/RequestImageMessageTest.java | 1 -
.../org/apache/geode/internal/cache/RequestRVVMessageTest.java | 1 -
.../geode/internal/cache/SearchLoadAndWriteProcessorTest.java | 1 -
.../org/apache/geode/internal/cache/StateMarkerMessageTest.java | 1 -
.../src/test/java/org/apache/geode/internal/cache/TXEventTest.java | 1 -
.../java/org/apache/geode/internal/cache/TXManagerImplTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/TXMessageTest.java | 1 -
.../apache/geode/internal/cache/TXRegionLockRequestImplTest.java | 1 -
.../java/org/apache/geode/internal/cache/TXStateProxyImplTest.java | 1 -
.../test/java/org/apache/geode/internal/cache/TXStateStubTest.java | 1 -
.../apache/geode/internal/cache/TXSynchronizationRunnableTest.java | 1 -
.../java/org/apache/geode/internal/cache/TxCommitMessageTest.java | 1 -
.../src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java | 1 -
.../java/org/apache/geode/internal/cache/VMLRURegionMapTest.java | 1 -
.../apache/geode/internal/cache/backup/AbortBackupFactoryTest.java | 1 -
.../apache/geode/internal/cache/backup/AbortBackupRequestTest.java | 1 -
.../apache/geode/internal/cache/backup/AbortBackupStepTest.java | 1 -
.../internal/cache/backup/AbstractBackupWriterConfigTest.java | 1 -
.../apache/geode/internal/cache/backup/BackupDefinitionTest.java | 1 -
.../geode/internal/cache/backup/BackupReplyProcessorTest.java | 1 -
.../org/apache/geode/internal/cache/backup/BackupServiceTest.java | 1 -
.../geode/internal/cache/backup/BackupWriterFactoryTest.java | 1 -
.../internal/cache/backup/FileSystemBackupWriterConfigTest.java | 1 -
.../cache/backup/FileSystemIncrementalBackupLocationTest.java | 1 -
.../geode/internal/cache/backup/FinishBackupFactoryTest.java | 1 -
.../geode/internal/cache/backup/FinishBackupRequestTest.java | 1 -
.../apache/geode/internal/cache/backup/FinishBackupStepTest.java | 1 -
.../apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java | 1 -
.../apache/geode/internal/cache/backup/FlushToDiskRequestTest.java | 1 -
.../apache/geode/internal/cache/backup/FlushToDiskStepTest.java | 1 -
.../geode/internal/cache/backup/PrepareBackupFactoryTest.java | 1 -
.../geode/internal/cache/backup/PrepareBackupRequestTest.java | 1 -
.../apache/geode/internal/cache/backup/PrepareBackupStepTest.java | 1 -
.../geode/internal/cache/backup/TemporaryBackupFilesTest.java | 1 -
.../apache/geode/internal/cache/control/FilterByPathJUnitTest.java | 1 -
.../geode/internal/cache/control/MemoryThresholdsJUnitTest.java | 1 -
.../apache/geode/internal/cache/control/ResourceAdvisorTest.java | 1 -
.../geode/internal/cache/entries/AbstractRegionEntryTest.java | 1 -
.../geode/internal/cache/event/DistributedEventTrackerTest.java | 1 -
.../geode/internal/cache/event/EventTrackerExpiryTaskTest.java | 1 -
.../geode/internal/cache/event/NonDistributedEventTrackerTest.java | 1 -
.../geode/internal/cache/eviction/AbstractEvictionListTest.java | 1 -
.../geode/internal/cache/eviction/EvictionListBuilderTest.java | 1 -
.../org/apache/geode/internal/cache/eviction/LIFOListTest.java | 1 -
.../geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java | 1 -
.../geode/internal/cache/eviction/LRUListWithSyncSortingTest.java | 1 -
.../internal/cache/extension/SimpleExtensionPointJUnitTest.java | 1 -
.../geode/internal/cache/ha/EventIdOptimizationJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/cache/ha/HARegionQueueTest.java | 2 +-
.../apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java | 2 +-
.../apache/geode/internal/cache/map/AbstractRegionMapPutTest.java | 1 -
.../apache/geode/internal/cache/map/RegionMapCommitPutTest.java | 1 -
.../org/apache/geode/internal/cache/map/RegionMapDestroyTest.java | 1 -
.../java/org/apache/geode/internal/cache/map/RegionMapPutTest.java | 1 -
.../geode/internal/cache/partitioned/BucketBackupMessageTest.java | 1 -
.../cache/partitioned/ColocatedRegionDetailsJUnitTest.java | 1 -
.../internal/cache/partitioned/DeposePrimaryBucketMessageTest.java | 1 -
.../internal/cache/partitioned/FetchEntriesMessageJUnitTest.java | 1 -
.../geode/internal/cache/partitioned/FetchEntryMessageTest.java | 1 -
.../geode/internal/cache/partitioned/FetchKeysMessageTest.java | 1 -
.../cache/partitioned/FetchPartitionDetailsMessageTest.java | 1 -
.../cache/partitioned/ManageBackupBucketReplyMessageTest.java | 1 -
.../geode/internal/cache/partitioned/MoveBucketMessageTest.java | 1 -
.../internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java | 1 -
.../geode/internal/cache/partitioned/PartitionMessageTest.java | 1 -
.../internal/cache/partitioned/PutPutReplyMessageJUnitTest.java | 1 -
.../internal/cache/partitioned/RemotePutMessageJUnitTest.java | 1 -
.../geode/internal/cache/partitioned/RemoveAllPRMessageTest.java | 1 -
.../geode/internal/cache/partitioned/RemoveBucketMessageTest.java | 1 -
.../apache/geode/internal/cache/partitioned/SizeMessageTest.java | 1 -
.../cache/partitioned/rebalance/BucketOperatorImplTest.java | 1 -
.../cache/partitioned/rebalance/BucketOperatorWrapperTest.java | 1 -
.../partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java | 1 -
.../geode/internal/cache/persistence/DefaultDiskDirsTest.java | 1 -
.../cache/persistence/PersistenceInitialImageAdvisorTest.java | 1 -
.../persistence/query/TemporaryResultSetFactoryJUnitTest.java | 1 -
.../cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java | 1 -
.../apache/geode/internal/cache/snapshot/ClientExporterTest.java | 1 -
.../internal/cache/snapshot/ParallelSnapshotFileMapperTest.java | 1 -
.../org/apache/geode/internal/cache/tier/sockets/CCUStatsTest.java | 2 +-
.../internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java | 2 +-
.../geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/HandshakeTest.java | 2 +-
.../geode/internal/cache/tier/sockets/MessageIdExtractorTest.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java | 2 +-
.../geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java | 2 +-
.../org/apache/geode/internal/cache/tier/sockets/PartTest.java | 2 +-
.../internal/cache/tier/sockets/ServerConnectionFactoryTest.java | 2 +-
.../geode/internal/cache/tier/sockets/ServerConnectionTest.java | 2 +-
.../geode/internal/cache/tier/sockets/TcpServerFactoryTest.java | 2 +-
.../internal/cache/tier/sockets/command/CommitCommandTest.java | 2 +-
.../internal/cache/tier/sockets/command/ContainsKey66Test.java | 2 +-
.../geode/internal/cache/tier/sockets/command/ContainsKeyTest.java | 2 +-
.../internal/cache/tier/sockets/command/CreateRegionTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Destroy65Test.java | 2 +-
.../internal/cache/tier/sockets/command/DestroyRegionTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/DestroyTest.java | 2 +-
.../internal/cache/tier/sockets/command/ExecuteFunction65Test.java | 2 +-
.../internal/cache/tier/sockets/command/ExecuteFunction66Test.java | 2 +-
.../internal/cache/tier/sockets/command/ExecuteFunctionTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Get70Test.java | 2 +-
.../geode/internal/cache/tier/sockets/command/GetAll651Test.java | 2 +-
.../geode/internal/cache/tier/sockets/command/GetAll70Test.java | 2 +-
.../geode/internal/cache/tier/sockets/command/GetAllTest.java | 2 +-
.../cache/tier/sockets/command/GetAllWithCallbackTest.java | 2 +-
.../sockets/command/GetClientPartitionAttributesCommand66Test.java | 2 +-
.../sockets/command/GetClientPartitionAttributesCommandTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/InvalidateTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/KeySetTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Put61Test.java | 2 +-
.../geode/internal/cache/tier/sockets/command/Put65Test.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/command/PutTest.java | 2 +-
.../cache/tier/sockets/command/RegisterInterest61Test.java | 2 +-
.../cache/tier/sockets/command/RegisterInterestList61Test.java | 2 +-
.../cache/tier/sockets/command/RegisterInterestList66Test.java | 2 +-
.../cache/tier/sockets/command/RegisterInterestListTest.java | 2 +-
.../internal/cache/tier/sockets/command/RegisterInterestTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/RemoveAllTest.java | 2 +-
.../geode/internal/cache/tier/sockets/command/RequestTest.java | 2 +-
.../internal/cache/tier/sockets/command/TXFailoverCommandTest.java | 2 +-
.../cache/tier/sockets/command/UnregisterInterestTest.java | 2 +-
.../geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java | 1 -
.../org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java | 1 -
.../geode/internal/cache/tx/RemoteFetchEntryMessageTest.java | 1 -
.../apache/geode/internal/cache/tx/RemoteOperationMessageTest.java | 1 -
.../geode/internal/cache/tx/RemoteOperationResponseTest.java | 1 -
.../apache/geode/internal/cache/tx/RemotePutAllMessageTest.java | 1 -
.../org/apache/geode/internal/cache/tx/RemotePutMessageTest.java | 1 -
.../geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java | 1 -
.../apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java | 1 -
.../geode/internal/cache/versions/RVVExceptionJUnitTest.java | 1 -
.../internal/cache/versions/RegionVersionHolder2JUnitTest.java | 1 -
.../internal/cache/versions/RegionVersionHolderJUnitTest.java | 1 -
.../cache/versions/RegionVersionHolderRandomJUnitTest.java | 1 -
.../cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java | 1 -
.../org/apache/geode/internal/cache/versions/VMVersionTagTest.java | 1 -
.../wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java | 1 -
.../cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java | 1 -
.../cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java | 1 -
.../ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java | 1 -
.../apache/geode/internal/cache/wan/serial/DestroyMessageTest.java | 1 -
.../wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java | 1 -
.../geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java | 1 -
.../geode/internal/cache/xmlcache/CacheCreationJUnitTest.java | 1 -
.../cache/xmlcache/CacheTransactionManagerCreationTest.java | 1 -
.../geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java | 1 -
.../geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java | 1 -
.../internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java | 1 -
.../internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java | 1 -
.../geode/internal/cache/xmlcache/RegionCreationJUnitTest.java | 1 -
.../geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java | 1 -
.../java/org/apache/geode/internal/config/JAXBServiceTest.java | 1 -
.../apache/geode/internal/io/CompositeOutputStreamJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java | 1 -
.../java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java | 1 -
.../org/apache/geode/internal/lang/InOutParameterJUnitTest.java | 1 -
.../java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java | 1 -
.../java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java | 1 -
.../org/apache/geode/internal/lang/SystemPropertyHelperTest.java | 1 -
.../java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java | 1 -
.../java/org/apache/geode/internal/lang/ThrowableUtilsTest.java | 1 -
.../org/apache/geode/internal/logging/LogServiceJUnitTest.java | 1 -
.../org/apache/geode/internal/logging/LogWriterImplJUnitTest.java | 1 -
.../org/apache/geode/internal/logging/SortLogFileJUnitTest.java | 1 -
.../geode/internal/logging/log4j/AlertAppenderJUnitTest.java | 1 -
.../apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java | 1 -
.../geode/internal/logging/log4j/LocalizedMessageJUnitTest.java | 1 -
.../java/org/apache/geode/internal/logging/log4j/LogLevelTest.java | 1 -
.../geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java | 1 -
.../geode/internal/net/SSLConfigurationFactoryJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/net/SocketCloserJUnitTest.java | 2 +-
.../apache/geode/internal/net/SocketCloserWithWaitJUnitTest.java | 2 +-
.../apache/geode/internal/net/SocketCreatorFactoryJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/net/SocketUtilsJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java | 1 -
.../offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java | 1 -
.../java/org/apache/geode/internal/offheap/FragmentJUnitTest.java | 1 -
.../org/apache/geode/internal/offheap/FreeListManagerTest.java | 1 -
.../apache/geode/internal/offheap/LifecycleListenerJUnitTest.java | 1 -
.../internal/offheap/MemoryAllocatorFillPatternJUnitTest.java | 1 -
.../apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java | 1 -
.../apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java | 1 -
.../geode/internal/offheap/MemoryInspectorImplJUnitTest.java | 1 -
.../org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java | 1 -
.../geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java | 1 -
.../org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java | 1 -
.../internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java | 1 -
.../geode/internal/offheap/OffHeapStoredObjectJUnitTest.java | 1 -
.../geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java | 1 -
.../internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java | 1 -
.../internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java | 1 -
.../apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java | 1 -
.../geode/internal/offheap/ReferenceCountHelperImplTest.java | 1 -
.../geode/internal/offheap/ReferenceCountHelperJUnitTest.java | 1 -
.../apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java | 1 -
.../apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java | 1 -
.../org/apache/geode/internal/process/AttachProcessUtilsTest.java | 1 -
.../apache/geode/internal/process/FileProcessControllerTest.java | 1 -
.../org/apache/geode/internal/process/NativeProcessUtilsTest.java | 1 -
.../geode/internal/process/ProcessControllerFactoryTest.java | 1 -
.../apache/geode/internal/process/ProcessLauncherContextTest.java | 1 -
.../java/org/apache/geode/internal/process/StartupStatusTest.java | 1 -
.../org/apache/geode/internal/process/lang/AvailablePidTest.java | 1 -
.../process/signal/AbstractSignalNotificationHandlerTest.java | 1 -
.../apache/geode/internal/security/CallbackInstantiatorTest.java | 2 +-
.../security/IntegratedSecurityServiceConstructorTest.java | 1 -
.../geode/internal/security/IntegratedSecurityServiceTest.java | 1 -
.../apache/geode/internal/security/LegacySecurityServiceTest.java | 1 -
.../apache/geode/internal/security/SecurityServiceFactoryTest.java | 2 +-
.../org/apache/geode/internal/security/SecurityServiceTest.java | 2 +-
.../java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java | 1 -
.../org/apache/geode/internal/size/ObjectTraverserJUnitTest.java | 1 -
.../apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java | 1 -
.../geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java | 1 -
.../apache/geode/internal/size/WellKnownClassSizerJUnitTest.java | 1 -
.../org/apache/geode/internal/statistics/CallbackSamplerTest.java | 1 -
.../org/apache/geode/internal/statistics/ResourceInstTest.java | 1 -
.../org/apache/geode/internal/statistics/SampleCollectorTest.java | 1 -
.../apache/geode/internal/statistics/StatArchiveWriterTest.java | 1 -
.../apache/geode/internal/statistics/StatMonitorHandlerTest.java | 1 -
.../statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java | 1 -
.../org/apache/geode/internal/statistics/StatisticsImplTest.java | 1 -
.../apache/geode/internal/statistics/StatisticsMonitorTest.java | 1 -
.../java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/tcp/ConnectionTableTest.java | 2 +-
.../test/java/org/apache/geode/internal/tcp/ConnectionTest.java | 2 +-
.../apache/geode/internal/util/AbortableTaskServiceJUnitTest.java | 1 -
.../org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java | 1 -
.../test/java/org/apache/geode/internal/util/ArrayUtilsTest.java | 1 -
.../test/java/org/apache/geode/internal/util/BlobHelperTest.java | 1 -
.../internal/util/BlobHelperWithThreadContextClassLoaderTest.java | 1 -
.../org/apache/geode/internal/util/CollectionUtilsJUnitTest.java | 1 -
.../org/apache/geode/internal/util/DelayedActionJUnitTest.java | 1 -
.../src/test/java/org/apache/geode/internal/util/HostNameTest.java | 1 -
.../test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java | 1 -
.../java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java | 2 +-
.../java/org/apache/geode/internal/util/PluckStacksUnitTest.java | 1 -
.../util/concurrent/CompactConcurrentHashSetJUnitTest.java | 1 -
.../geode/internal/util/concurrent/FutureResultJUnitTest.java | 1 -
.../internal/util/concurrent/ReentrantSemaphoreJUnitTest.java | 1 -
.../internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java | 1 -
.../java/org/apache/geode/management/DiskBackupStatusTest.java | 1 -
.../org/apache/geode/management/bean/stats/StatsRateJUnitTest.java | 1 -
.../geode/management/internal/CompositeBuilderViaFromTest.java | 1 -
.../geode/management/internal/CompositeBuilderViaProxyTest.java | 1 -
.../apache/geode/management/internal/IdentityConverterTest.java | 1 -
.../org/apache/geode/management/internal/JettyHelperJUnitTest.java | 1 -
.../beans/CacheServerBridgeClientMembershipRegressionTest.java | 1 -
.../internal/beans/DistributedSystemBridgeJUnitTest.java | 1 -
.../apache/geode/management/internal/beans/FileUploaderTest.java | 1 -
.../internal/beans/QueryDataFunctionApplyLimitClauseTest.java | 1 -
.../management/internal/beans/stats/MBeanStatsMonitorTest.java | 1 -
.../management/internal/cli/ClasspathScanLoadHelperJUnitTest.java | 1 -
.../java/org/apache/geode/management/internal/cli/CliUtilTest.java | 1 -
.../geode/management/internal/cli/CommandManagerJUnitTest.java | 1 -
.../management/internal/cli/CommandSeparatorEscapeJUnitTest.java | 1 -
.../geode/management/internal/cli/DataCommandJsonJUnitTest.java | 1 -
.../apache/geode/management/internal/cli/GfshParserJUnitTest.java | 1 -
.../internal/cli/commands/AlterAsyncEventQueueCommandTest.java | 1 -
.../management/internal/cli/commands/AlterDiskStoreJUnitTest.java | 1 -
.../management/internal/cli/commands/AlterRegionCommandTest.java | 1 -
.../internal/cli/commands/CommandAvailabilityIndicatorTest.java | 1 -
.../management/internal/cli/commands/ConfigurePDXCommandTest.java | 1 -
.../geode/management/internal/cli/commands/ConnectCommandTest.java | 1 -
.../internal/cli/commands/CreateAsyncEventQueueCommandTest.java | 1 -
.../internal/cli/commands/CreateDefinedIndexesCommandTest.java | 1 -
.../internal/cli/commands/CreateGatewayReceiverCommandTest.java | 1 -
.../internal/cli/commands/CreateGatewaySenderCommandTest.java | 1 -
.../management/internal/cli/commands/CreateIndexCommandTest.java | 1 -
.../internal/cli/commands/CreateJndiBindingCommandTest.java | 1 -
.../management/internal/cli/commands/CreateRegionCommandTest.java | 1 -
.../geode/management/internal/cli/commands/DeployCommandTest.java | 1 -
.../internal/cli/commands/DescribeConfigCommandTest.java | 1 -
.../management/internal/cli/commands/DescribeRegionJUnitTest.java | 1 -
.../internal/cli/commands/DestroyAsyncEventQueueCommandTest.java | 1 -
.../internal/cli/commands/DestroyGatewayReceiverCommandTest.java | 1 -
.../internal/cli/commands/DestroyGatewaySenderCommandTest.java | 1 -
.../internal/cli/commands/DestroyJndiBindingCommandTest.java | 1 -
.../management/internal/cli/commands/DestroyRegionCommandTest.java | 1 -
.../internal/cli/commands/DiskStoreCommandsJUnitTest.java | 1 -
.../internal/cli/commands/ExecuteFunctionCommandTest.java | 1 -
.../management/internal/cli/commands/ExportConfigCommandTest.java | 1 -
.../management/internal/cli/commands/ExportDataCommandTest.java | 1 -
.../management/internal/cli/commands/ExportLogsCommandTest.java | 1 -
.../internal/cli/commands/ExportLogsInterceptorJUnitTest.java | 1 -
.../internal/cli/commands/ExportStackTraceCommandTest.java | 1 -
.../management/internal/cli/commands/GfshCommandJUnitTest.java | 1 -
.../management/internal/cli/commands/ImportDataCommandTest.java | 1 -
.../management/internal/cli/commands/ListAsyncEventQueuesTest.java | 2 +-
.../management/internal/cli/commands/ListGatewayCommandTest.java | 1 -
.../internal/cli/commands/ListIndexCommandJUnitTest.java | 1 -
.../internal/cli/commands/ListJndiBindingCommandTest.java | 1 -
.../management/internal/cli/commands/ListMembersCommandTest.java | 1 -
.../management/internal/cli/commands/LogLevelInterceptorTest.java | 1 -
.../management/internal/cli/commands/ShowMetricsJUnitTest.java | 1 -
.../management/internal/cli/commands/UserInputPropertyTest.java | 1 -
.../internal/cli/commands/lifecycle/StartJConsoleCommandTest.java | 1 -
.../internal/cli/converters/BaseStringConverterJUnitTest.java | 1 -
.../management/internal/cli/converters/ClassNameConverterTest.java | 1 -
.../internal/cli/converters/ConfigPropertyConverterTest.java | 1 -
.../management/internal/cli/converters/IndexTypeConverterTest.java | 1 -
.../management/internal/cli/converters/LogLevelConverterTest.java | 1 -
.../internal/cli/converters/RegionPathConverterJUnitTest.java | 1 -
.../apache/geode/management/internal/cli/domain/ClassNameTest.java | 1 -
.../management/internal/cli/domain/RegionDescriptionJUnitTest.java | 1 -
.../management/internal/cli/functions/CliFunctionResultTest.java | 1 -
.../internal/cli/functions/CreateDefinedIndexesFunctionTest.java | 1 -
.../internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java | 1 -
.../internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java | 1 -
.../internal/cli/functions/DestroyGatewayReceiverFunctionTest.java | 1 -
.../management/internal/cli/functions/ExpirationAttrsTest.java | 1 -
.../management/internal/cli/functions/ExportLogsFunctionTest.java | 1 -
.../internal/cli/functions/GatewayReceiverCreateFunctionTest.java | 1 -
.../internal/cli/functions/GatewaySenderDestroyFunctionTest.java | 1 -
.../internal/cli/functions/GetRegionsFunctionJUnitTest.java | 1 -
.../management/internal/cli/functions/GetRegionsFunctionTest.java | 1 -
.../internal/cli/functions/ListDiskStoresFunctionJUnitTest.java | 1 -
.../internal/cli/functions/ListIndexFunctionJUnitTest.java | 1 -
.../internal/cli/functions/RegionDestroyFunctionTest.java | 1 -
.../management/internal/cli/functions/RegionFunctionArgsTest.java | 1 -
.../cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java | 1 -
.../geode/management/internal/cli/help/HelpBlockUnitTest.java | 1 -
.../apache/geode/management/internal/cli/help/HelperUnitTest.java | 1 -
.../apache/geode/management/internal/cli/json/GfJsonArrayTest.java | 1 -
.../geode/management/internal/cli/json/GfJsonObjectTest.java | 1 -
.../apache/geode/management/internal/cli/json/TypedJsonTest.java | 1 -
.../geode/management/internal/cli/remote/CommandExecutorTest.java | 1 -
.../management/internal/cli/remote/OnlineCommandProcessorTest.java | 1 -
.../geode/management/internal/cli/result/CommandResultTest.java | 1 -
.../management/internal/cli/result/CompositeResultDataTest.java | 1 -
.../management/internal/cli/result/DownloadFileResultTest.java | 1 -
.../geode/management/internal/cli/result/ErrorResultDataTest.java | 1 -
.../geode/management/internal/cli/result/FileResultTest.java | 1 -
.../geode/management/internal/cli/result/InfoResultDataTest.java | 1 -
.../geode/management/internal/cli/result/ResultBuilderTest.java | 1 -
.../management/internal/cli/result/TabularResultDataTest.java | 1 -
.../cli/result/model/LegacyVsResultModelComparisonTest.java | 1 -
.../management/internal/cli/result/model/ResultModelTest.java | 1 -
.../internal/cli/result/model/TabularResultModelTest.java | 1 -
.../management/internal/cli/shell/GfshExecutionStrategyTest.java | 1 -
.../geode/management/internal/cli/shell/GfshInitFileJUnitTest.java | 1 -
.../apache/geode/management/internal/cli/shell/GfshJunitTest.java | 1 -
.../geode/management/internal/cli/util/BytesToStringTest.java | 1 -
.../geode/management/internal/cli/util/CommentSkipHelperTest.java | 1 -
.../internal/cli/util/ExportLogsCacheWriterUnitTest.java | 1 -
.../apache/geode/management/internal/cli/util/HostUtilsTest.java | 1 -
.../geode/management/internal/cli/util/HyphenFormatterTest.java | 1 -
.../org/apache/geode/management/internal/cli/util/JdkToolTest.java | 1 -
.../apache/geode/management/internal/cli/util/LogFilterTest.java | 1 -
.../geode/management/internal/cli/util/LogLevelExtractorTest.java | 1 -
.../apache/geode/management/internal/cli/util/LogSizerTest.java | 1 -
.../management/internal/cli/util/ThreePhraseGeneratorTest.java | 1 -
.../internal/configuration/domain/CacheElementJUnitTest.java | 1 -
.../functions/GetClusterConfigurationFunctionTest.java | 1 -
.../management/internal/configuration/utils/XmlUtilsJUnitTest.java | 1 -
.../geode/management/internal/security/ResourcePermissionTest.java | 2 +-
.../java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java | 2 +-
.../geode/redis/internal/executor/AbstractScanExecutorTest.java | 2 +-
.../org/apache/geode/security/GemFireSecurityExceptionTest.java | 2 +-
.../java/org/apache/geode/security/NotAuthorizedExceptionTest.java | 2 +-
.../java/org/apache/geode/security/SimpleSecurityManagerTest.java | 2 +-
.../org/apache/geode/security/templates/PKCSPrincipalTest.java | 2 +-
.../org/apache/geode/security/templates/UsernamePrincipalTest.java | 2 +-
.../java/org/apache/geode/test/process/MainLauncherJUnitTest.java | 1 -
.../geode/cache/query/internal/cq/CqServiceImplJUnitTest.java | 1 -
.../apache/geode/cache/query/internal/cq/CqServiceUnitTest.java | 1 -
.../geode/internal/cache/tier/sockets/command/CloseCQTest.java | 1 -
.../geode/internal/cache/tier/sockets/command/ExecuteCQ61Test.java | 1 -
.../geode/internal/cache/tier/sockets/command/StopCQTest.java | 1 -
.../org/apache/geode/experimental/driver/ValueEncoderTest.java | 2 +-
.../org/apache/geode/test/compiler/ClassNameExtractorTest.java | 1 -
.../org/apache/geode/test/compiler/UncompiledSourceCodeTest.java | 1 -
.../geode/test/dunit/standalone/VersionManagerJUnitTest.java | 2 +-
.../java/org/apache/geode/test/junit/categories/CategoryTest.java | 1 -
.../org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java | 1 -
.../org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java | 1 -
.../org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java | 1 -
.../java/org/apache/geode/test/junit/rules/RepeatRuleTest.java | 1 -
.../org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java | 1 -
.../geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java | 1 -
.../geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java | 1 -
.../apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java | 1 -
.../geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java | 1 -
.../test/java/org/apache/geode/test/junit/rules/RuleListTest.java | 1 -
.../test/junit/rules/examples/RepeatingTestCasesExampleTest.java | 1 -
.../geode/test/junit/rules/examples/RetryRuleExampleTest.java | 1 -
.../geode/test/junit/rules/examples/RuleAndClassRuleTest.java | 1 -
.../junit/rules/serializable/SerializableExternalResourceTest.java | 1 -
.../test/junit/rules/serializable/SerializableRuleListTest.java | 1 -
.../junit/rules/serializable/SerializableTemporaryFolderTest.java | 1 -
.../test/junit/rules/serializable/SerializableTestNameTest.java | 1 -
.../test/junit/rules/serializable/SerializableTestWatcherTest.java | 1 -
.../test/junit/rules/serializable/SerializableTimeoutTest.java | 1 -
.../junit/runners/CategoryWithParameterizedRunnerFactoryTest.java | 7 ++-----
.../geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java | 2 +-
.../apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java | 2 +-
.../cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java | 2 +-
.../cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java | 2 +-
.../cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java | 2 +-
.../cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java | 2 +-
.../cache/lucene/internal/LuceneResultStructImpJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java | 2 +-
.../lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java | 2 +-
.../lucene/internal/PartitionedRepositoryManagerJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/StringQueryProviderJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/ValidateCommandParametersTest.java | 2 +-
.../cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java | 2 +-
.../internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java | 2 +-
.../cli/functions/LuceneDescribeIndexFunctionJUnitTest.java | 2 +-
.../cli/functions/LuceneDestroyIndexFunctionJUnitTest.java | 2 +-
.../internal/cli/functions/LuceneListIndexFunctionJUnitTest.java | 2 +-
.../internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java | 2 +-
.../lucene/internal/directory/DumpDirectoryFilesJUnitTest.java | 2 +-
.../cache/lucene/internal/directory/RegionDirectoryJUnitTest.java | 2 +-
.../lucene/internal/distributed/DistributedScoringJUnitTest.java | 2 +-
.../cache/lucene/internal/distributed/EntryScoreJUnitTest.java | 2 +-
.../internal/distributed/LuceneQueryFunctionContextJUnitTest.java | 2 +-
.../lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java | 2 +-
.../lucene/internal/distributed/TopEntriesCollectorJUnitTest.java | 2 +-
.../internal/distributed/TopEntriesFunctionCollectorJUnitTest.java | 2 +-
.../cache/lucene/internal/distributed/TopEntriesJUnitTest.java | 2 +-
.../internal/distributed/WaitUntilFlushedFunctionJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/filesystem/FileJUnitTest.java | 2 +-
.../cache/lucene/internal/filesystem/FileSystemJUnitTest.java | 2 +-
.../cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java | 2 +-
.../internal/partition/BucketTargetingFixedResolverTest.java | 2 +-
.../cache/lucene/internal/partition/BucketTargetingMapTest.java | 2 +-
.../serializer/HeterogeneousLuceneSerializerJUnitTest.java | 2 +-
.../internal/repository/serializer/PdxFieldMapperJUnitTest.java | 2 +-
.../repository/serializer/ReflectionFieldMapperJUnitTest.java | 2 +-
.../lucene/internal/results/LuceneGetPageFunctionJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/results/PageEntryJUnitTest.java | 2 +-
.../geode/cache/lucene/internal/results/PageResultsJUnitTest.java | 2 +-
.../lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java | 2 +-
.../cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java | 2 +-
.../cache/tier/sockets/OutputCapturingServerConnectionTest.java | 2 +-
.../internal/cache/tier/sockets/ProtobufServerConnectionTest.java | 2 +-
.../internal/protocol/protobuf/ProtobufStreamProcessorTest.java | 2 +-
.../internal/protocol/protobuf/security/SecureCacheImplTest.java | 2 +-
.../protocol/protobuf/security/SecureFunctionServiceImplTest.java | 2 +-
.../protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java | 2 +-
.../v1/operations/ClearRequestOperationHandlerJUnitTest.java | 2 +-
.../ExecuteFunctionOnGroupRequestOperationHandlerJUnitTest.java | 2 +-
.../ExecuteFunctionOnMemberRequestOperationHandlerJUnitTest.java | 2 +-
.../ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/GetAllRequestOperationHandlerJUnitTest.java | 2 +-
.../operations/GetRegionNamesRequestOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/GetRequestOperationHandlerJUnitTest.java | 2 +-
.../protobuf/v1/operations/GetServerOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/GetSizeRequestOperationHandlerJUnitTest.java | 2 +-
.../protobuf/v1/operations/KeySetOperationHandlerJUnitTest.java | 2 +-
.../protocol/protobuf/v1/operations/OperationHandlerJUnitTest.java | 2 +-
.../operations/OqlQueryRequestOperationHandlerIntegrationTest.java | 2 +-
.../v1/operations/OqlQueryRequestOperationHandlerJUnitTest.java | 2 +-
.../protobuf/v1/operations/ProtocolVersionHandlerJUnitTest.java | 2 +-
.../v1/operations/PutAllRequestOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/PutRequestOperationHandlerJUnitTest.java | 2 +-
.../v1/operations/RemoveRequestOperationHandlerJUnitTest.java | 2 +-
.../protocol/protobuf/v1/operations/VersionValidatorJUnitTest.java | 2 +-
.../protobuf/v1/serialization/codec/JsonPdxConverterJUnitTest.java | 2 +-
.../v1/serializer/ProtobufProtocolSerializerJUnitTest.java | 2 +-
.../protocol/protobuf/v1/utilities/ProtobufUtilitiesJUnitTest.java | 2 +-
.../apache/geode/tools/pulse/internal/PulseAppListenerTest.java | 1 -
.../pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java | 1 -
.../geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java | 1 -
.../apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java | 1 -
.../internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java | 1 -
.../geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java | 1 -
.../cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java | 1 -
.../internal/web/controllers/AbstractBaseControllerJUnitTest.java | 2 +-
.../rest/internal/web/controllers/support/RegionDataTest.java | 2 +-
.../web/controllers/support/LoginHandlerInterceptorJUnitTest.java | 1 -
.../support/LoginHandlerInterceptorRequestHeaderJUnitTest.java | 1 -
.../internal/web/domain/QueryParameterSourceJUnitTest.java | 1 -
.../converter/SerializableObjectHttpMessageConverterJUnitTest.java | 1 -
692 files changed, 181 insertions(+), 696 deletions(-)
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
index 7243ad9..99d369a 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
@@ -40,7 +40,6 @@ import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@SuppressWarnings("unused")
public class ClassLoaderObjectInputStreamTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
index 42ce6a6..acb0965 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.lang.SystemUtils;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StartLocatorCommandTest {
private StartLocatorCommand locatorCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
index a7b0649..2d26916 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.PdxSerializer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StartServerCommandTest {
private StartServerCommand serverCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
index d380c6a..9d02a5b 100644
--- a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.GfshTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
-@Category({UnitTest.class, GfshTest.class})
+@Category({GfshTest.class})
public class GfshRuleTest {
@Rule
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
index 8f32356..97f6eca 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* to Interfaces, Classes, Public and Protected Fields, Enums, Enum Constants, Public and Protected
* Methods, Packages, and Constructors.
*/
-@Category(UnitTest.class)
public class ExperimentalJUnitTest {
private static final String FIELD_NAME = "field";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
index 4a55a45..fc80d53 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcAsyncWriterTest {
private SqlHandler sqlHandler;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
index e93174a..dd5ae27 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
@@ -25,7 +25,6 @@ import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcConnectorExceptionTest {
@Rule
public TestName testName = new TestName();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
index 76db6c4..71eada9 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcLoaderTest {
private SqlHandler sqlHandler;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
index b1773a1..56275f3 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcWriterTest {
private EntryEvent<Object, Object> entryEvent;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
index 0e439d4..174d733 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractJdbcCallbackTest {
private AbstractJdbcCallback jdbcCallback;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
index 36529f6..82b9a31 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ColumnDataTest {
private static final String COLUMN_NAME = "columnName";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
index e93dd61..ab4c283 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DataSourceManagerUnitTest {
private DataSourceManager manager;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
index 23e5a06..da5a38c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcConnectorServiceTest {
private static final String TEST_CONFIG_NAME = "testConfig";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index e67893a..a98458e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionMappingTest {
@Rule
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index 23dcc75..f936f3e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
-@Category(UnitTest.class)
public class SqlHandlerTest {
private static final String CONNECTION_CONFIG_NAME = "testConnectionConfig";
private static final String REGION_NAME = "testRegion";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
index c88c7d7..ec8d1fd 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SqlStatementFactoryTest {
private static final String TABLE_NAME = "testTable";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
index 655f4cb..3d11dc1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
-@Category(UnitTest.class)
public class SqlToPdxInstanceCreatorTest {
private static final String COLUMN_NAME_1 = "columnName1";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
index 00f0c8b..f7be757 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
@@ -38,7 +38,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TableMetaDataManagerTest {
private static final String TABLE_NAME = "testTable";
private static final String KEY_COLUMN = "keyColumn";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
index 04e1c1a..f173d9c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class AlterConnectionCommandTest {
public static final String COMMAND = "alter jdbc-connection --name=name ";
private AlterConnectionCommand command;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
index 576f80d..c003c14 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AlterConnectionFunctionTest {
private static final String CONNECTION_NAME = "theConnection";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
index b6c6f56..0a7be6d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class AlterMappingCommandTest {
public static final String COMMAND = "alter jdbc-mapping --region='region' ";
private AlterMappingCommand command;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index 39d6588..ce1a92c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AlterMappingFunctionTest {
private static final String REGION_NAME = "testRegion";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
index 9de8633..d1bf869 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CreateConnectionFunctionTest {
private static final String CONNECTION_NAME = "theConnection";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index 30b0b5f..b90e3c4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CreateMappingFunctionTest {
private static final String REGION_NAME = "testRegion";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
index de9628c..55c7c82 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DescribeConnectionCommandTest {
public static final String COMMAND = "describe jdbc-connection --name=name";
private DescribeConnectionCommand command;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
index d5ecc11..0c6878c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DescribeConnectionFunctionTest {
private static final String EXISTING_CONFIG = "existingConfig";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index 79c4dfa..d8a1bb4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DescribeMappingCommandTest {
public static final String COMMAND = "describe jdbc-mapping --region=region ";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index d1af274..08afb85 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DescribeMappingFunctionTest {
private static final String EXISTING_MAPPING = "existingMapping";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
index 879eb74..dbdd1c8 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyConnectionFunctionTest {
private static final String connectionName = "connectionName";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
index d14b6bc..84d2c19 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyMappingCommandFunctionTest {
private static final String regionName = "testRegion";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
index 198577a..717e8b7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FunctionContextArgumentProviderTest {
private FunctionContext<?> context;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
index 1c02c3a..fc56be6 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.management.internal.cli.commands.CommandAvailabilityIndi
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JDBCCommandsAvailabilityTest {
@Test
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
index d34e901..0779389 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ListConnectionCommandTest {
public static final String COMMAND = "list jdbc-connections ";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
index 54f9fdb..c49b595 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ListConnectionFunctionTest {
private FunctionContext<Void> context;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 0092eba..02efbc4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ListMappingCommandTest {
public static final String COMMAND = "list jdbc-mappings";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
index e0290ea..d924e61 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ListMappingFunctionTest {
private FunctionContext<Void> context;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
index 34e7658..b4c66d6 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.config.JAXBService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConnectorServiceTest {
private JAXBService jaxbService;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index 8024860..d875932 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ElementTypeTest {
private Attributes attributes;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
index 7db489b..26bbfd3 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcConnectorServiceXmlParserTest {
private Attributes attributes;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
index 6586548..a64a5d0 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdbcServiceConfigurationTest {
private InternalCache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
index f572c61..1db8fe7 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class AbstractLauncherServiceStateTest {
private static String serviceName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
index 23395cc..45989c6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class AbstractLauncherTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
index c623147..cb79b4a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for DistributedSystem class.
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributedSystemJUnitTest {
@Rule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
index a91230a..cb3f0b7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.Builder}. Extracted from {@link LocatorLauncherTest}.
*/
-@Category(UnitTest.class)
public class LocatorLauncherBuilderTest {
private InetAddress localHost;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
index 4206187..e32b0da 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class LocatorLauncherTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
index 7ef3ff0..933219f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.LocatorState}.
*/
-@Category(UnitTest.class)
public class LocatorStateTest {
private String classpath;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
index 56bcb5f..009c0e6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ServerLauncher.Builder}. Extracted from {@link ServerLauncherTest}.
*/
-@Category(UnitTest.class)
public class ServerLauncherBuilderTest {
private InetAddress localHost;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
index f1762d0..5cb9453 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class ServerLauncherTest {
@Before
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
index 5aaecb9..4606ccb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Multithreaded unit tests for {@link ServerLauncher}. Extracted from {@link ServerLauncherTest}.
*/
-@Category(UnitTest.class)
public class ServerLauncherWaitOnServerMultiThreadedTest {
private final AtomicBoolean connectionStateHolder = new AtomicBoolean(true);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
index 68d34f3..b70eb32 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AtomicLongWithTerminalStateJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
index a941cfc..8808ba0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClusterDistributionManagerTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
index 1e73ee4..486ca02 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributionAdvisorTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
index 4b96bf2..312b65e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
@@ -62,7 +62,7 @@ import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributionConfigJUnitTest {
private Map<Class<?>, Class<?>> classMap;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
index e650f10..0488c8c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -24,7 +24,7 @@ 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, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributionMessageTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
index cbb892b..21b1dc1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class InternalConfigurationPersistenceServiceTest {
private InternalConfigurationPersistenceService service, service2;
private Configuration configuration;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
index 0c15d4f..41b5ccc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
@@ -37,7 +37,7 @@ 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, MembershipTest.class})
+@Category({MembershipTest.class})
public class LocatorLoadSnapshotJUnitTest {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
index 5b80788..3bb600f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class}) // Fails on Windows -- see GEODE-373
+@Category({MembershipTest.class}) // Fails on Windows -- see GEODE-373
public class ProductUseLogJUnitTest {
private long oldMax;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
index 1e4a1f5..b41b76c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -24,7 +24,7 @@ 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, MembershipTest.class})
+@Category({MembershipTest.class})
public class ReplyProcessor21Test {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
index 8207f6a..2091900 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ServerLocatorJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
index 4fbf808..0f88dfb 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
@@ -42,7 +42,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class StartupMessageDataJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
index ef1b8a5..fa394e3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DeadlockDetectorTest {
private volatile Set<Thread> stuckThreads;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
index ee962b5..b123621 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DependencyGraphJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
index a548f72..312a3e5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class UnsafeThreadLocalJUnitTest {
private static final long INTERVAL = 10;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
index 44be8ad..a578b02 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* InternalRole Tester.
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class InternalRoleJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
index 2547bec..7a65700 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class NetViewJUnitTest {
private List<InternalDistributedMember> members;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index a703652..14bca45 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class GMSMemberJUnitTest {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
index 081c83c..3a63b34 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
* Unit tests GMSAuthenticator using old security.
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class GMSAuthenticatorWithAuthenticatorTest extends AbstractGMSAuthenticatorTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
index dd1a4ba..4629edf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
* Unit tests GMSAuthenticator using new integrated security.
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class GMSAuthenticatorWithSecurityManagerTest extends AbstractGMSAuthenticatorTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index ceb3f37..0abf401 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -53,7 +53,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class StatRecorderJUnitTest {
private Protocol mockDownProtocol;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
index 6f8a1e1..aef5677 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* FixedPartitioningTestBase Tester.
*/
-@Category(UnitTest.class)
public class FixedPartitioningTestBaseJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
index 0ae7aae..96932a6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
-@Category(UnitTest.class)
public class RegionVersionVectorTest {
@Rule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
index 30d83bd..d9e2cb3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-@Category(UnitTest.class)
public class MemberStarterRuleTest {
private LocatorStarterRule locator;
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 ce84f21..78ab8e8 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -28,7 +28,7 @@ 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, SerializationTest.class})
+@Category({SerializationTest.class})
public class DataSerializerTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
index d998312..3779567 100644
--- a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class InstantiatorTest {
@Test
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 895c26f..9f87dec 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -28,7 +28,7 @@ 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, MembershipTest.class})
+@Category({MembershipTest.class})
public class SystemFailureJUnitTest {
private static final int LONG_WAIT = 30000;
diff --git a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
index 5f0a67a..b4b7aed 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* AlertLevel Tester.
*/
-@Category(UnitTest.class)
public class AlertLevelJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
index 4f79784..3894899 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionSubRegionSnapshotTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
index f81eed0..2d6198a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 3.0
*/
-@Category(UnitTest.class)
public class AttributesFactoryJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
index ddaaa7e..3ed9358 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DiskAccessExceptionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
index 8ebe205..872f6f0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExpirationAttributesTest {
@Test
public void constructor() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
index b83ea0f..8c475d1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.2
*/
-@Category(UnitTest.class)
public class FinalStaticArrayShouldNotCauseSegFaultRegressionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
index 298c7a7..87ba4b1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests MembershipAttributes and SubscriptionAttributes to make sure they are Serializable
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class MembershipAttributesAreSerializableRegressionTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
index 5198205..7d9cafa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OperationJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
index ea79344..573a86b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionNameValidationJUnitTest {
private static final Pattern NAME_PATTERN = Pattern.compile("[aA-zZ0-9-_.]+");
private static final String REGION_NAME = "MyRegion";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
index bd6c7de..e8f16ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionShortcutTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
index ad14528..7ca30ab 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the subclasses of RoleException to make sure they are Serializable
*/
-@Category(UnitTest.class)
public class RoleExceptionJUnitTest {
/**
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 2b2fe72..08744b6 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
@@ -27,7 +27,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class AbstractOpTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
index fb2ed90..50d5d8d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConnectionConnectorTest {
private CancelCriterion cancelCriterion;
private EndpointManager endpointManager;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
index 1e8ce09..1022417 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConnectionFactoryJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 5478292..7a2bbbc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -48,7 +48,7 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class OpExecutorImplJUnitTest {
DummyManager manager;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
index 05e1b08..6bb7332 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedExcepti
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class QueueConnectionImplJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index 8b5d52c..b982c8f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ServerBlackListJUnitTest {
private ScheduledExecutorService background;
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 49df773..11109be 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
@@ -29,7 +29,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class SingleHopClientExecutorSubmitTaskWithExceptionTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
index d315011..288a5df 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.client.internal.pooling.ConnectionManager;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXFailoverOpTest {
@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 c757da9..67b03e0 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
@@ -41,7 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class LocatorStatusResponseJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
index 04884ac..b578ed2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.internal.config.JAXBService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CacheConfigTest {
private CacheConfig cacheConfig;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
index c57fa82..ded2ba2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DeclarableTypeTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index 3b10c28..d7e1092 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
-@Category(UnitTest.class)
public class FunctionAdapterJUnitTest {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
index ea4456e..b30a9bb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FunctionExceptionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
index 51ef1c9..6a1ef74 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexTypeTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
index 3e443d7..8a83e0e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JavaSerializationJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index 1ff76a9..9012987 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompiledAggregateFunctionJUnitTest {
private Mockery context;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
index a2d6972..b1dfcf2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompiledInJUnitTest {
ExecutionContext context;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
index 25e4bc3..467fe35 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompiledIteratorDefJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
index d2b96f8..ef26d66 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class NWayMergeResultsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
index e92ed70..ae0eceb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class QueryExecutionContextJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
index f933c5e..d22716a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 3.0
*/
-@Category(UnitTest.class)
public class QueryObjectSerializationJUnitTest implements Serializable {
/** A <code>ByteArrayOutputStream</code> that data is serialized to */
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
index 0f5e589..fda8a2f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class RestrictedMethodInvocationAuthorizerTest {
RestrictedMethodInvocationAuthorizer methodInvocationAuthorizer =
new RestrictedMethodInvocationAuthorizer(null);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
index 9a51820..a5ea788 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test ResultsBag, including null elements
*/
-@Category(UnitTest.class)
public class ResultsBagJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
index c26cfa0..c38ed73 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* TODO: Test for null behaviour in various functions
*/
-@Category(UnitTest.class)
public class ResultsBagLimitBehaviourJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index e20b729..afdb2f5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
@@ -34,7 +34,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ResultsCollectionWrapperLimitJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
index d6ece5c..cac20c0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SelectResultsComparatorJUnitTest implements OQLLexerTokenTypes {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index 5c4a7ff..fa6e9c6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test StructBag Limit behaviour
*/
-@Category(UnitTest.class)
public class StructBagLimitBehaviourJUnitTest extends ResultsBagLimitBehaviourJUnitTest {
public ResultsBag getBagObject(Class clazz) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
index 1fc7e75..68142da 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StructSetJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
index b5632f0..56a39a8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AggregatorJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
index f9e6fb2..3b58864 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CqListener;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CqAttributesImplJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
index 0bddddc..6bc255a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class HashIndexSetJUnitTest {
Map<Integer, Portfolio> portfoliosMap;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
index 1ea7797..cc58bdc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
@@ -35,7 +35,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.MultithreadedTester;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class IndexElemArrayJUnitTest {
private IndexElemArray list;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
index ecb22e6..3f69b4f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryIndexStoreJUnitTest {
Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
index b01afd3..c7f8881 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryIndexStoreWithInplaceModificationJUnitTest extends MemoryIndexStoreJUnitTest {
public void subclassPreSetup() {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
index 636726b..4582c19 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* TODO: class created to fix GEODE-3938. Add more tests for other queries, parameters, etc.
*/
-@Category(UnitTest.class)
public class OQLParserTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
index 7d36a5d..a32ed70 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
@@ -77,7 +77,6 @@ import org.apache.geode.pdx.internal.PdxInstanceEnum;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
@PrepareForTest(TypeUtils.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
index 5e17bc0..3b6f024 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConnectionCountProbeJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
index a68ab83..14c7ea2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.internal.cache.tier.CommunicationMode;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LoadMonitorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
index e4febb8..1b3f754 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
@@ -24,7 +24,6 @@ import org.apache.geode.cache.EntryOperation;
import org.apache.geode.internal.cache.EntryOperationImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StringPrefixPartitionResolverJUnitTest {
static final String DELIMITER = StringPrefixPartitionResolver.DEFAULT_DELIMITER;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
index 3be74aa..f111d2d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractConfigTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
index 2100232..a3ba920 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AssertJUnitTest {
@Test
public void testAssertArgumentIsLegal() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
index f96d963..17978f0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 6.5.1.4
*/
-@Category(UnitTest.class)
public class ClassPathLoaderTest {
private static final int GENERATED_CLASS_BYTES_COUNT = 354;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
index 24ed995..c14c910 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConfigSourceJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
index 5c063ae..372d315 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CopyOnWriteHashSetJUnitTest {
@Test
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 7ce9bcb..72035d8 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
@@ -25,7 +25,7 @@ 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, SerializationTest.class})
+@Category({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 5b7cfb5..0df01f2 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
@@ -78,7 +78,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 3.0
*/
-@Category({UnitTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class DataSerializableJUnitTest implements Serializable {
/** A <code>ByteArrayOutputStream</code> that data is serialized to */
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
index 5d45344..448d629 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DataSerializerHolderJUnitTest extends TestCase {
@After
diff --git a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
index c353bef..22ba473 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* This test prints out the version information obtained from the {@link GemFireVersion} class. It
* provides a record of what version of GemFire (and the JDK) was used to run the unit tests.
*/
-@Category(UnitTest.class)
public class GemFireVersionJUnitTest {
@Test
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 d966b39..be91e8f 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
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* TODO right now this just tests the new write(ByteBuffer) method. We might want to add some unit
* tests for the existing methods.
*/
-@Category({UnitTest.class, SerializationTest.class})
+@Category({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 deadaf3..77de04b 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
@@ -24,7 +24,7 @@ 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, SerializationTest.class})
+@Category({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 ce75873..4c40ca0 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
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link InternalDataSerializer} class.
*/
-@Category({UnitTest.class, SerializationTest.class})
+@Category({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 defcb83..c37fa15 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
@@ -39,7 +39,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* codepoints, and that it doesn't tend to test strings that are particularly long, though the more
* trials you run, the longer they get.
*/
-@Category({UnitTest.class, SerializationTest.class})
+@Category({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 6e7aca2..0a42787 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
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-@Category({UnitTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class InternalDataSerializerSerializationWhitelistTest {
private HeapDataOutputStream outputStream;
private Object testSerializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
index 9eb4991..05edced 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LineWrapUnitJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
index a168080..6a1b0b8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class NanoTimerJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
index 32ae5f5..d43f990 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ObjIdConcurrentMapTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
index 40f8594..c46e515 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the functionality of the {@link ObjIdMap} class.
*/
-@Category(UnitTest.class)
public class ObjIdMapJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
index 196facf..9071507 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OneTaskOnlyDecoratorJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
index ab5f60d..c9d96be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PutAllOperationContextJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
index 79577d2..8db169b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 5.0.2 (cbb5x_PerfScale)
*/
-@Category(UnitTest.class)
public class UniqueIdGeneratorJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 3ce3736..b9802b9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -24,7 +24,6 @@ import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class VersionJUnitTest {
@Test
public void testVersionClass() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
index 9e3622b..8f1012f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* DistributionLocatorId Tester.
*/
-@Category(UnitTest.class)
public class DistributionLocatorIdJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
index 401d5b2..64c1e56 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoteGfManagerAgentTest {
private RemoteGfManagerAgent mockConnectedAgent(GfManagerAgentConfig config) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
index 0358ebf..1dd9915 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractDiskRegionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
index 258dff2..9c6cb9e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractOplogDiskRegionEntryTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
index 303c4c3..edbdd87 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class AbstractRegionJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index d546ddb..6d1bba7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -61,7 +61,6 @@ import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntrie
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractRegionMapTest {
private static final Object KEY = "key";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
index 376bec146..ba4fd9d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
@@ -57,7 +57,6 @@ import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntrie
import org.apache.geode.test.junit.categories.UnitTest;
@SuppressWarnings("unchecked")
-@Category(UnitTest.class)
public class AbstractRegionMapTxApplyDestroyTest {
// parameters
private Object key = "key";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
index 6c75a4b..c84b747 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractRegionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
index 9e7ae97..c452aab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.partitioned.Bucket;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketAdvisorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
index 6b5f9a4..3669cca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberView;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketPersistenceAdvisorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
index c540d8e..41a067d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
index 30b40ee..6e6d1c4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
@@ -36,7 +36,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketRegionJUnitTest extends DistributedRegionJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
index 4ea10cf..3a885a0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CacheOperationMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
index d9b400f..3eb5dd0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CacheProfileTest {
private ClusterDistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
index 4914342..db40e76 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* CacheServerLauncher Tester.
*/
-@Category(UnitTest.class)
public class CacheServerLauncherJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
index ded281b..8942795 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
-@Category(UnitTest.class)
public class ColocationHelperTest {
/**
* This test assumes Locale is in English. Before the test, change the locale of Locale and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
index 6d0b537..1b73497 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
index c10f3c2..3e3b42d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test verifies the setting and getting of disk id values are correctly
*/
-@Category(UnitTest.class)
public class DiskIdJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
index 9f70b3a..2368921 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DiskStoreMonitorTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
index 675951a..0ae0b48 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.DiskStoreMonitor.DiskState;
import org.apache.geode.internal.cache.DiskStoreMonitor.DiskUsage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DiskUsageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
index 42898b5..4e27716 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests if DiskWriteAttributeFactory returns the correct DWA object with the desired values
*/
-@Category(UnitTest.class)
public class DiskWriteAttributesJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
index 3b9df65..a6f6a66 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistPeerTXStateStubTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
index bde43fb..2c0d063 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationM
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedCacheOperationTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
index 9fd09dd..d3689f7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedPutAllOperationTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
index 204fd4b..15bb817 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedRegionFunctionStreamingMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
index 94022b8..bbedb64 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedRegionJUnitTest extends AbstractDistributedRegionJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
index db0a84c..624dabc 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({SearchLoadAndWriteProcessor.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
index 3196b03..d9864bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedRegionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
index cd5ecd2..33cff8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedRemoveAllOperationTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
index 82cb3d5..fdbad8f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EntryEventImplTest {
private String key;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
index 50ab538..95fabb1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EntryEventSerializationTest {
private InternalRegion region;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
index 421535a..2fdc0ac 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EnumListenerEventJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
index 8346bc6..555b384 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EvictionAttributesImplTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
index 68969dc..edf3ea3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExpiryTaskTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
index 4084db8..47ce409 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.ServerCQ;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FilterProfileNullCqBaseRegionJUnitTest {
private FilterProfile filterProfile;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
index fbfbb74..0e117b0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FlusherThreadTest {
private DiskStoreImpl diskStoreImpl;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index b323bd4..731c78e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GemFireCacheImplTest {
private InternalDistributedSystem distributedSystem;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
index d2d7af5..d07e361 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GridProfileTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
index af98d9c..a597b39 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class InitialImageOperationTest {
private ClusterDistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
index 245a453..0b8b531 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class InternalCacheForClientAccessTest {
private InternalCache delegate;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
index e6df7ef..4f02bb2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JtaAfterCompletionMessageTest {
@Test
public void testAfterCompletionNotInvokedIfJTACompleted() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
index 47b3015..f46359e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JtaBeforeCompletionMessageTest {
@Test
public void testBeforeCompletionNotInvokedIfJTACompleted() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
index 9d80dcc..a1ffa6a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
@@ -30,7 +30,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LocalDataSetTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
index 37531bf..e2aff0e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemberFunctionStreamingMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
index c807fa4..267a174 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class NonLocalRegionEntryTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
index 6b04ee9..5ceb472 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.offheap.SlabImpl;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapValueWrapperJUnitTest {
private OffHeapValueWrapper createChunkValueWrapper(byte[] bytes, boolean isSerialized) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
index 46fde66..6185db8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OldVLJUnitTest {
private ByteArrayOutputStream baos;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
index 16c5ce4..8407701 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdMap
*/
-@Category(UnitTest.class)
public class OplogEntryIdMapJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
index a7e4401..a521352 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdSet
*/
-@Category(UnitTest.class)
public class OplogEntryIdSetJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
index 69ce89a..75713e7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OplogTest {
private final DiskStoreImpl.OplogCompactor compactor = mock(DiskStoreImpl.OplogCompactor.class);
private final PersistentOplogSet parent = mock(PersistentOplogSet.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
index f448d84..9312249 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
@@ -23,7 +23,6 @@ import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OrderedTombstoneMapJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
index 5faf7be..ec32d17 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test suite for PartitionAttributesImpl.
*/
-@Category(UnitTest.class)
public class PartitionAttributesImplJUnitTest {
private String colocatedRegionFullPath;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
index 401fbc5..d462ed3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionRegionConfigJUnitTest {
@Test
public void whenSetColocationCompleteThenAllColocationListenersMustBeExecuted() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
index 0632b71..acacf1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionRegionConfigTest {
private int prId;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
index 913a728..48ff5f1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
@@ -30,7 +30,6 @@ import org.mockito.Mock;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionDataStoreTest {
@Mock
private PartitionedRegion partitionedRegion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
index 0734183..0e251e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionHelperJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
index 7ae91be..5f67276 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionQueryEvaluatorTest {
private InternalDistributedMember localNode;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
index 9c207f2..e5623a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
private static final int TOTAL_BUCKETS = 3;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
index daa8418..01d5b00 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PlaceHolderDiskRegionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
index 05feed5..c1bb112 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ProxyBucketRegionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
index 7f4fae8..2c2ed13 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.TXCommitMessage.RegionCommit;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionCommitTest {
private ClusterDistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
index 31238af..8c508ef 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RequestFilterInfoMessageTest {
private ClusterDistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
index b7f04b1..ff9d703 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RequestImageMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
index 6504223..0cf6cb8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RequestRVVMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
index cc1eb6c..31edd50 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SearchLoadAndWriteProcessorTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
index a436beb..e874ba6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StateMarkerMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
index f8abef7..3413d8d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXEventTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index cdbc763..97eef1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXManagerImplTest {
private TXManagerImpl txMgr;
TXId txid;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
index 4263be0..6fea7e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
index 19cb5b8..ffd52db 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.CancelException;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXRegionLockRequestImplTest {
private InternalCache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
index 1aa5005..95c3320 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.region.entry.RegionEntryFactoryBuilder;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXStateProxyImplTest {
private InternalCache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
index af692f2..294c7b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.TXRegionStub;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXStateStubTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
index a6ba2f5..6e27021 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.internal.cache.tier.sockets.CommBufferPool;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TXSynchronizationRunnableTest {
private CancelCriterion cancelCriterion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
index 489b895..5bd5174 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for TxCommitMessage.
*/
-@Category(UnitTest.class)
public class TxCommitMessageTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
index 3f3b05e..7354d68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* TODO these tests need some work. I don't think they really represent edge cases for this variable
* length value.
*/
-@Category(UnitTest.class)
public class VLJUnitTest {
private ByteArrayOutputStream baos;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
index 34c5a74..188f864 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class VMLRURegionMapTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
index 88a869a..3171f6d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbortBackupFactoryTest {
private AbortBackupFactory abortBackupFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
index 3b4c389..a545a58 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbortBackupRequestTest {
private AbortBackupRequest abortBackupRequest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
index aca41b3..ef0bfd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbortBackupStepTest {
private DistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
index 4809870..c1c8ece 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractBackupWriterConfigTest {
private Properties properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
index 5c93588..a74865e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupDefinitionTest {
private BackupDefinition backupDefinition = new BackupDefinition();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
index 26267fb..b8a3292 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupReplyProcessorTest {
private BackupReplyProcessor backupReplyProcessor;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
index 2e34697..8074648 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupServiceTest {
private BackupService backupService;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
index 7b0d304..fd0b407 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupWriterFactoryTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
index d159125..2da3b20 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FileSystemBackupWriterConfigTest {
private Properties properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
index cbb8254..2756a1d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FileSystemIncrementalBackupLocationTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
index 594f62a..3a3f999 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FinishBackupFactoryTest {
private FinishBackupFactory finishBackupFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
index 1fb653f..9a7940d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FinishBackupRequestTest {
private FinishBackupRequest finishBackupRequest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
index f4fc0ad..151c884 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FinishBackupStepTest {
private DistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
index f3842d0..b63ff55 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FlushToDiskFactoryTest {
private FlushToDiskFactory flushToDiskFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
index c5ee1ba..d0e1e68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FlushToDiskRequestTest {
private FlushToDiskRequest flushToDiskRequest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
index f8d5c83..33d2866 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FlushToDiskStepTest {
private DistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
index 31cd759..f0c8956 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PrepareBackupFactoryTest {
private PrepareBackupFactory prepareBackupFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
index 3bb7cec..00336f9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PrepareBackupRequestTest {
private PrepareBackupRequest prepareBackupRequest;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
index 857984e..c2a54f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PrepareBackupStepTest {
private DistributionManager dm;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
index 81ef446..fb5167e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.DiskStore;
import org.apache.geode.internal.cache.DirectoryHolder;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TemporaryBackupFilesTest {
private static final String DISK_STORE_DIR_NAME = "testDiskStores";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
index 1e26d28..36a9ad2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FilterByPathJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
index 9dc3488..bc57437 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryThresholdsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
index 6f167c0..65cc575 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ResourceAdvisorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
index f95b023..560bbac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
@@ -53,7 +53,6 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractRegionEntryTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
index abedd25..729d63b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedEventTrackerTest {
LocalRegion region;
RegionAttributes<?, ?> regionAttributes;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
index 1f969ef..7c7306c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EventTrackerExpiryTaskTest {
private static final long TIME_TO_LIVE = 100;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
index 6f8e072..a141997 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class NonDistributedEventTrackerTest {
private NonDistributedEventTracker tracker = NonDistributedEventTracker.getInstance();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
index 942c254..8a4bb9e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractEvictionListTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
index 2a2d233..36cd9eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class EvictionListBuilderTest {
private static final String EVICTION_PROPERTY_NAME = "geode." + EVICTION_SCAN_ASYNC;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
index ce76de9..0b572c6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LIFOListTest {
private BucketRegion bucketRegion;
private EvictionCounters stats;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
index c5f4fe4..3cc356c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LRUListWithAsyncSortingTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
index b21afcc..1ddb3ae 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LRUListWithSyncSortingTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index 1d97503..728ced4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class SimpleExtensionPointJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index ca60799..51d9ba6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* methods written in <code>EventID</code> class for the above optimization. For distributed testing
* for the same , please refer {@link EventIdOptimizationDUnitTest}.
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class EventIdOptimizationJUnitTest {
/** The long id (threadId or sequenceId) having value equivalent to byte */
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 d305b4b..1e0cc52 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
@@ -35,7 +35,7 @@ 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, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueTest {
private HARegionQueue haRegionQueue;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index 32a8f13..8155cd1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ThreadIdentifierJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
index 02a70a8..c5e4781 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionEntryFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractRegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
private final FocusedRegionMap focusedRegionMap = mock(FocusedRegionMap.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
index 2815cf7..d99aee3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionMapCommitPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
private final FocusedRegionMap focusedRegionMap = mock(FocusedRegionMap.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
index 3837420..4e2c122 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionMapDestroyTest {
private static final EvictionAttributes evictionAttributes =
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
index dfbe381..1abd7d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
@@ -59,7 +59,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
private final FocusedRegionMap focusedRegionMap = mock(FocusedRegionMap.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
index 6d6afac..1a6e2fe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketBackupMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
index 70a7b23..5637bfe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ColocatedRegionDetailsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
index 9d7bb7d..e1cb981 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DeposePrimaryBucketMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index e539868..55e2112 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FetchEntriesMessageJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
index 4aaf7dd..46b7029 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FetchEntryMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
index 6962e13..3ea3be3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FetchKeysMessageTest {
@Mock(answer = RETURNS_DEEP_STUBS)
private InternalCache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
index 8e0b588..587adac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FetchPartitionDetailsMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
index 97d9663..728e0cf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.internal.cache.PartitionedRegionStats;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ManageBackupBucketReplyMessageTest {
@Mock
private ClusterDistributionManager distributionManager;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
index 06c378d..b6e2606 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MoveBucketMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
index b96c993..8bae667 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OfflineMembersDetailsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
index 56c4a13..19cf462 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionMessageTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
index c126bec..ea56652 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PutPutReplyMessageJUnitTest extends OldValueImporterTestBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
index 8b2e6f9..c52b407 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemotePutMessageJUnitTest {
static final int UNKNOWN_REGION = 234;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
index 7be39db..f5c4040 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoveAllPRMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
index 87e1a7e..bea842b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoveBucketMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
index f18863f..544dca5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SizeMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
index b275b66..eb19d52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.cache.partitioned.PartitionedRegionRebalanceOp;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketOperatorImplTest {
private InternalResourceManager.ResourceObserver resourceObserver;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
index 564a153..ba49ff8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.internal.cache.control.ResourceManagerStats;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BucketOperatorWrapperTest {
private ResourceManagerStats stats;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
index 60a9e91..31940ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.internal.cache.partitioned.rebalance.model.PartitionedRe
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionLoadModelJUnitTest {
private static final int MAX_MOVES = 5000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
index c445bca..78139c2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DefaultDiskDirsTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
index eb4c8f2..650b8eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
@@ -56,7 +56,6 @@ import org.apache.geode.internal.cache.CacheDistributionAdvisor.InitialImageAdvi
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PersistenceInitialImageAdvisorTest {
@Rule
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
index d9bcb81..03c5ec7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.internal.cache.persistence.query.mock.Pair;
import org.apache.geode.internal.cache.persistence.query.mock.PairComparator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TemporaryResultSetFactoryJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
index 29272ed..cb9ccd0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.runner.RunWith;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@RunWith(JUnitParamsRunner.class)
public class RegionEntryFactoryBuilderJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
index 9177b71..640d9d3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClientExporterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
index 371fc6e..8212622 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
@@ -31,7 +31,6 @@ import org.junit.rules.ExpectedException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ParallelSnapshotFileMapperTest {
private static final int PORT = 1234;
private static final String BASE_LOCATION = "/test/snapshot";
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 c890e93..ce62a49 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
@@ -25,7 +25,7 @@ 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, ClientSubscriptionTest.class})
+@Category({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 09a3d4e..50bf246 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
@@ -34,7 +34,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* This is a functional-test for <code>ClientHealthMonitor</code>.
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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/FilterProfileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index 75ce1a0..b987318 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -37,7 +37,7 @@ import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class FilterProfileJUnitTest {
private LocalRegion mockRegion;
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 d71271d..f244b92 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
@@ -26,7 +26,7 @@ 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, ClientServerTest.class})
+@Category({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 8c47756..218ce16 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
@@ -36,7 +36,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class MessageIdExtractorTest {
@Mock
Message requestMessage;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index dee0d7d..b0f4223 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class MessageJUnitTest {
private Message message;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index d032d35..dea2fde 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ObjectPartListJUnitTest {
@Test
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 8feb263..c73b6ba 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
@@ -27,7 +27,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class PartTest {
@Test
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 1dac08d..6832f33 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
@@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* What we are concerned with is making sure that everything stays the same when the feature flag
* isn't set, and that we at least try to load the service when the feature flag is true.
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ServerConnectionFactoryTest {
@Rule
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 5862ad7..c1b0e8f 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
@@ -50,7 +50,7 @@ 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, ClientServerTest.class})
+@Category({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 1cc86d3..e4b2d52 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
@@ -24,7 +24,7 @@ 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, MembershipTest.class})
+@Category({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 a3f2ef9..2143e79 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
@@ -47,7 +47,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Exposes GEODE-537: NPE in JTA AFTER_COMPLETION command processing
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 6509624..ff60cf0 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
@@ -42,7 +42,7 @@ 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, ClientServerTest.class})
+@Category({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 592c4ca..e3681e7 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
@@ -43,7 +43,7 @@ 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, ClientServerTest.class})
+@Category({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 abb1099..d57a434 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
@@ -44,7 +44,7 @@ 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, ClientServerTest.class})
+@Category({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 05a53ab..64f240f 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
@@ -46,7 +46,7 @@ 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, ClientServerTest.class})
+@Category({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 f30f539..2b91d74 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
@@ -46,7 +46,7 @@ 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, ClientServerTest.class})
+@Category({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 c5edf87..678f1e1 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
@@ -46,7 +46,7 @@ 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, ClientServerTest.class})
+@Category({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 70ba8e3..c83e18d 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
@@ -62,7 +62,7 @@ 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, ClientServerTest.class})
+@Category({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 c49d565..9e3810f 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
@@ -60,7 +60,7 @@ 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, ClientServerTest.class})
+@Category({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 c920f0d..88f4fef 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
@@ -60,7 +60,7 @@ 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, ClientServerTest.class})
+@Category({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 a65b457..db90063 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
@@ -47,7 +47,7 @@ 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, ClientServerTest.class})
+@Category({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 916732a..54956a6 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 866fa6d..2a03e2f 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 6107b5e..67028d0 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
@@ -50,7 +50,7 @@ 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, ClientServerTest.class})
+@Category({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 70b22a3..539ebc9 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
@@ -48,7 +48,7 @@ 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, ClientServerTest.class})
+@Category({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 fb99ff5..694b2dc 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
@@ -36,7 +36,7 @@ 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, ClientServerTest.class})
+@Category({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 b5fb324..002587d 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
@@ -36,7 +36,7 @@ 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, ClientServerTest.class})
+@Category({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 a6c495f..9e4e050 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
@@ -49,7 +49,7 @@ 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, ClientServerTest.class})
+@Category({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 356b4be..0a1bc57 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
@@ -52,7 +52,7 @@ 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, ClientServerTest.class})
+@Category({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 a6d8b62..343337c 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
@@ -49,7 +49,7 @@ 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, ClientServerTest.class})
+@Category({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 fb210b9..53e3c7d 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
@@ -50,7 +50,7 @@ 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, ClientServerTest.class})
+@Category({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 d757e7e..7515b1e 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 98ffca4..bf73cd5 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 68008e4..6277237 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
@@ -50,7 +50,7 @@ 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, ClientServerTest.class})
+@Category({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 3ee17df..8d841e8 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
@@ -52,7 +52,7 @@ 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, ClientServerTest.class})
+@Category({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 fd14a07..7976057 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
@@ -50,7 +50,7 @@ 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, ClientServerTest.class})
+@Category({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 24dffd5..9c578f1 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
@@ -49,7 +49,7 @@ 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, ClientServerTest.class})
+@Category({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 93c4407..e16632a 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
@@ -47,7 +47,7 @@ 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, ClientServerTest.class})
+@Category({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 8a449a3..5407e08 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
@@ -47,7 +47,7 @@ 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, ClientServerTest.class})
+@Category({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 891739a..dbd1427 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
@@ -38,7 +38,7 @@ 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, ClientServerTest.class})
+@Category({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 21d4967..fec92c6 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
@@ -59,7 +59,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"*.UnitTest"})
@PrepareForTest({CacheClientNotifier.class})
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class UnregisterInterestTest {
private static final String REGION_NAME = "region1";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
index ec95258..7a6b232 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AbstractPeerTXRegionStubTest {
private AbstractPeerTXRegionStub txrStub;
private TXStateStub state;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
index c178686..c33c162 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClientTXStateStubTest {
private InternalCache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
index 99468be..7963de0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoteFetchEntryMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
index 2c80582..f7222ad 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoteOperationMessageTest {
private TestableRemoteOperationMessage msg; // the class under test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
index 7d6d83e..4ed9acb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoteOperationResponseTest {
private RemoteOperationResponse replyProcessor; // the class under test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
index aaeeccf..6f33951 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemotePutAllMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
index 63bab9a..e7b1d4d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RemoteOperationException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
@PrepareForTest(RemotePutMessage.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
index 1e8a93c..96f9897 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.tx.RemotePutMessage.PutReplyMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemotePutReplyMessageJUnitTest extends OldValueImporterTestBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
index b06cd6b..f445eb4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RemoteRemoveAllMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
index f078142..4918c32 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RVVExceptionJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
index 0ee2401..266fcfd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionVersionHolder2JUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index b093fb0..341385d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.versions.RVVException.ReceivedVersionsIterator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionVersionHolderJUnitTest {
private int originalBitSetWidth;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index e1755dc..e6231a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* This test also contains some other non deterministic RVV junit tests
*
*/
-@Category(UnitTest.class)
public class RegionVersionHolderRandomJUnitTest extends RegionVersionHolderSmallBitSetJUnitTest {
private Random random;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
index aa4e2b6..cf6f3da 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
@@ -22,7 +22,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* A test of the region version holder, but using a smaller bit set so that we test the merging of
* exceptions functionality.
*/
-@Category(UnitTest.class)
public class RegionVersionHolderSmallBitSetJUnitTest extends RegionVersionHolderJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
index f5df5b9..cb37bc2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
@@ -18,7 +18,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class VMVersionTagTest extends AbstractVersionTagTestBase {
@SuppressWarnings("rawtypes")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
index 533ed38..27eda0a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ParallelGatewaySenderEventProcessorJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
index 9fd74d6..a0adacd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.M
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.ParallelGatewaySenderQueueMetaRegion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ParallelGatewaySenderQueueJUnitTest {
private ParallelGatewaySenderQueue queue;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 578c030..88c35af 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -70,7 +70,6 @@ import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ParallelQueueRemovalMessageJUnitTest {
private static final String GATEWAY_SENDER_ID = "ny";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
index b7a726a..4901bdf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConcurrentSerialGatewaySenderEventProcessorJUnitTest {
private ConcurrentSerialGatewaySenderEventProcessor processor;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
index 9d8301a..c091ce6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation.DestroyMessage;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
index 6cb0fdb..20844af 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SerialGatewaySenderEventProcessorJUnitTest {
private AbstractGatewaySender sender;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index 1510426..275ab24 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class AbstractXmlParserJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index 76fd803..0bdd6cd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.internal.cache.CacheServerLauncher;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CacheCreationJUnitTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
index 437dc45..2f94665 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CacheTransactionManagerCreationTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index a95b43a..b4c856a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class CacheXmlVersionJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
index bc77c9f..b18128f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -25,7 +25,6 @@ import org.xml.sax.InputSource;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DefaultEntityResolver2Test {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
index 823b04ff..a3ef878 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
@@ -23,7 +23,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link GeodeEntityResolver} and {@link DefaultEntityResolver2}.
*/
-@Category(UnitTest.class)
public class GeodeEntityResolverJUnitTest extends AbstractEntityResolverTest {
private EntityResolver entityResolver;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 4107f72..0c5f2b5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class PivotalEntityResolverJUnitTest extends AbstractEntityResolverTest {
private EntityResolver entityResolver;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 31b6739..9bf61c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class RegionCreationJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index cf5b1dc..91342eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class XmlGeneratorUtilsJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
index 073874d..15bcb71 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JAXBServiceTest {
private String xml;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index a14a93c5..5c5714e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class CompositeOutputStreamJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
index de28cb7..9afb8d4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests all basic methods of ContextImpl.
*/
-@Category(UnitTest.class)
public class ContextJUnitTest {
private Context initialContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
index d937ab9..b18cd87 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class ClassUtilsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
index 7296270..fdc92e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 6.8
*/
-@Category(UnitTest.class)
public class InOutParameterJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 0d5095f..70a1ab4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Assert
* @see org.junit.Test
*/
-@Category(UnitTest.class)
public class ObjectUtilsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
index dedd85b..b6e1ac2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @since GemFire 7.0
*/
@SuppressWarnings("null")
-@Category(UnitTest.class)
public class StringUtilsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
index dc3e8ce..2bc0056 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SystemPropertyHelperTest {
private String restoreSetOperationTransactionBehavior = "restoreSetOperationTransactionBehavior";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 97472b3..0bc4cfd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 6.8
*/
-@Category(UnitTest.class)
public class SystemUtilsJUnitTest {
// NOTE this test adds some maintenance overhead but ensure the correct functioning of GemFire
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
index be525c1..c97b8c3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ThrowableUtils}
*/
-@Category(UnitTest.class)
public class ThrowableUtilsTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
index f2d6bc8..4f0d8bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for LogService
*/
-@Category(UnitTest.class)
@RunWith(JUnitParamsRunner.class)
public class LogServiceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
index 0467f28..79074f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogWriterImplJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
index 895cc23..1c0ba77 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 3.0
*/
-@Category(UnitTest.class)
public class SortLogFileJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
index 60f55dd..6d5a026 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the AlertAppender.
*/
-@Category(UnitTest.class)
public class AlertAppenderJUnitTest {
private final List<DistributedMember> members = new ArrayList<DistributedMember>();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
index 0fd2b63..5bc039b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* Unit tests the FastLogger class which wraps and delegates to an actual Logger with optimizations
* for isDebugEnabled and isTraceEnabled.
*/
-@Category(UnitTest.class)
public class FastLoggerJUnitTest {
private MessageFactory messageFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
index 678ad66..b7ddedb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests for LocalizedMessage which bridges our StringId LocalizedStrings for Log4J2 usage.
*/
-@Category(UnitTest.class)
public class LocalizedMessageJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
index 7ead149..eff451f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogLevelTest {
@Test
public void testGetLevel() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
index c2b92cb..5f3d2ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the LogWriterAppender.
*/
-@Category(UnitTest.class)
public class LogWriterAppenderJUnitTest {
private Level previousLogLevel;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 6eaf44e..c09df5e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SSLConfigurationFactoryJUnitTest {
@Rule
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 a231c72..50e86e3 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
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the default SocketCloser.
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({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 9629527..4e48bc5 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
@@ -25,7 +25,7 @@ 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, MembershipTest.class})
+@Category({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 d26135e..d0f45ba 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
@@ -88,7 +88,7 @@ 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, MembershipTest.class})
+@Category({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 8376d59..49c84de 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
@@ -34,7 +34,7 @@ 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, MembershipTest.class})
+@Category({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 329f1f2..e82511a 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
@@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SocketUtilsJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index 383ce50..fa710ed 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -73,7 +73,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the DataType support for off-heap MemoryInspector.
*/
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({InternalInstantiator.class, Instantiator.class, DataSerializer.class,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
index 4b1b6f8..1996fe0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DisconnectingOutOfOffHeapMemoryListenerJUnitTest {
private final InternalDistributedSystem ids = mock(InternalDistributedSystem.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
index e57e366..875f1f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.rules.ExpectedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FragmentJUnitTest {
private SlabImpl[] slabs;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
index b0b5ad8..c882054 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
@@ -36,7 +36,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FreeListManagerTest {
private final int DEFAULT_SLAB_SIZE = 1024 * 1024 * 5;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index a89d519..492906c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests LifecycleListener
*/
-@Category(UnitTest.class)
public class LifecycleListenerJUnitTest {
private final List<LifecycleListenerCallback> afterCreateCallbacks =
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index 877e64b..ca230b8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
*/
-@Category(UnitTest.class)
public class MemoryAllocatorFillPatternJUnitTest {
/** Size of single test slab. */
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
index 3985563..55daf58 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryAllocatorJUnitTest {
private long expectedMemoryUsage;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index bcd43d0..6c605d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryBlockNodeJUnitTest {
private MemoryAllocatorImpl ma;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
index 48f23b9..4302aed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MemoryInspectorImplJUnitTest {
private FreeListManager freeList;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
index f47de4e..6b53963 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.VMCachedDeserializable;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
private StoredObject storedObject = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index 11dca6e..c29fa92 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({OffHeapStoredObject.class, OffHeapRegionEntryHelper.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
index d6be486..1b761c0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.statistics.LocalStatisticsFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapStorageJUnitTest {
private static final long MEGABYTE = 1024 * 1024;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
index c3b70be..00c67b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
@@ -28,7 +28,6 @@ import org.mockito.listeners.MethodInvocationReport;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapStoredObjectAddressStackJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 29bb0a5..92bf770 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.offheap.MemoryBlock.State;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
private MemoryAllocator ma;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
index 56d5cb5..d65bbbe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapStoredObjectSliceJUnitTest extends OffHeapStoredObjectJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
index 5d8bdcb..28da0ba 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapStoredObjectWithHeapFormJUnitTest extends OffHeapStoredObjectJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
index 224c993..fa07c34 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OffHeapWriteObjectAsByteArrayJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
index 18bc913..f61378e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RefCountChangeInfoJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
index b303e1a..781c030 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/*
* PowerMock used in this test to verify static method MemoryAllocatorImpl.debugLog
*/
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"*.UnitTest"})
@PrepareForTest({MemoryAllocatorImpl.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
index 4c0e39a..baf9c81 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* interfering with jacoco
*
*/
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"*.UnitTest"})
@PrepareForTest({ReferenceCountHelper.class})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
index 1e7e60a..59354a1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TinyMemoryBlockJUnitTest {
private MemoryAllocatorImpl ma;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
index 09203bf..7507144 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TinyStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
index f167f60..a05f9da 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.rules.RetryRule;
* Tests involving fakePid use {@link RetryRule} because the fakePid may become used by a real
* process before the test executes.
*/
-@Category(UnitTest.class)
public class AttachProcessUtilsTest {
private static final int PREFERRED_FAKE_PID = 42;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
index b742e1b..da4796c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FileProcessController}.
*/
-@Category(UnitTest.class)
public class FileProcessControllerTest {
private FileProcessController controller;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
index 2d7f0f6..904b061 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.rules.RetryRule;
* Tests involving fakePid use {@link RetryRule} because the fakePid may become used by a real
* process before the test executes.
*/
-@Category(UnitTest.class)
public class NativeProcessUtilsTest {
private static final int PREFERRED_FAKE_PID = 42;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
index 92e9f99..9af22a8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.0
*/
-@Category(UnitTest.class)
public class ProcessControllerFactoryTest {
private ProcessControllerFactory factory;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
index c98f026..cbc632f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ProcessLauncherContext}.
*/
-@Category(UnitTest.class)
public class ProcessLauncherContextTest {
private boolean redirectOutput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
index 04e23f3..8f8ad64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
@@ -34,7 +34,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StartupStatusTest {
private StartupStatusListener listener;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
index 62a5fd3..012371b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AvailablePid}.
*/
-@Category(UnitTest.class)
public class AvailablePidTest {
private AvailablePid availablePid;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
index d1f422d..909f0eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class AbstractSignalNotificationHandlerTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
index 40d4d0d..5edf3ba 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class CallbackInstantiatorTest {
private static final String STRING = "STRING";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
index afa007f..0c9ed4c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class IntegratedSecurityServiceConstructorTest {
private IntegratedSecurityService securityService;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
index 6f8526e..e9b1939 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class IntegratedSecurityServiceTest {
private SecurityManager mockSecurityManager;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
index 0819b6e..91b6c23 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LegacySecurityServiceTest {
private LegacySecurityService service;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
index 320ed76..5819e48 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class SecurityServiceFactoryTest {
private SecurityService service;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
index 94fadde..aae6763 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class SecurityServiceTest {
private Properties properties;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
index 3aebf1b..babbf1d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ObjectSizerJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
index 26a2160..6b0c138 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ObjectTraverserJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
index 9b1aad3..df352bd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ReflectionObjectSizerJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
index 24dab64..64a3b93b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SizeClassOnceObjectSizerJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
index 8665452..e2859c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class WellKnownClassSizerJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
index 73c75e8..93c5b84 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link CallbackSampler}.
*/
-@Category(UnitTest.class)
@RunWith(MockitoJUnitRunner.class)
public class CallbackSamplerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
index ab9e817..f5118df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since Geode 1.0
*/
-@Category(UnitTest.class)
public class ResourceInstTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
index d03a077..515d5fd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class SampleCollectorTest {
private TestStatisticsManager manager;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
index 657fa5c..62743d7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StatArchiveWriterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
index 9348436..30c45e5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class StatMonitorHandlerTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
index bb2dd0d..05f5961 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted tests from StatMonitorHandlerTest that require enableMonitorThread
*/
-@Category(UnitTest.class)
public class StatMonitorHandlerWithEnabledMonitorThreadTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
index 9494088..7d0fff5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link StatisticsImpl}.
*/
-@Category(UnitTest.class)
public class StatisticsImplTest {
private Logger originalLogger;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
index 9cc54ab..d50793f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class StatisticsMonitorTest {
private TestStatisticsManager manager;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index 571fde9..0b5ebc2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ConnectionJUnitTest {
/**
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 eb87a1b..7a3e4f3 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
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, MembershipTest.class})
+@Category({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 7ecefd1..f2b0741 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
@@ -28,7 +28,7 @@ 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, MembershipTest.class})
+@Category({MembershipTest.class})
public class ConnectionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
index ff489bb..985b1b9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.internal.util.AbortableTaskService.AbortableTask;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
-@Category(UnitTest.class)
public class AbortableTaskServiceJUnitTest {
private static final long TIMEOUT_SECONDS = 10;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
index 3da76a7..a45fe00 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
@@ -35,7 +35,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Banner;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ArgumentRedactorJUnitTest {
private static final String someProperty = "redactorTest.someProperty";
private static final String somePasswordProperty = "redactorTest.aPassword";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
index fc156ea..9d5f08e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.x
*/
-@Category(UnitTest.class)
@SuppressWarnings("null")
public class ArrayUtilsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
index 1d9a510..295bce6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* <li>{@link BlobHelper#deserializeOffHeapBlob(StoredObject)}
* <li>{@link BlobHelper#serializeToBlob(Object, Version)}
*/
-@Category(UnitTest.class)
public class BlobHelperTest {
private static final int HDOS_ALLOC_SIZE = 32;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index a36ceee..5109980 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 2.0.2
*/
-@Category(UnitTest.class)
public class BlobHelperWithThreadContextClassLoaderTest {
private static final String CLASS_NAME_SERIALIZABLE_IMPL =
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
index 73c6a0e..ca9f430 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class CollectionUtilsJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
index 5e55aea..b4b1d8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DelayedActionJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index 22f96ca..5d2c31f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -36,7 +36,6 @@ import org.junit.runner.RunWith;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@RunWith(JUnitParamsRunner.class)
public class HostNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index ba670b7..4f9ba53 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Assert
* @see org.junit.Test
*/
-@Category(UnitTest.class)
public class IOUtilsJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
index 2430ef2..1bd78d7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class PasswordUtilJUnitTest {
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
index c5e3a66..5229d89 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
-@Category(UnitTest.class)
public class PluckStacksUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
index 2719067..d7bdb85 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.concurrent.CompactConcurrentHashSet2;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompactConcurrentHashSetJUnitTest {
private static final int RANGE = 100000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
index 197b2ed..ca1af84 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* Unit tests for {@link FutureResult}.
*
*/
-@Category(UnitTest.class)
public class FutureResultJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
index 8eb2947..ac33adc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.rules.Timeout;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ReentrantSemaphoreJUnitTest {
private static final long OPERATION_TIMEOUT_MILLIS = 10 * 1000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
index 1416685..b54ec9c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.rules.Timeout;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class SemaphoreReadWriteLockJUnitTest {
private static final long OPERATION_TIMEOUT_MILLIS = 10 * 1000;
diff --git a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
index 867fc69..2a19a6d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.DiskBackupStatusImpl;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DiskBackupStatusTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
index 6837090..c4b462a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.management.internal.beans.stats.StatType;
import org.apache.geode.management.internal.beans.stats.StatsRate;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StatsRateJUnitTest {
private Long SINGLE_STATS_LONG_COUNTER = null;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
index 4d88fef..4c46065 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompositeBuilderViaFromTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
index e7c52e3..cc35a04 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompositeBuilderViaProxyTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
index 5e8d0fe..80ff3b2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class IdentityConverterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
index 302575b..4fe177b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Assert
* @see org.junit.Test
*/
-@Category(UnitTest.class)
public class JettyHelperJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
index 8702a34..8a7acae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* <p>
* GEODE-3407: JMX and membership may deadlock on CacheFactory.getAnyInstance
*/
-@Category(UnitTest.class)
public class CacheServerBridgeClientMembershipRegressionTest {
private final AtomicBoolean after = new AtomicBoolean();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
index 4dc033f..d40dc51 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.management.internal.FederationComponent;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DistributedSystemBridgeJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
index a2db199..18f5135 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FileUploaderTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
index 50677ed..edcda31 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class QueryDataFunctionApplyLimitClauseTest {
private String selectQuery;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
index c507681..8654e8e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.statistics.ValueMonitor;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor.DefaultHashMap;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class MBeanStatsMonitorTest {
private ValueMonitor statsMonitor;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
index 21fbc0d..714004a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.management.internal.cli.domain.Interface2;
import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClasspathScanLoadHelperJUnitTest {
private final String PACKAGE_NAME = "org.apache.geode.management.internal.cli.domain";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
index 44c5fe1..cef0550 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
@@ -31,7 +31,6 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CliUtilTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
index c26f5c6..8409648 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* CommandManagerTest - Includes tests to check the CommandManager functions
*/
-@Category(UnitTest.class)
public class CommandManagerJUnitTest {
private static final String COMMAND1_NAME = "command1";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
index b40d9db..6504510 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CommandSeparatorEscapeJUnitTest {
// testcases : single command
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
index 2e53d0a..dd7acc3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.management.internal.cli.dto.Car;
import org.apache.geode.management.internal.cli.util.JsonUtil;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DataCommandJsonJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
index 66268d3..455f0e4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion capabilities of
* {@link GfshParser}
*/
-@Category(UnitTest.class)
public class GfshParserJUnitTest {
private String input;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
index 4c4fbf4..86f86b1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class AlterAsyncEventQueueCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
index 2ff6bd2..4574d06 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class AlterDiskStoreJUnitTest {
@Rule
public GfshParserRule gfsh = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
index 6f3bbba..7e95d4c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class AlterRegionCommandTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
index a458783..7ce9d5f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.management.internal.cli.CommandManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CommandAvailabilityIndicatorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
index ce9e83d..d0ad9fd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ConfigurePDXCommandTest {
private static final String BASE_COMMAND_STRING = "configure pdx ";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
index ac5e152..cb6f9ed 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.management.internal.cli.shell.OperationInvoker;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ConnectCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
index 07d08ff..8e78dc3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateAsyncEventQueueCommandTest {
public static final String COMMAND = "create async-event-queue ";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
index 90661ed..f7cf7de 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateDefinedIndexesCommandTest {
@Rule
public GfshParserRule gfshParser = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
index d923ece..171271b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateGatewayReceiverCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
index 5875eda..cb4b796 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateGatewaySenderCommandTest {
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
index 62782b6..d70b729 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateIndexCommandTest {
@Rule
public GfshParserRule gfshParser = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
index d20c470..04f8117 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
@@ -53,7 +53,6 @@ import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunct
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateJndiBindingCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
index 9b8e6a9..d046fa8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class CreateRegionCommandTest {
@Rule
public GfshParserRule parser = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
index b585309..80c595b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DeployCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
index d94707a..b476e33 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DescribeConfigCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
index c185335..e28f372 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.test.junit.assertions.CommandResultAssert;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DescribeRegionJUnitTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
index 91a8386..e5ce26b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DestroyAsyncEventQueueCommandTest {
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
index 9c72f22..40f14fa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.junit.assertions.CommandResultAssert;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DestroyGatewayReceiverCommandTest {
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
index 83371b6..7db09eb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DestroyGatewaySenderCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
index 093c97e..628618f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DestroyJndiBindingCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
index 1fd884e..015ad70 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class DestroyRegionCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index fd59094..ac3a991 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -68,7 +68,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class DiskStoreCommandsJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
index 18ca58f..3b98ec0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ExecuteFunctionCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
index cae1902..7c73e3b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
@@ -27,7 +27,6 @@ import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ExportConfigCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
index 601ba84..ffb6812 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ExportDataCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
index 03a05a7..0f35d87 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.BytesToString;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExportLogsCommandTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
index b3bf2ff..20cd8ff 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExportLogsInterceptorJUnitTest {
private ExportLogsInterceptor interceptor;
private GfshParseResult parseResult;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
index 521e50d..cec2dbd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ExportStackTraceCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
index 3417085..55d35aa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GfshCommandJUnitTest {
private InternalGfshCommand command;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
index f2f837e..5d5efac 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ImportDataCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
index a771a57..c99100d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.test.junit.categories.AEQTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category({UnitTest.class, AEQTest.class})
+@Category({AEQTest.class})
public class ListAsyncEventQueuesTest {
private static final String COMMAND = "list async-event-queues ";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
index d25277a..90d12ee 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ListGatewayCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
index 0a0576c..3c223c0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
@@ -66,7 +66,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class ListIndexCommandJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
index 0a52c5e..688aa09 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ListJndiBindingCommandTest {
@ClassRule
public static GfshParserRule gfsh = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
index 58fc605..07b0a1b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ListMembersCommandTest {
@ClassRule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
index 988beae..95d29ef 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogLevelInterceptorTest {
private List<AbstractCliAroundInterceptor> interceptors = new ArrayList<>();
private GfshParseResult parseResult;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
index f1e9841..7cac276 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(UnitTest.class)
public class ShowMetricsJUnitTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
index 3527afd..a1faec2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class UserInputPropertyTest {
private UserInputProperty userInputProperty;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
index 7a393db..7b2744d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StartJConsoleCommandTest {
@Test
public void testCreateJmxServerUrlWithMemberName() {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
index b663f9c..558795d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category(UnitTest.class)
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class BaseStringConverterJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
index fb6eba5..37288b1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.management.internal.cli.domain.ClassName;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClassNameConverterTest {
private ClassNameConverter converter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
index 4c24dc0..2bf1640 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.configuration.JndiBindingsType;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ConfigPropertyConverterTest {
private ConfigPropertyConverter converter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
index 861b639..b953df4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class IndexTypeConverterTest {
IndexTypeConverter typeConverter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
index 1a92246..8e4f2ab 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
@@ -28,7 +28,6 @@ import org.springframework.shell.core.Completion;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogLevelConverterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index fdfec25..e45449b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
-@Category(UnitTest.class)
public class RegionPathConverterJUnitTest {
@ClassRule
public static GfshParserRule parser = new GfshParserRule();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
index 73cb525..98e6dd0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClassNameTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
index 94f7f6a..a868499 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionDescriptionJUnitTest {
private static final String evictionKeyShared = "sharedEvictionKey";
private static final String partKeyShared = "sharedPartitionKey";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
index 5c42b0a..2f1aeb0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CliFunctionResultTest {
private CliFunctionResult result;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
index 894fef4..3214d95 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CreateDefinedIndexesFunctionTest {
private Cache cache;
private Region region1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index 7a4c3a2..ff6e9e7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -76,7 +76,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @since GemFire 7.0
*/
@SuppressWarnings({"null", "unused"})
-@Category(UnitTest.class)
public class DescribeDiskStoreFunctionJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
index 7caec8c..179c50e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyAsyncEventQueueFunctionTest {
private static final String TEST_AEQ_ID = "Test-AEQ";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
index fb1ef51..44e92b9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DestroyGatewayReceiverFunctionTest {
private DestroyGatewayReceiverFunction function;
private FunctionContext context;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
index cb5bef0..c92b48c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs.ExpirationAttrs;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExpirationAttrsTest {
private ExpirationAttrs attrs;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
index c57852d..4ee6cba 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.cli.commands.ExportLogsCommand;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExportLogsFunctionTest {
@Test
public void defaultExportLogLevelShouldBeAll() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
index abfe4c5..cbd1712 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GatewayReceiverCreateFunctionTest {
private GatewayReceiverCreateFunction function = mock(GatewayReceiverCreateFunction.class);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
index 28f3311..c90b3ed 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GatewaySenderDestroyFunctionTest {
private GatewaySenderDestroyFunction function;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
index ad43d81..cc5bbae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GetRegionsFunctionJUnitTest {
TestResultSender testResultSender = new TestResultSender();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
index 77db7cd..0007c98 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GetRegionsFunctionTest {
private enum STATE {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index c94b0f6..b4b3107 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class ListDiskStoresFunctionJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index 450ec4c..4b791aa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -67,7 +67,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
public class ListIndexFunctionJUnitTest {
private Mockery mockContext;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
index 31f3b12..0a114b2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionDestroyFunctionTest {
private RegionDestroyFunction function;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
index 91d10e6..a9495dc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class RegionFunctionArgsTest {
private RegionFunctionArgs args;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index 9d55699..f0c0a3e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -61,7 +61,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ShowMissingDiskStoresFunctionJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
index 50b31ec..0530111 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class HelpBlockUnitTest {
private HelpBlock firstBlock, secondBlock, thirdBlock;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
index 5786e8a..f89c63a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
@@ -33,7 +33,6 @@ import org.springframework.shell.core.annotation.CliOption;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class HelperUnitTest {
private Helper helper;
private CliCommand cliCommand;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
index b9305a4..dd2d098 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GfJsonArrayTest {
private GfJsonArray gfJsonArray;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
index b4bd1d1..82b2fc1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GfJsonObjectTest {
private GfJsonObject gfJsonObject;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
index de74f82..ed1c3ec 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* TODO: add actual assertions
*/
-@Category(UnitTest.class)
public class TypedJsonTest {
private static final String RESULT = "result";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
index b97de97..52b264b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CommandExecutorTest {
GfshParseResult parseResult;
CommandExecutor executor;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
index 8bd941e..be1d532 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.security.NotAuthorizedException;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class OnlineCommandProcessorTest {
Properties properties;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
index 026b290..9e5508b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class})
public class CommandResultTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
index d5c33fe..83b2f59 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CompositeResultDataTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
index e47118a..b332fe4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class DownloadFileResultTest {
@Test
public void resultAlwaysHasFreshLineOnCreation() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
index 77befd4..25be25c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ErrorResultDataTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
index beb57c0..ba47cb1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class FileResultTest {
private FileResult fileResult;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
index a21a1a2..40df6fb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class InfoResultDataTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
index a70d7d0..54538a5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ResultBuilderTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
index 4485d05..3d08e6d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TabularResultDataTest {
private TabularResultData data;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
index c806df4..44d40c1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LegacyVsResultModelComparisonTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
index cc75357..959a0bf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ResultModelTest {
private ResultModel result;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
index 55b3261..dd0de03 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class TabularResultModelTest {
private TabularResultModel table1;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
index 3b01b2e..c36a96e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest
*/
-@Category(UnitTest.class)
public class GfshExecutionStrategyTest {
private static final String COMMAND1_SUCCESS = "Command1 Executed successfully";
private static final String COMMAND2_SUCCESS = "Command2 Executed successfully";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
index fe19ca4..caad990 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* Makes use of reflection to reset private static variables on some classes to replace loggers that
* would otherwise clutter the console.
*/
-@Category(UnitTest.class)
public class GfshInitFileJUnitTest {
private static final String INIT_FILE_NAME = GfshConfig.DEFAULT_INIT_FILE_NAME;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
index 35be250..7927217 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
@@ -27,7 +27,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GfshJunitTest {
private String testString;
private Gfsh gfsh;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
index 772bdcc..8702c1d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BytesToStringTest {
private static long KB = 1024;
private static long MB = 1024 * KB;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
index 7b5ff5d..e075ad1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CommentSkipHelperTest {
private CommentSkipHelper commentSkipHelper;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
index 38d3f0d..c703a6a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExportLogsCacheWriterUnitTest {
private ExportLogsCacheWriter writer = new ExportLogsCacheWriter();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
index 41d002a..46bdae4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
@@ -23,7 +23,6 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.DistributionLocator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class HostUtilsTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
index fce03b2..fb4ebdc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class HyphenFormatterTest {
private HyphenFormatter formatter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
index d18c626..88db77e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.GemFireException;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JdkToolTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
index d27542f..c1896a5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
@@ -36,7 +36,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogFilterTest {
@Test
public void permittedLogLevelsCanFilterLines() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
index 0417bb7..61d7422 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogLevelExtractorTest {
@Test
public void extractWorksCorrectlyForLineFromLogFile() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
index 32683b3..c637693 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LogSizerTest {
private LogFilter logFilter;
private SizeExportLogsFunction.Args nonFilteringArgs;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
index f5b2c03..fb1795e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
@@ -23,7 +23,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ThreePhraseGeneratorTest {
@Test
public void testGenerate() {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
index d20520e..2e7ccbe 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -45,7 +45,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see CacheElement
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class CacheElementJUnitTest {
private Document loadSchema(final String schemaLocation) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
index 43403ec..9fd874e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
@PrepareForTest(InternalLocator.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 9a4468e..dfe8f9b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 8.1
*/
-@Category(UnitTest.class)
public class XmlUtilsJUnitTest {
private static final String GEODE_SCHEMA_LOCATION =
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
index fa4048c..c61f734 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.security.ResourcePermission.Target;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class ResourcePermissionTest {
@Test
public void testEmptyConstructor() {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
index 8afc991..db93fcc 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class PdxInstanceImplTest {
PdxType emptyPdxType;
PdxField nonExistentField;
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 427f424..e8d8b10 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
@@ -27,7 +27,7 @@ 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, RedisTest.class})
+@Category({RedisTest.class})
public class AbstractScanExecutorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
index 278fc40..9c7f4fe 100644
--- a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link GemFireSecurityException}.
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class GemFireSecurityExceptionTest {
private String message;
diff --git a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
index 233a1d4..a549e24 100644
--- a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link NotAuthorizedException}.
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class NotAuthorizedExceptionTest {
private String message;
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
index ee68b6b..c9a1d3c 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class SimpleSecurityManagerTest {
private SimpleTestSecurityManager manager;
private Properties credentials;
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
index 2e0aa5b..6d4c656 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link PKCSPrincipal}
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class PKCSPrincipalTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
index b6befe2..a73afe7 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link UsernamePrincipal}
*/
-@Category({UnitTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class UsernamePrincipalTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
index 7499416..a2ad73f 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
* Quick sanity tests to make sure MainLauncher is functional.
*/
-@Category(UnitTest.class)
public class MainLauncherJUnitTest {
private static final long TIMEOUT_SECONDS = 10;
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
index d832c42..6f676f2 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CqServiceImplJUnitTest {
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
index 781ad8e..1fb3059 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceUnitTest.java
@@ -24,7 +24,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CqServiceUnitTest {
@Test
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQTest.java
index 6cffb31..0c3a1f1 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.dunit.rules.CQUnitTestRule;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CloseCQTest {
@Rule
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61Test.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61Test.java
index 1e87a03..b684c87 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61Test.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61Test.java
@@ -28,7 +28,6 @@ import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.dunit.rules.CQUnitTestRule;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ExecuteCQ61Test {
@Rule
public CQUnitTestRule cqRule = new CQUnitTestRule();
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQTest.java
index 580fc0c..c73f7c5 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.security.ResourcePermission.Target;
import org.apache.geode.test.dunit.rules.CQUnitTestRule;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class StopCQTest {
@Rule
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 ad58bdb..2c628b4 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
@@ -23,7 +23,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ValueEncoderTest {
/** a JSON document */
private static final String jsonDocument =
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java b/geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
index db060f8..0f74836 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class ClassNameExtractorTest {
private static final String SPACE = " ";
private static final String CLASS_NAME_TO_FIND = "MyClassNameToFind";
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java b/geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
index 9db2808..99eaeb8 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class UncompiledSourceCodeTest {
@Test
public void fromClassNameWithNoPackage() throws Exception {
diff --git a/geode-junit/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-junit/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
index ed71071..e6b6037 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
@@ -23,7 +23,7 @@ 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, BackwardCompatibilityTest.class})
+@Category({BackwardCompatibilityTest.class})
public class VersionManagerJUnitTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
index 7cc481d..524725f 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
@@ -27,7 +27,6 @@ import org.junit.runners.Suite;
import org.apache.geode.test.junit.runners.TestRunner;
-@Category(UnitTest.class)
public class CategoryTest {
private static boolean executedClassOneMethodNone; // 1
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
index 9641285..54af1f0 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
@@ -36,7 +36,6 @@ import org.junit.runner.notification.Failure;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.runners.TestRunner;
-@Category(UnitTest.class)
public class ExecutorServiceRuleTest {
static volatile AtomicIntegerWithMaxValueSeen concurrentTasks;
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
index 9a69a2b..2d9226b 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link ExpectedTimeoutRule}.
*/
-@Category(UnitTest.class)
public class ExpectedTimeoutRuleTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
index 6bbba73..a705910 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link IgnoreUntilRule}.
*/
-@Category(UnitTest.class)
public class IgnoreUntilRuleTest {
private static final String ASSERTION_ERROR_MESSAGE = "failing test";
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
index 8171af0..da97a27 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RepeatRule}.
*/
-@Category(UnitTest.class)
public class RepeatRuleTest {
private static final String ASSERTION_ERROR_MESSAGE = "failing test";
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
index d96a20c..07e8f37 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RestoreLocaleRule}.
*/
-@Category(UnitTest.class)
public class RestoreLocaleRuleTest {
private static Locale notDefaultLocale;
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
index 93bc070..d141cf9 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
*
* @see org.apache.geode.test.junit.rules.RetryRule
*/
-@Category(UnitTest.class)
public class RetryRuleGlobalWithErrorTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
index b7240b5..6bb6111 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
*
* @see org.apache.geode.test.junit.rules.RetryRule
*/
-@Category(UnitTest.class)
public class RetryRuleGlobalWithExceptionTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
index 265d059..789682d 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
* Unit tests for {@link RetryRule} involving local scope (ie rule affects only the test methods
* annotated with {@code @Retry}) with failures due to an {@code Error}.
*/
-@Category(UnitTest.class)
public class RetryRuleLocalWithErrorTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
index 21b13cb..8ac55d2 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
* @see org.apache.geode.test.junit.Retry
* @see org.apache.geode.test.junit.rules.RetryRule
*/
-@Category(UnitTest.class)
public class RetryRuleLocalWithExceptionTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
index 4f1ca87..7a57085 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Unit tests for {@link RuleList}.
*/
-@Category(UnitTest.class)
public class RuleListTest {
private static AtomicInteger counter;
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
index d9bd7d3..5228956 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.junit.rules.RepeatRule;
* @see org.apache.geode.test.junit.Repeat
* @see org.apache.geode.test.junit.rules.RepeatRule
*/
-@Category(UnitTest.class)
public class RepeatingTestCasesExampleTest {
private static final AtomicInteger repeatOnceCounter = new AtomicInteger(0);
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
index 0ca800b..59ee941 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.test.junit.rules.RetryRule;
/**
* Example usage of {@link RetryRule} with global scope.
*/
-@Category(UnitTest.class)
public class RetryRuleExampleTest {
private static int count = 0;
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
index a117fa4..d54391a 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.test.junit.runners.TestRunner;
/**
* Example usage of a rule as both a method {@literal @}Rule and a {@literal @}ClassRule.
*/
-@Category(UnitTest.class)
public class RuleAndClassRuleTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
index 234011e..f52847a 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableExternalResource}.
*/
-@Category(UnitTest.class)
public class SerializableExternalResourceTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
index e90f481..0e93411 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableRuleList}.
*/
-@Category(UnitTest.class)
public class SerializableRuleListTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
index 97fbe90..4b2f019 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTemporaryFolder}.
*/
-@Category(UnitTest.class)
public class SerializableTemporaryFolderTest {
@Rule
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
index 0d9fbc6..7930715 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTestName}.
*/
-@Category(UnitTest.class)
public class SerializableTestNameTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
index 4adead8..9c4637c 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTestWatcher}.
*/
-@Category(UnitTest.class)
public class SerializableTestWatcherTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
index 6ccf621..f597351 100755
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SerializableTimeout}.
*/
-@Category(UnitTest.class)
public class SerializableTimeoutTest {
@Test
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
index 5574c33..00701ac 100644
--- a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
+++ b/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
@@ -40,7 +40,6 @@ import org.junit.runners.parameterized.TestWithParameters;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class CategoryWithParameterizedRunnerFactoryTest {
/**
@@ -78,8 +77,7 @@ public class CategoryWithParameterizedRunnerFactoryTest {
}
}
- @Category(UnitTest.class)
- @RunWith(ExposedParameterized.class)
+ @RunWith(ExposedParameterized.class)
@Parameterized.UseParametersRunnerFactory(ExposedBlockJUnit4ClassRunnerWithParametersFactory.class)
public static class BrokenCategoryClass {
@Parameterized.Parameters
@@ -96,8 +94,7 @@ public class CategoryWithParameterizedRunnerFactoryTest {
}
}
- @Category(UnitTest.class)
- @RunWith(ExposedParameterized.class)
+ @RunWith(ExposedParameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public static class WorkingCategoryClass {
@Parameterized.Parameters
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
index cb96eb5..78be4ad 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatPdxSerializerJunitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class FlatFormatPdxSerializerJunitTest {
private PdxInstance createPdxInstance() {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
index 2203ef5..a99b1f2 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/FlatFormatSerializerJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.cache.lucene.test.Person;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class FlatFormatSerializerJUnitTest {
private HashSet<Person> createCollectionObjectContacts() {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 3c6c07f..bf1b7fb 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -67,7 +67,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({LuceneEventListener.class, LogService.class})
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
@PowerMockIgnore({"*.UnitTest", "*.LuceneTest"})
public class LuceneEventListenerJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
index 1e87079..4bcd5e4 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java
@@ -52,7 +52,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
@RunWith(JUnitParamsRunner.class)
public class LuceneIndexCreationProfileJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
index da5a581..6b58c3c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImplJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.cache.lucene.LuceneSerializer;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexFactoryImplJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index 4e9c847..0b7b08d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -60,7 +60,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexForPartitionedRegionTest {
@Rule
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
index 5286bae..22e7247 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
@@ -25,7 +25,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexImplJUnitTest {
public static final String REGION = "region";
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
index 2142528..9107175 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexStatsJUnitTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.StatisticsType;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexStatsJUnitTest {
private Statistics statistics;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
index 7fd9f4d..315c5ef 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryFactoryImplJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.cache.lucene.LuceneQuery;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneQueryFactoryImplJUnitTest {
@Rule
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
index e705148..a33e50f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneQueryImplJUnitTest.java
@@ -50,7 +50,7 @@ import org.apache.geode.cache.lucene.internal.distributed.TopEntriesCollector;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneQueryImplJUnitTest {
private static int LIMIT = 123;
private LuceneQueryImpl<Object, Object> query;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
index 542dad1..9d59b38 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneRegionListenerJUnitTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneRegionListenerJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
index 9d0c5e9..6bb4672 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneResultStructImpJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneResultStructImpJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
index acc384c..b3e4078 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplJUnitTest.java
@@ -60,7 +60,7 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneServiceImplJUnitTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
index 85c61af..382f875 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java
@@ -50,7 +50,7 @@ import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class PageableLuceneQueryResultsImplJUnitTest {
@Rule
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
index 6799de8..96c525e 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/PartitionedRepositoryManagerJUnitTest.java
@@ -76,7 +76,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
@PrepareForTest({PartitionedRegionHelper.class})
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
index e28520c..3105a41 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/StringQueryProviderJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class StringQueryProviderJUnitTest {
private LuceneIndexImpl mockIndex;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/ValidateCommandParametersTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/ValidateCommandParametersTest.java
index 8749d2e..226a07f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/ValidateCommandParametersTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/ValidateCommandParametersTest.java
@@ -26,7 +26,7 @@ import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class ValidateCommandParametersTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index 9f6bdc0..d92e188 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -87,7 +87,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
@RunWith(JUnitParamsRunner.class)
public class LuceneIndexCommandsJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
index e759464..05f43f8 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunctionJUnitTest.java
@@ -47,7 +47,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneCreateIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
index b29b108..d6c8a67 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDescribeIndexFunctionJUnitTest.java
@@ -42,7 +42,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneDescribeIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
index 6b083f4..f30c4fe 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneDestroyIndexFunctionJUnitTest.java
@@ -42,7 +42,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneDestroyIndexFunctionJUnitTest {
private LuceneServiceImpl service;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunctionJUnitTest.java
index c691e46..f49890d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneListIndexFunctionJUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneListIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
index 3ee9916..c3e939a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunctionJUnitTest.java
@@ -51,7 +51,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneSearchIndexFunctionJUnitTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
index 485a4e5..45c7929 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesJUnitTest.java
@@ -44,7 +44,7 @@ import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class DumpDirectoryFilesJUnitTest {
private RegionFunctionContext context;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
index e1e99ab..2657030 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/RegionDirectoryJUnitTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* This test is still mocking out the underlying cache, rather than using a real region.
*/
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class RegionDirectoryJUnitTest extends BaseDirectoryTestCase {
@Rule
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
index 3dcd071..c38b95c 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/DistributedScoringJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.cache.lucene.internal.repository.serializer.Heterogeneou
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class DistributedScoringJUnitTest {
private String[] indexedFields = new String[] {"txt"};
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
index 2c96d1e..363c18b 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/EntryScoreJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class EntryScoreJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
index 37663cb..3e0498d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionContextJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneQueryFunctionContextJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
index fbdd2ef..79a0fca 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunctionJUnitTest.java
@@ -65,7 +65,7 @@ import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneQueryFunctionJUnitTest {
private String regionPath = "/region";
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
index aede81a..2e9f8bc 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class TopEntriesCollectorJUnitTest {
private EntryScore<String> r1_1 = new EntryScore<>("1-1", .9f);
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
index 2e8d21e..bdf4b93 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesFunctionCollectorJUnitTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class TopEntriesFunctionCollectorJUnitTest {
private EntryScore<String> r1_1;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
index 76445d2..a50acd4 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/TopEntriesJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class TopEntriesJUnitTest {
private Mockery mockContext;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
index dd73bf6..c4624aa 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class WaitUntilFlushedFunctionJUnitTest {
String regionPath = "/region";
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
index 1255ca9..787bc39 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/ChunkKeyJUnitTest.java
@@ -26,7 +26,7 @@ import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class ChunkKeyJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
index 4d90b4d..f28d3e1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileJUnitTest.java
@@ -24,7 +24,7 @@ import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class FileJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
index 010935e..87225fb 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemJUnitTest.java
@@ -49,7 +49,7 @@ import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class FileSystemJUnitTest {
private static final int SMALL_CHUNK = 523;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
index b134fa0..5c9089f 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/filesystem/FileSystemStatsJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.StatisticsType;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class FileSystemStatsJUnitTest {
private Statistics statistics;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
index 9e947dc..cbab380 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingFixedResolverTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
@RunWith(JUnitQuickcheck.class)
public class BucketTargetingFixedResolverTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
index aff9326..8f691c4 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/partition/BucketTargetingMapTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class BucketTargetingMapTest {
private BucketRegion region;
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
index 204021f..e48fa31 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializerJUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test of the ObjectToDocumentMapper.
*/
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class HeterogeneousLuceneSerializerJUnitTest {
/**
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
index 8754ddc..6728d41 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/PdxFieldMapperJUnitTest.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test of the PdxFieldMapperJUnitTest. Tests that all field types are mapped correctly.
*/
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class PdxFieldMapperJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
index 7d6b755..8d12d6d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/serializer/ReflectionFieldMapperJUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test of the ReflectionFieldMapperClass. Tests that all field types are mapped correctly.
*/
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class ReflectionFieldMapperJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
index fd00088..924fc1d 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/LuceneGetPageFunctionJUnitTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneGetPageFunctionJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
index fb9be04..791c82a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageEntryJUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class PageEntryJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
index da7b16a..e6d10c7 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/results/PageResultsJUnitTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class PageResultsJUnitTest {
@Test
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
index 5eb97aa..7a67773 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorJUnitTest.java
@@ -39,7 +39,7 @@ import org.apache.geode.internal.cache.xmlcache.Declarable2;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexXmlGeneratorJUnitTest {
/**
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
index c1d7f03..bef2cb2 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserJUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGeneratorUtils;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, LuceneTest.class})
+@Category({LuceneTest.class})
public class LuceneIndexXmlParserJUnitTest {
private LuceneXmlParser parser;
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 a4eb2b0..a2f7f6b 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
@@ -42,7 +42,7 @@ import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 e26204c..e01bd0f 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
@@ -43,7 +43,7 @@ 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, ClientServerTest.class})
+@Category({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 d0d0a70..d4f47b2 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
@@ -31,7 +31,7 @@ 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, ClientServerTest.class})
+@Category({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/security/SecureCacheImplTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureCacheImplTest.java
index 73c4094..8aed7e5 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureCacheImplTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureCacheImplTest.java
@@ -58,7 +58,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class SecureCacheImplTest {
public static final String REGION = "TestRegion";
diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureFunctionServiceImplTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureFunctionServiceImplTest.java
index 3cfbb53..eb78dac 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureFunctionServiceImplTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/security/SecureFunctionServiceImplTest.java
@@ -41,7 +41,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class SecureFunctionServiceImplTest {
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/ProtobufProtocolServiceJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/ProtobufProtocolServiceJUnitTest.java
index aa62647..0db6503 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
@@ -24,7 +24,7 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ProtobufProtocolServiceJUnitTest {
@Test
public void initializeStatistics() {
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 9d5e344..bf54a03 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
@@ -34,7 +34,7 @@ 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, ClientServerTest.class})
+@Category({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 579e875..0ca3f16 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 957a32b..6088be0 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
@@ -47,7 +47,7 @@ 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, ClientServerTest.class})
+@Category({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 c5d1e1c..4462a94 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
@@ -51,7 +51,7 @@ 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, ClientServerTest.class})
+@Category({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 5432d25..813ce40 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
@@ -48,7 +48,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.En
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
index 7727858..cd70c18 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
@@ -38,7 +38,7 @@ 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, ClientServerTest.class})
+@Category({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 c019182..52e1405 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
@@ -39,7 +39,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.En
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 85aaa53..11799b0 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
@@ -42,7 +42,7 @@ 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, ClientServerTest.class})
+@Category({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 f0dcc6f..6ac3ad7 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
@@ -40,7 +40,7 @@ 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, ClientServerTest.class})
+@Category({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 c74506a..716ddf8 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
@@ -37,7 +37,7 @@ 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, ClientServerTest.class})
+@Category({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 b8d9845..5b110c6 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
@@ -25,7 +25,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.ProtobufSerializationServi
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 8a75da9..eafe111 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
@@ -56,7 +56,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.state.exception.Connection
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 4ff0f2e..fa5f386 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
@@ -52,7 +52,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.state.exception.Connection
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 87af0e8..dbf1411 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
@@ -35,7 +35,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* the License.
*/
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 21e99bb..514602c 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
@@ -46,7 +46,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilitie
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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/PutIfAbsentRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/PutIfAbsentRequestOperationHandlerJUnitTest.java
index 77ae6d7..d3f8df4 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
@@ -41,7 +41,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilitie
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 126044b..306dcaa 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
@@ -43,7 +43,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.utilities.ProtobufUtilitie
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 fafc07d..58540f9 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
@@ -41,7 +41,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.En
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 157c07d..dec6c63 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
@@ -24,7 +24,7 @@ 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, ClientServerTest.class})
+@Category({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 e14f1a7..4eaabf8 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
@@ -41,7 +41,7 @@ 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, ClientServerTest.class})
+@Category({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 3f343d0..acddfd3 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
@@ -30,7 +30,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.serializer.exception.Inval
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({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 1697528..0cecb55 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
@@ -30,7 +30,7 @@ import org.apache.geode.internal.protocol.protobuf.v1.serialization.exception.En
import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ProtobufUtilitiesJUnitTest {
private ProtobufSerializationService protobufSerializationService =
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
index 80b07b8..40b4bd4 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/PulseAppListenerTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.tools.pulse.internal.data.PulseConstants;
import org.apache.geode.tools.pulse.internal.data.Repository;
-@Category(UnitTest.class)
public class PulseAppListenerTest {
private Repository repository;
private PulseAppListener appListener;
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
index 2a83e5b..f1e11c0 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdaterGetDoubleAttributeTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class JMXDataUpdaterGetDoubleAttributeTest {
private Cluster cluster;
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
index 5307e6d..833b4d7 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/internal/security/LogoutHandlerUnitTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.internal.data.Repository;
-@Category(UnitTest.class)
@RunWith(PowerMockRunner.class)
@PrepareForTest(Repository.class)
@PowerMockRunnerDelegate(Parameterized.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
index 4534c5a..0029bb4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class AckReaderThreadJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
index e54dae7..ef1bb78 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category(UnitTest.class)
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class GatewayReceiverFactoryImplJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
index 620a5ee..957b373 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GatewayReceiverImplJUnitTest {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
index 2d5b039..f9f8e9d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class GatewaySenderEventRemoteDispatcherJUnitTest {
@Test
public void getConnectionShouldShutdownTheAckThreadReaderWhenEventProcessorIsShutDown() {
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 f841705..0506219 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
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* AbstractBaseController Tester.
*/
-@Category({UnitTest.class, RestAPITest.class})
+@Category({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 efdd253..6f498e9 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
@@ -24,7 +24,7 @@ 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, RestAPITest.class})
+@Category({RestAPITest.class})
public class RegionDataTest {
@Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index d0c60a9..788aab3 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 8.0
*/
-@Category(UnitTest.class)
public class LoginHandlerInterceptorJUnitTest {
private Mockery mockContext;
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
index cd9c696..4e8c552 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/support/LoginHandlerInterceptorRequestHeaderJUnitTest.java
@@ -32,7 +32,6 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class LoginHandlerInterceptorRequestHeaderJUnitTest {
SecurityService securityService;
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
index 347b2e7..a90b0e9 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/domain/QueryParameterSourceJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 8.0
*/
-@Category(UnitTest.class)
public class QueryParameterSourceJUnitTest {
@Test
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
index cb1f9f3..de5a87c 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 8.0
*/
-@Category(UnitTest.class)
public class SerializableObjectHttpMessageConverterJUnitTest {
private Mockery mockContext;
[geode] 02/46: GEODE-5363: Move integration tests to new directory.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 63f0d8838686a34825dbb27c979650ba06f0b067
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 15:13:05 2018 -0700
GEODE-5363: Move integration tests to new directory.
---
.../java/org/apache/geode/CopyJUnitTest.java | 0
.../java/org/apache/geode/DiskInstantiatorsJUnitTest.java | 0
.../java/org/apache/geode/JtaNoninvolvementJUnitTest.java | 0
.../java/org/apache/geode/LonerDMJUnitTest.java | 0
.../java/org/apache/geode/SetOperationTXJUnitTest.java | 0
.../java/org/apache/geode/TXExpirationIntegrationTest.java | 0
.../java/org/apache/geode/TXJUnitTest.java | 0
.../java/org/apache/geode/TXWriterJUnitTest.java | 0
.../java/org/apache/geode/TXWriterOOMEJUnitTest.java | 0
.../apache/geode/admin/internal/BindDistributedSystemJUnitTest.java | 0
.../apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java | 0
.../apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java | 0
.../admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java | 0
.../java/org/apache/geode/cache/CacheListenerJUnitTest.java | 0
.../geode/cache/ConcurrentRegionOperationIntegrationTest.java | 0
.../java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java | 0
.../java/org/apache/geode/cache/PoolManagerJUnitTest.java | 0
.../java/org/apache/geode/cache/ProxyJUnitTest.java | 0
.../org/apache/geode/cache/RegionExpirationIntegrationTest.java | 0
.../java/org/apache/geode/cache/RegionFactoryJUnitTest.java | 0
.../geode/cache/RemoveAllCacheListenerPeerRegressionTest.java | 0
.../java/org/apache/geode/cache/ValueConstraintRegressionTest.java | 0
.../asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java | 0
.../asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java | 0
.../org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java | 0
.../org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java | 0
.../cache/client/internal/AutoConnectionSourceImplJUnitTest.java | 0
.../geode/cache/client/internal/ConnectionPoolImplJUnitTest.java | 0
.../org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java | 0
.../apache/geode/cache/client/internal/QueueManagerJUnitTest.java | 0
.../cache/client/internal/pooling/ConnectionManagerJUnitTest.java | 0
.../org/apache/geode/cache/execute/CoreFunctionSecurityTest.java | 0
.../apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java | 0
.../org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java | 0
.../apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java | 0
.../apache/geode/cache/operations/PutOperationContextJUnitTest.java | 0
.../cache/operations/internal/GetOperationContextImplJUnitTest.java | 0
.../org/apache/geode/cache/query/JoinQueriesIntegrationTest.java | 0
.../org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java | 0
.../java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java | 0
.../java/org/apache/geode/cache/query/QueryJUnitTest.java | 0
.../java/org/apache/geode/cache/query/QueryServiceJUnitTest.java | 0
.../org/apache/geode/cache/query/QueryServiceRegressionTest.java | 0
.../java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java | 0
.../geode/cache/query/QueryWithBucketParameterIntegrationTest.java | 0
.../java/org/apache/geode/cache/query/RegionJUnitTest.java | 0
.../java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java | 0
.../org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java | 0
.../geode/cache/query/functional/ComparisonOperatorsJUnitTest.java | 0
.../org/apache/geode/cache/query/functional/ConstantsJUnitTest.java | 0
.../org/apache/geode/cache/query/functional/CountStarJUnitTest.java | 0
.../cache/query/functional/CustomerOptimizationsJUnitTest.java | 0
.../query/functional/DistinctAndNonDistinctQueryJUnitTest.java | 0
.../functional/DistinctResultsWithDupValuesInRegionJUnitTest.java | 0
.../org/apache/geode/cache/query/functional/FunctionJUnitTest.java | 0
.../geode/cache/query/functional/GroupByPartitionedJUnitTest.java | 0
.../geode/cache/query/functional/GroupByReplicatedJUnitTest.java | 0
.../apache/geode/cache/query/functional/INOperatorJUnitTest.java | 0
.../geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java | 0
.../java/org/apache/geode/cache/query/functional/IUMJUnitTest.java | 0
.../cache/query/functional/IUMRCompositeIteratorJUnitTest.java | 0
.../query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java | 0
.../geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java | 0
.../geode/cache/query/functional/IUMRSingleRegionJUnitTest.java | 0
.../functional/IndependentOperandsInWhereClause2JUnitTest.java | 0
.../cache/query/functional/IndexCreationDeadLockJUnitTest.java | 0
.../apache/geode/cache/query/functional/IndexCreationJUnitTest.java | 0
.../cache/query/functional/IndexMaintenanceAsynchJUnitTest.java | 0
.../geode/cache/query/functional/IndexOnEntrySetJUnitTest.java | 0
.../apache/geode/cache/query/functional/IndexOperatorJUnitTest.java | 0
.../geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java | 0
.../cache/query/functional/IndexUsageInNestedQueryJUnitTest.java | 0
.../query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java | 0
.../cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java | 0
.../query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java | 0
.../geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java | 0
.../geode/cache/query/functional/IteratorTypeDefJUnitTest.java | 0
.../cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java | 0
.../geode/cache/query/functional/IumMultConditionJUnitTest.java | 0
.../apache/geode/cache/query/functional/LikePredicateJUnitTest.java | 0
.../apache/geode/cache/query/functional/LimitClauseJUnitTest.java | 0
.../geode/cache/query/functional/LogicalOperatorsJUnitTest.java | 0
.../java/org/apache/geode/cache/query/functional/MiscJUnitTest.java | 0
.../geode/cache/query/functional/MultiIndexCreationJUnitTest.java | 0
.../cache/query/functional/MultiRegionIndexUsageJUnitTest.java | 0
.../geode/cache/query/functional/MultipleRegionsJUnitTest.java | 0
.../cache/query/functional/NegativeNumberQueriesJUnitTest.java | 0
.../apache/geode/cache/query/functional/NestedQueryJUnitTest.java | 0
.../query/functional/NonDistinctOrderByPartitionedJUnitTest.java | 0
.../query/functional/NonDistinctOrderByReplicatedJUnitTest.java | 0
.../apache/geode/cache/query/functional/NumericQueryJUnitTest.java | 0
.../geode/cache/query/functional/OrderByPartitionedJUnitTest.java | 0
.../geode/cache/query/functional/OrderByReplicatedJUnitTest.java | 0
.../geode/cache/query/functional/ParameterBindingJUnitTest.java | 0
.../cache/query/functional/PdxGroupByPartitionedJUnitTest.java | 0
.../geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java | 0
.../apache/geode/cache/query/functional/PdxOrderByJUnitTest.java | 0
.../geode/cache/query/functional/QRegionInterfaceJUnitTest.java | 0
.../cache/query/functional/QueryREUpdateInProgressJUnitTest.java | 0
.../geode/cache/query/functional/QueryUndefinedJUnitTest.java | 0
.../geode/cache/query/functional/ReservedKeywordsJUnitTest.java | 0
.../cache/query/functional/ResultsDataSerializabilityJUnitTest.java | 0
.../apache/geode/cache/query/functional/SelectToDateJUnitTest.java | 0
.../geode/cache/query/functional/StructMemberAccessJUnitTest.java | 0
.../query/functional/TestNewFunctionSSorRSIntegrationTest.java | 0
.../cache/query/internal/ArithmeticOperationsIntegrationTest.java | 0
.../geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java | 0
.../cache/query/internal/CompiledJunctionInternalsJUnitTest.java | 0
.../apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java | 0
.../geode/cache/query/internal/ExecutionContextJUnitTest.java | 0
.../apache/geode/cache/query/internal/IndexManagerJUnitTest.java | 0
.../geode/cache/query/internal/OrderByComparatorJUnitTest.java | 0
.../geode/cache/query/internal/ProjectionAttributeJUnitTest.java | 0
.../org/apache/geode/cache/query/internal/QCompilerJUnitTest.java | 0
.../query/internal/QueryFromClauseCanonicalizationJUnitTest.java | 0
.../geode/cache/query/internal/QueryObserverCallbackJUnitTest.java | 0
.../org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java | 0
.../org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java | 0
.../internal/index/AbstractIndexMaintenanceIntegrationTest.java | 0
.../internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java | 0
.../cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java | 0
.../query/internal/index/CompactRangeIndexIndexMapJUnitTest.java | 0
.../cache/query/internal/index/CompactRangeIndexJUnitTest.java | 0
.../internal/index/CompactRangeIndexMaintenanceIntegrationTest.java | 0
.../query/internal/index/CompactRangeIndexQueryIntegrationTest.java | 0
.../geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java | 0
.../query/internal/index/DeclarativeIndexCreationJUnitTest.java | 0
.../geode/cache/query/internal/index/EquiJoinIntegrationTest.java | 0
.../query/internal/index/HashIndexMaintenanceIntegrationTest.java | 0
.../cache/query/internal/index/HashIndexQueryIntegrationTest.java | 0
.../cache/query/internal/index/IndexCreationInternalsJUnitTest.java | 0
.../apache/geode/cache/query/internal/index/IndexHintJUnitTest.java | 0
.../org/apache/geode/cache/query/internal/index/IndexJUnitTest.java | 0
.../geode/cache/query/internal/index/IndexMaintainceJUnitTest.java | 0
.../geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java | 0
.../geode/cache/query/internal/index/IndexStatisticsJUnitTest.java | 0
.../query/internal/index/IndexTrackingQueryObserverJUnitTest.java | 0
.../apache/geode/cache/query/internal/index/IndexUseJUnitTest.java | 0
.../internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java | 0
.../geode/cache/query/internal/index/MapIndexStoreJUnitTest.java | 0
.../query/internal/index/MapRangeIndexMaintenanceJUnitTest.java | 0
.../query/internal/index/NewDeclarativeIndexCreationJUnitTest.java | 0
.../geode/cache/query/internal/index/PartitionedIndexJUnitTest.java | 0
.../internal/index/PartitionedRegionEquiJoinIntegrationTest.java | 0
.../cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java | 0
.../internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java | 0
.../geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java | 0
.../query/internal/index/RangeIndexMaintenanceIntegrationTest.java | 0
.../geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java | 0
.../geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java | 0
.../geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java | 0
.../org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java | 0
.../geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java | 0
.../geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java | 0
.../cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java | 0
.../apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java | 0
.../org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java | 0
.../org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java | 0
.../java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java | 0
.../org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java | 0
.../geode/cache30/CacheXmlParameterizationRegressionTest.java | 0
.../apache/geode/cache30/DefaultEvictionActionRegressionTest.java | 0
.../java/org/apache/geode/cache30/DiskRegionIntegrationTest.java | 0
.../geode/cache30/ShorteningExpirationTimeRegressionTest.java | 0
.../apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java | 0
.../apache/geode/distributed/AbstractLauncherIntegrationTest.java | 0
.../geode/distributed/DistributedSystemIntegrationJUnitTest.java | 0
.../geode/distributed/LauncherMemberMXBeanIntegrationTest.java | 0
.../java/org/apache/geode/distributed/LocatorJUnitTest.java | 0
.../apache/geode/distributed/LocatorLauncherIntegrationTest.java | 0
.../distributed/LocatorLauncherJmxManagerLocalRegressionTest.java | 0
.../distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java | 0
.../geode/distributed/LocatorLauncherLocalFileIntegrationTest.java | 0
.../geode/distributed/LocatorLauncherLocalIntegrationTest.java | 0
.../geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java | 0
.../geode/distributed/LocatorLauncherRemoteIntegrationTest.java | 0
.../LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java | 0
.../org/apache/geode/distributed/ServerLauncherIntegrationTest.java | 0
.../geode/distributed/ServerLauncherLocalFileIntegrationTest.java | 0
.../geode/distributed/ServerLauncherLocalIntegrationTest.java | 0
.../geode/distributed/ServerLauncherRemoteFileIntegrationTest.java | 0
.../geode/distributed/ServerLauncherRemoteIntegrationTest.java | 0
.../ServerLauncherRemoteWithCustomLoggingIntegrationTest.java | 0
.../geode/distributed/ServerLauncherWithProviderRegressionTest.java | 0
.../geode/distributed/internal/CacheConfigIntegrationTest.java | 0
.../internal/DefaultPropertiesGeneratorIntegrationTest.java | 0
.../distributed/internal/InternalDistributedSystemJUnitTest.java | 0
.../geode/distributed/internal/InternalLocatorIntegrationTest.java | 0
.../distributed/internal/LocatorLoadSnapshotIntegrationTest.java | 0
.../internal/deadlock/DeadlockDetectorIntegrationTest.java | 0
.../distributed/internal/locks/DLockReentrantLockJUnitTest.java | 0
.../geode/distributed/internal/locks/DLockServiceLeakTest.java | 0
.../geode/distributed/internal/membership/MembershipJUnitTest.java | 0
.../internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java | 0
.../membership/gms/locator/GMSLocatorRecoveryJUnitTest.java | 0
.../internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java | 0
.../internal/membership/gms/messenger/GMSEncryptJUnitTest.java | 0
.../membership/gms/messenger/GMSQuorumCheckerJUnitTest.java | 0
.../membership/gms/messenger/JGroupsMessengerJUnitTest.java | 0
.../internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java | 0
.../geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java | 0
.../geode/distributed/internal/tcpserver/TcpServerJUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXJUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java | 0
.../apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXWriterJUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java | 0
.../apache/geode/disttx/DistributedTXExpirationIntegrationTest.java | 0
.../java/org/apache/geode/disttx/PRDistTXJUnitTest.java | 0
.../apache/geode/internal/AvailablePortHelperIntegrationTest.java | 0
.../java/org/apache/geode/internal/AvailablePortJUnitTest.java | 0
.../org/apache/geode/internal/ClassPathLoaderIntegrationTest.java | 0
.../internal/CreateRegionFactoryNewInstanceRegressionTest.java | 0
.../java/org/apache/geode/internal/DeployedJarJUnitTest.java | 0
.../java/org/apache/geode/internal/InlineKeyJUnitTest.java | 0
.../java/org/apache/geode/internal/JarDeployerDeadlockTest.java | 0
.../java/org/apache/geode/internal/JarDeployerIntegrationTest.java | 0
.../java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java | 0
.../java/org/apache/geode/internal/PdxRenameJUnitTest.java | 0
...RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java | 0
.../org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java | 0
.../java/org/apache/geode/internal/SSLConfigJUnitTest.java | 0
.../internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java | 0
.../geode/internal/SystemFailureThreadCleanupRegressionTest.java | 0
.../cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java | 0
.../geode/internal/cache/CacheLifecycleListenerJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java | 0
.../geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java | 0
.../cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java | 0
.../internal/cache/ClusterConfigurationLoaderIntegrationTest.java | 0
.../java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java | 0
.../org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java | 0
.../cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java | 0
.../apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java | 0
.../geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java | 0
.../cache/ConcurrentRollingAndRegionOperationsJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ConflationJUnitTest.java | 0
.../internal/cache/CreatePRWithLocalExpirationRegressionTest.java | 0
.../cache/DeprecatedCacheServerLauncherIntegrationTest.java | 0
.../cache/DiskAccessExceptionDisablesServerRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/DiskIFJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java | 0
.../apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java | 0
.../apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java | 0
.../internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java | 0
.../org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java | 0
.../geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java | 0
.../org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java | 0
.../internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java | 0
.../org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java | 0
.../geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java | 0
.../internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java | 0
.../org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java | 0
.../geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java | 0
.../internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java | 0
.../org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java | 0
.../apache/geode/internal/cache/DiskStoreImplIntegrationTest.java | 0
.../internal/cache/EnforceUniqueHostForLonerIntegrationTest.java | 0
.../internal/cache/EvictionAttributesMutatorImplRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/FaultingInJUnitTest.java | 0
.../apache/geode/internal/cache/FilterProfileConcurrencyTest.java | 0
.../org/apache/geode/internal/cache/InterruptDiskJUnitTest.java | 0
.../internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java | 0
.../cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java | 0
.../internal/cache/LRUClearWithDiskRegionOpRegressionTest.java | 0
.../org/apache/geode/internal/cache/MapInterface2JUnitTest.java | 0
.../java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java | 0
.../geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java | 0
.../org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/OplogFlushTest.java | 0
.../java/org/apache/geode/internal/cache/OplogJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java | 0
.../geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java | 0
.../org/apache/geode/internal/cache/OverflowOplogFlushTest.java | 0
.../apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java | 0
.../org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java | 0
.../geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/PRTXJUnitTest.java | 0
.../internal/cache/PartitionedRegionAttributesMutatorTest.java | 0
.../geode/internal/cache/PartitionedRegionCreationJUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java | 0
.../cache/PartitionedRegionQueryEvaluatorIntegrationTest.java | 0
.../cache/PartitionedRegionSerializableObjectJUnitTest.java | 0
.../cache/PartitionedRegionSingleNodeOperationsJUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionStatsJUnitTest.java | 0
.../geode/internal/cache/PersistentPartitionedRegionJUnitTest.java | 0
.../org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java | 0
.../org/apache/geode/internal/cache/RegionListenerJUnitTest.java | 0
.../RegionValuesIteratorAfterLocalInvalidateRegressionTest.java | 0
.../apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java | 0
.../org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java | 0
.../org/apache/geode/internal/cache/TXManagerImplJUnitTest.java | 0
.../org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java | 0
.../org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java | 0
.../org/apache/geode/internal/cache/UpdateVersionJUnitTest.java | 0
.../internal/cache/backup/BackupFileCopierIntegrationTest.java | 0
.../geode/internal/cache/backup/BackupInspectorIntegrationTest.java | 0
.../apache/geode/internal/cache/backup/BackupIntegrationTest.java | 0
.../geode/internal/cache/backup/FileSystemBackupWriterTest.java | 0
.../apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java | 0
.../geode/internal/cache/backup/WindowsScriptGeneratorTest.java | 0
.../apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java | 0
.../geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java | 0
.../cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java | 0
.../cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java | 0
.../DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java | 0
.../cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java | 0
.../diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java | 0
.../cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java | 0
.../internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java | 0
.../cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java | 0
.../cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java | 0
.../cache/eviction/LRUListWithAsyncSortingIntegrationTest.java | 0
.../cache/eviction/LRUListWithSyncSortingIntegrationTest.java | 0
.../internal/cache/eviction/RegionEntryEvictionIntegrationTest.java | 0
.../geode/internal/cache/eviction/TestLRUListWithAsyncSorting.java | 0
.../geode/internal/cache/eviction/TransactionsWithOverflowTest.java | 0
.../cache/execute/FunctionExecutionOnLonerRegressionTest.java | 0
.../geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java | 0
.../apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java | 0
.../apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java | 0
.../geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java | 0
.../apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java | 0
.../geode/internal/cache/ha/HARegionQueueIntegrationTest.java | 0
.../org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java | 0
.../geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java | 0
.../apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java | 0
.../internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java | 0
.../internal/cache/persistence/DefaultDiskDirsIntegrationTest.java | 0
.../geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java | 0
.../cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java | 0
.../tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java | 0
.../cache/tier/sockets/ClientHealthMonitorIntegrationTest.java | 0
.../tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java | 0
.../geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java | 0
.../cache/tier/sockets/FilterProfileIntegrationJUnitTest.java | 0
.../geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java | 0
.../cache/tier/sockets/ServerConnectionIntegrationTest.java | 0
.../internal/cache/versions/RegionVersionVectorIntegrationTest.java | 0
.../cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java | 0
.../cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java | 0
.../WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java | 0
.../geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java | 0
.../geode/internal/compression/SnappyCompressorJUnitTest.java | 0
.../geode/internal/datasource/AbstractPoolCacheJUnitTest.java | 0
.../java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java | 0
.../geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java | 0
.../geode/internal/datasource/ConnectionPoolingJUnitTest.java | 0
.../geode/internal/datasource/DataSourceFactoryJUnitTest.java | 0
.../java/org/apache/geode/internal/datasource/RestartJUnitTest.java | 0
.../java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java | 0
.../io/MainWithChildrenRollingFileHandlerIntegrationTest.java | 0
.../org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java | 0
.../java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java | 0
.../java/org/apache/geode/internal/jta/ExceptionJUnitTest.java | 0
.../org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java | 0
.../java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java | 0
.../org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java | 0
.../org/apache/geode/internal/jta/TransactionImplJUnitTest.java | 0
.../apache/geode/internal/jta/TransactionManagerImplJUnitTest.java | 0
.../org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java | 0
.../org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java | 0
.../org/apache/geode/internal/jta/functional/CacheJUnitTest.java | 0
.../geode/internal/logging/CacheLogRollingIntegrationTest.java | 0
.../geode/internal/logging/DistributedSystemLogFileJUnitTest.java | 0
.../org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java | 0
.../geode/internal/logging/LogServiceIntegrationJUnitTest.java | 0
.../apache/geode/internal/logging/LoggingIntegrationTestSuite.java | 0
.../org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java | 0
.../apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java | 0
.../internal/logging/log4j/FastLoggerIntegrationJUnitTest.java | 0
.../logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java | 0
.../logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java | 0
.../geode/internal/logging/log4j/Log4jIntegrationTestSuite.java | 0
.../logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java | 0
.../log4j/custom/CustomConfigWithLogServiceIntegrationTest.java | 0
.../geode/internal/net/ClientSocketFactoryIntegrationTest.java | 0
.../org/apache/geode/internal/net/SSLSocketIntegrationTest.java | 0
.../geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java | 0
.../java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java | 0
.../internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java | 0
.../org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java | 0
.../geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java | 0
.../apache/geode/internal/offheap/OffHeapValidationJUnitTest.java | 0
.../geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java | 0
.../geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java | 0
.../process/BlockingProcessStreamReaderIntegrationTest.java | 0
.../internal/process/BlockingProcessStreamReaderWindowsTest.java | 0
.../geode/internal/process/ControlFileWatchdogIntegrationTest.java | 0
.../geode/internal/process/ControllableProcessIntegrationTest.java | 0
.../internal/process/FileProcessControllerIntegrationTest.java | 0
.../geode/internal/process/LocalProcessLauncherIntegrationTest.java | 0
.../geode/internal/process/NativeProcessUtilsIntegrationTest.java | 0
.../process/NonBlockingProcessStreamReaderIntegrationTest.java | 0
.../org/apache/geode/internal/process/PidFileIntegrationTest.java | 0
.../internal/process/ProcessControllerFactoryIntegrationTest.java | 0
.../security/SecurityServiceFactoryShiroIntegrationTest.java | 0
.../geode/internal/statistics/DiskSpaceLimitIntegrationTest.java | 0
.../statistics/DistributedSystemStatisticsIntegrationTest.java | 0
.../statistics/DistributedSystemStatisticsTypeIntegrationTest.java | 0
.../geode/internal/statistics/FileSizeLimitIntegrationTest.java | 0
.../internal/statistics/GemFireStatSamplerIntegrationTest.java | 0
.../org/apache/geode/internal/statistics/LinuxSystemStatsTest.java | 0
.../geode/internal/statistics/SimpleStatSamplerIntegrationTest.java | 0
.../internal/statistics/StatArchiveHandlerIntegrationTest.java | 0
.../statistics/StatArchiveWithConsecutiveResourceInstGenerator.java | 0
.../StatArchiveWithConsecutiveResourceInstGeneratorTest.java | 0
.../StatArchiveWithConsecutiveResourceInstIntegrationTest.java | 0
.../StatArchiveWithMissingResourceTypeRegressionTest.java | 0
.../internal/statistics/StatArchiveWriterReaderIntegrationTest.java | 0
.../geode/internal/statistics/StatSamplerIntegrationTest.java | 0
.../internal/statistics/StatTypesAreRolledOverRegressionTest.java | 0
.../geode/internal/statistics/ValueMonitorIntegrationTest.java | 0
.../org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java | 0
.../util/concurrent/ConcurrentHashMapIteratorJUnitTest.java | 0
.../geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java | 0
.../internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java | 0
.../geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java | 0
.../geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java | 0
.../apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java | 0
.../apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java | 0
.../apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java | 0
.../geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java | 0
.../apache/geode/management/FederatingManagerIntegrationTest.java | 0
.../apache/geode/management/QueryDataFunctionIntegrationTest.java | 0
.../geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java | 0
.../geode/management/bean/stats/CacheServerStatsJUnitTest.java | 0
.../org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java | 0
.../management/bean/stats/DistributedSystemStatsJUnitTest.java | 0
.../geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java | 0
.../geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java | 0
.../geode/management/bean/stats/MemberLevelStatsJUnitTest.java | 0
.../apache/geode/management/bean/stats/RegionStatsJUnitTest.java | 0
.../geode/management/internal/beans/ManagementAdapterTest.java | 0
.../geode/management/internal/beans/RegionMBeanAttributesTest.java | 0
.../geode/management/internal/cli/GfshParserAutoCompletionTest.java | 0
.../geode/management/internal/cli/GfshParserConverterTest.java | 0
.../apache/geode/management/internal/cli/GfshParserParsingTest.java | 0
.../geode/management/internal/cli/HeadlessGfshIntegrationTest.java | 0
.../geode/management/internal/cli/OptionAliasesParsingTest.java | 0
.../apache/geode/management/internal/cli/TableBuilderJUnitTest.java | 0
.../internal/cli/commands/AlterRegionCommandIntegrationTest.java | 0
.../internal/cli/commands/ConfigurePDXCommandIntegrationTest.java | 0
.../internal/cli/commands/CreateRegionCommandIntegrationTest.java | 0
.../internal/cli/commands/DescribeConfigCommandIntegrationTest.java | 0
.../cli/commands/DescribeConnectionCommandIntegrationTest.java | 0
.../cli/commands/DescribeDiskStoreCommandIntegrationTest.java | 0
.../internal/cli/commands/DescribeRegionIntegrationTest.java | 0
.../management/internal/cli/commands/ExportDataIntegrationTest.java | 0
.../management/internal/cli/commands/ExportLogsIntegrationTest.java | 0
.../management/internal/cli/commands/GetCommandIntegrationTest.java | 0
.../internal/cli/commands/GfshCommandIntegrationTest.java | 0
.../internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java | 0
.../management/internal/cli/commands/ImportDataIntegrationTest.java | 0
.../internal/cli/commands/IndexCommandsIntegrationTest.java | 0
.../internal/cli/commands/ListDiskStoreCommandIntegrationTest.java | 0
.../management/internal/cli/commands/ListRegionIntegrationTest.java | 0
.../management/internal/cli/commands/PutCommandIntegrationTest.java | 0
.../internal/cli/commands/QueryCommandIntegrationTest.java | 0
.../internal/cli/commands/ShowMetricsCommandIntegrationTest.java | 0
.../management/internal/cli/commands/StartMemberUtilsTest.java | 0
.../management/internal/cli/commands/VersionCommandJUnitTest.java | 0
.../cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java | 0
.../management/internal/cli/domain/IndexDetailsIntegrationTest.java | 0
.../internal/cli/functions/CreateJndiBindingFunctionTest.java | 0
.../internal/cli/functions/DataCommandFunctionJUnitTest.java | 0
.../internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java | 0
.../internal/cli/functions/DestroyJndiBindingFunctionTest.java | 0
.../internal/cli/functions/ExportLogsFunctionIntegrationTest.java | 0
.../geode/management/internal/cli/functions/Geode3544JUnitTest.java | 0
.../internal/cli/functions/ListJndiBindingFunctionTest.java | 0
.../internal/cli/functions/SizeExportLogsFunctionFileTest.java | 0
.../internal/cli/functions/SizeExportLogsFunctionTest.java | 0
.../geode/management/internal/cli/help/HelperIntegrationTest.java | 0
.../management/internal/cli/json/TypedJsonPdxIntegrationTest.java | 0
.../management/internal/cli/shell/GfshConfigInitFileJUnitTest.java | 0
.../geode/management/internal/cli/shell/GfshHistoryJUnitTest.java | 0
.../management/internal/cli/shell/GfshMultilineCommandTest.java | 0
.../management/internal/cli/util/LogExporterIntegrationTest.java | 0
.../apache/geode/management/internal/cli/util/LogExporterTest.java | 0
.../geode/management/internal/configuration/ZipUtilsJUnitTest.java | 0
.../internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java | 0
.../geode/management/internal/deployment/FunctionScannerTest.java | 0
.../management/internal/security/AccessControlMBeanJUnitTest.java | 0
.../internal/security/CacheServerMBeanAuthenticationJUnitTest.java | 0
.../internal/security/CacheServerMBeanAuthorizationJUnitTest.java | 0
.../security/CacheServerMBeanWithShiroIniIntegrationTest.java | 0
.../geode/management/internal/security/CliCommandsSecurityTest.java | 0
.../management/internal/security/DataCommandsSecurityTest.java | 0
.../management/internal/security/DeployCommandsSecurityTest.java | 0
.../internal/security/DiskStoreMXBeanSecurityJUnitTest.java | 0
.../management/internal/security/FileUploaderMBeanSecurityTest.java | 0
.../internal/security/GatewayReceiverMBeanSecurityTest.java | 0
.../internal/security/GatewaySenderMBeanSecurityTest.java | 0
.../management/internal/security/GfshCommandsPostProcessorTest.java | 0
.../management/internal/security/GfshCommandsSecurityTest.java | 0
.../geode/management/internal/security/JavaRmiServerNameTest.java | 0
.../geode/management/internal/security/JmxPasswordFileTest.java | 0
.../internal/security/LockServiceMBeanAuthorizationJUnitTest.java | 0
.../geode/management/internal/security/MBeanSecurityJUnitTest.java | 0
.../internal/security/ManagerMBeanAuthorizationJUnitTest.java | 0
.../management/internal/security/MemberMBeanSecurityJUnitTest.java | 0
.../security/SecurityServiceWithCustomRealmIntegrationTest.java | 0
.../security/SecurityServiceWithShiroIniIntegrationTest.java | 0
.../internal/unsafe/ReadOpFileAccessControllerJUnitTest.java | 0
.../web/controllers/ShellCommandsControllerProcessCommandTest.java | 0
.../management/internal/web/http/support/HttpRequesterTest.java | 0
.../org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java | 0
.../org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java | 0
.../org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java | 0
.../java/org/apache/geode/memcached/IntegrationJUnitTest.java | 0
.../java/org/apache/geode/pdx/AutoSerializableJUnitTest.java | 0
.../java/org/apache/geode/pdx/ByteSourceJUnitTest.java | 0
.../java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java | 0
.../java/org/apache/geode/pdx/JSONFormatterJUnitTest.java | 0
.../org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java | 4 ++--
.../java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java | 4 ++--
.../java/org/apache/geode/pdx/PdxAttributesJUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxInstanceJUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxInstanceLoaderIntegrationTest.java | 0
.../java/org/apache/geode/pdx/PdxSerializableJUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxStringJUnitTest.java | 0
.../java/org/apache/geode/pdx/internal/MultipleCacheJUnitTest.java | 0
.../java/org/apache/geode/redis/AuthJUnitTest.java | 0
.../java/org/apache/geode/redis/ConcurrentStartTest.java | 0
.../java/org/apache/geode/redis/HashesJUnitTest.java | 0
.../java/org/apache/geode/redis/ListsJUnitTest.java | 0
.../java/org/apache/geode/redis/RedisServerTest.java | 0
.../java/org/apache/geode/redis/SetsJUnitTest.java | 0
.../java/org/apache/geode/redis/SortedSetsJUnitTest.java | 0
.../java/org/apache/geode/redis/StringsJunitTest.java | 0
.../apache/geode/security/CacheFactoryWithSecurityObjectTest.java | 0
.../java/org/apache/geode/security/ExampleSecurityManagerTest.java | 0
.../geode/security/SecurityManagerLifecycleIntegrationTest.java | 0
.../test/dunit/rules/tests/MemberStarterRuleIntegrationTest.java | 0
.../apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java | 0
.../geode/test/golden/FailWithExtraLineInOutputJUnitTest.java | 0
.../test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java | 0
.../test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java | 0
.../geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java | 0
.../geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java | 0
.../geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java | 0
.../apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java | 0
.../apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java | 0
.../org/apache/geode/test/golden/GoldenTestFrameworkTestSuite.java | 0
.../java/org/apache/geode/test/golden/PassJUnitTest.java | 0
.../apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java | 0
.../apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java | 0
.../apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java | 0
.../java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java | 0
.../org/apache/geode/internal/logging/LoggingUnitTestSuite.java | 6 ++----
.../org/apache/geode/internal/logging/log4j/Log4jUnitTestSuite.java | 4 ++--
.../apache/geode/test/process/ProcessTestFrameworkTestSuite.java | 2 +-
557 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/CopyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/LonerDMJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/SetOperationTXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/TXExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/TXExpirationIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/TXWriterJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/TXWriterJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/TXWriterOOMEJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/CacheListenerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ProxyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ValueConstraintRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/RegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/AvailablePortJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/DeployedJarJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/InlineKeyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDeadlockTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogFlushTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OplogFlushTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TestLRUListWithAsyncSorting.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TestLRUListWithAsyncSorting.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TestLRUListWithAsyncSorting.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TestLRUListWithAsyncSorting.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingIntegrationTestSuite.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingIntegrationTestSuite.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/LoggingIntegrationTestSuite.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingIntegrationTestSuite.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jIntegrationTestSuite.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/Log4jIntegrationTestSuite.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jIntegrationTestSuite.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/Log4jIntegrationTestSuite.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/FederatingManagerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserConverterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserConverterTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserConverterTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserConverterTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/HeadlessGfshIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/OptionAliasesParsingTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/OptionAliasesParsingTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/OptionAliasesParsingTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/OptionAliasesParsingTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/TableBuilderJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportDataIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GetCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ImportDataIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListDiskStoreCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ListDiskStoreCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListDiskStoreCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ListDiskStoreCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListRegionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ListRegionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListRegionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ListRegionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/PutCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommandIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/VersionCommandJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/lifecycle/GfshStatusCommandsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/IndexDetailsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/domain/IndexDetailsIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/IndexDetailsIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/domain/IndexDetailsIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/Geode3544JUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionFileTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunctionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/help/HelperIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/help/HelperIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonPdxIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/json/TypedJsonPdxIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonPdxIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/json/TypedJsonPdxIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshConfigInitFileJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshHistoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/shell/GfshMultilineCommandTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/util/LogExporterTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ZipUtilsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/configuration/ZipUtilsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ZipUtilsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/configuration/ZipUtilsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/deployment/FunctionScannerTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/deployment/FunctionScannerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/deployment/FunctionScannerTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/deployment/FunctionScannerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/AccessControlMBeanJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthenticationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanAuthorizationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CacheServerMBeanWithShiroIniIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/CliCommandsSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DataCommandsSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/DiskStoreMXBeanSecurityJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/FileUploaderMBeanSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/FileUploaderMBeanSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/FileUploaderMBeanSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/FileUploaderMBeanSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GatewayReceiverMBeanSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GatewaySenderMBeanSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JmxPasswordFileTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/JmxPasswordFileTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/JmxPasswordFileTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/JmxPasswordFileTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/LockServiceMBeanAuthorizationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/MBeanSecurityJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/ManagerMBeanAuthorizationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/MemberMBeanSecurityJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/SecurityServiceWithCustomRealmIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/security/SecurityServiceWithShiroIniIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerProcessCommandTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerProcessCommandTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerProcessCommandTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerProcessCommandTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/management/internal/web/http/support/HttpRequesterTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/memcached/DomainObjectsAsValuesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/memcached/GemcachedBinaryClientJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/memcached/GemcachedDevelopmentJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/memcached/IntegrationJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/memcached/IntegrationJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/memcached/IntegrationJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/JSONFormatterBasicJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
similarity index 95%
rename from geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
index e173991..8f864ec 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteBufferByteSourceJUnitTest.java
@@ -25,9 +25,9 @@ import org.apache.geode.internal.offheap.OffHeapStoredObject;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class OffHeapByteBufferByteSourceJUnitTest extends OffHeapByteSourceJUnitTest {
@Override
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
similarity index 96%
rename from geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
index 70c6a5a..ef9ddd0 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/pdx/OffHeapByteSourceJUnitTest.java
@@ -27,9 +27,9 @@ import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.internal.tcp.ByteBufferInputStream.OffHeapByteSource;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(UnitTest.class)
+@Category(IntegrationTest.class)
public class OffHeapByteSourceJUnitTest extends ByteSourceJUnitTest {
@Before
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceLoaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceLoaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceLoaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxInstanceLoaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxStringJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/PdxStringJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/MultipleCacheJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/pdx/internal/MultipleCacheJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/internal/MultipleCacheJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/pdx/internal/MultipleCacheJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/AuthJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/AuthJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/AuthJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/ConcurrentStartTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/ConcurrentStartTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/ConcurrentStartTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/HashesJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/HashesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/HashesJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/ListsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/ListsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/ListsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/RedisServerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/RedisServerTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/RedisServerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/SetsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/SetsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/SortedSetsJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/SortedSetsJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/SortedSetsJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/redis/StringsJunitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/StringsJunitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/redis/StringsJunitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java b/geode-core/src/integrationTest/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ExampleSecurityManagerTest.java b/geode-core/src/integrationTest/java/org/apache/geode/security/ExampleSecurityManagerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ExampleSecurityManagerTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/security/ExampleSecurityManagerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/security/SecurityManagerLifecycleIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithErrorInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithExtraLineInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLineMissingFromEndOfOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLineMissingFromMiddleOfOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerErrorInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerFatalInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithLoggerWarnInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithSevereInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/FailWithWarningInOutputJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestFrameworkTestSuite.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/GoldenTestFrameworkTestSuite.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestFrameworkTestSuite.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/GoldenTestFrameworkTestSuite.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/PassJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedErrorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedSevereJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/golden/PassWithExpectedWarningJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/process/ProcessWrapperJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingUnitTestSuite.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingUnitTestSuite.java
index 2b0e729..a233c51 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingUnitTestSuite.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LoggingUnitTestSuite.java
@@ -18,16 +18,14 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.apache.geode.internal.logging.log4j.AlertAppenderJUnitTest;
-import org.apache.geode.internal.logging.log4j.ConfigLocatorJUnitTest;
import org.apache.geode.internal.logging.log4j.FastLoggerJUnitTest;
-import org.apache.geode.internal.logging.log4j.FastLoggerWithDefaultConfigJUnitTest;
import org.apache.geode.internal.logging.log4j.LocalizedMessageJUnitTest;
import org.apache.geode.internal.logging.log4j.LogWriterAppenderJUnitTest;
@RunWith(Suite.class)
@Suite.SuiteClasses({LogServiceJUnitTest.class, LogWriterImplJUnitTest.class,
- SortLogFileJUnitTest.class, AlertAppenderJUnitTest.class, ConfigLocatorJUnitTest.class,
- FastLoggerJUnitTest.class, FastLoggerWithDefaultConfigJUnitTest.class,
+ SortLogFileJUnitTest.class, AlertAppenderJUnitTest.class,
+ FastLoggerJUnitTest.class,
LocalizedMessageJUnitTest.class, LogWriterAppenderJUnitTest.class,})
public class LoggingUnitTestSuite {
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jUnitTestSuite.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jUnitTestSuite.java
old mode 100755
new mode 100644
index 189f23b..a4215d4
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jUnitTestSuite.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4jUnitTestSuite.java
@@ -18,8 +18,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({AlertAppenderJUnitTest.class, ConfigLocatorJUnitTest.class,
- FastLoggerJUnitTest.class, FastLoggerWithDefaultConfigJUnitTest.class,
+@Suite.SuiteClasses({AlertAppenderJUnitTest.class,
+ FastLoggerJUnitTest.class,
LocalizedMessageJUnitTest.class, LogWriterAppenderJUnitTest.class,})
public class Log4jUnitTestSuite {
}
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessTestFrameworkTestSuite.java b/geode-core/src/test/java/org/apache/geode/test/process/ProcessTestFrameworkTestSuite.java
index 9072e97..df5bc6f 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/ProcessTestFrameworkTestSuite.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/ProcessTestFrameworkTestSuite.java
@@ -18,6 +18,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({MainLauncherJUnitTest.class, ProcessWrapperJUnitTest.class,})
+@Suite.SuiteClasses({MainLauncherJUnitTest.class})
public class ProcessTestFrameworkTestSuite {
}
[geode] 15/46: GEODE-5363: Moves geode-assembly tests into new
source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76ad7b43890863669fda0a53d692086093227041
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 22:37:03 2018 -0700
GEODE-5363: Moves geode-assembly tests into new source sets.
---
geode-assembly/build.gradle | 56 ++++++++++++++++++++++
.../cli/commands/ConfigureEvictionThroughGfsh.java | 0
.../cli/commands/ConnectCommandAcceptanceTest.java | 0
.../cli/commands/DeployWithLargeJarTest.java | 0
.../cli/commands/DestroyIndexIfExistsTest.java | 0
.../cli/commands/GfshStartLocatorLogTest.java | 0
.../cli/commands/ImportClusterConfigTest.java | 0
...scribeConfigAreFullyRedactedAcceptanceTest.java | 0
.../cli/commands/PutCommandWithJsonTest.java | 0
.../cli/commands/StartLocatorAcceptanceTest.java | 0
.../cli/commands/StatusLocatorRealGfshTest.java | 0
.../cli/commands/StopServerAcceptanceTest.java | 0
.../StopServerWithSecurityAcceptanceTest.java | 0
.../cli/shell/GfshDisconnectWithinScript.java | 0
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 0
.../shell/StatusServerExitCodeAcceptanceTest.java | 0
.../LauncherLifecycleCommandsDUnitTest.java | 0
.../internal/web/RestFunctionExecuteDUnitTest.java | 0
.../RestAPIOnRegionFunctionExecutionDUnitTest.java | 0
.../internal/web/controllers/RestAPITestBase.java | 0
.../controllers/RestAPIsAndInterOpsDUnitTest.java | 0
...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 0
...estAPIsOnMembersFunctionExecutionDUnitTest.java | 0
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 0
.../apache/geode/session/tests/CargoTestBase.java | 0
.../tests/GenericAppServerClientServerTest.java | 0
.../tests/Jetty9CachingClientServerTest.java | 0
.../session/tests/Jetty9ClientServerTest.java | 0
.../org/apache/geode/session/tests/Jetty9Test.java | 0
.../session/tests/Tomcat6ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat6Test.java | 0
.../session/tests/Tomcat7ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat7Test.java | 0
.../session/tests/Tomcat8ClientServerTest.java | 0
.../apache/geode/session/tests/Tomcat8Test.java | 0
.../session/tests/TomcatClientServerTest.java | 0
.../TomcatSessionBackwardsCompatibilityTest.java | 0
.../org/apache/geode/BundledJarsJUnitTest.java | 0
.../management/internal/AgentUtilJUnitTest.java | 0
.../cli/commands/GemfireCoreClasspathTest.java | 0
.../StartLocatorCommandIntegrationTest.java | 0
.../StartServerCommandIntegrationTest.java | 0
.../internal/web/RestInterfaceIntegrationTest.java | 0
.../internal/web/RestSecurityIntegrationTest.java | 0
.../web/RestSecurityPostProcessorTest.java | 0
.../rest/internal/web/RestSecurityWithSSLTest.java | 0
.../internal/web/RestServersIntegrationTest.java | 0
.../web/SwaggerVerificationIntegrationTest.java | 0
.../PdxBasedCrudControllerIntegrationTest.java | 0
.../RestQueryAndFunctionIntegrationTest.java | 0
.../geode/tools/pulse/PulseConnectivityTest.java | 0
.../geode/tools/pulse/PulseDataExportTest.java | 0
.../tools/pulse/PulseJmxPasswordFileTest.java | 0
.../tools/pulse/PulseSecurityIntegrationTest.java | 0
.../geode/tools/pulse/PulseSecurityTest.java | 0
.../tools/pulse/PulseSecurityWithSSLTest.java | 0
.../tools/pulse/ui/PulseAcceptanceAuthTest.java | 0
.../tools/pulse/ui/PulseAcceptanceNoAuthTest.java | 0
58 files changed, 56 insertions(+)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 8609535..3d3f469 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -490,3 +490,59 @@ task dumpInstalledJars(dependsOn: installDist) {
};
}
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ acceptanceTestCompile.extendsFrom testCompile
+ acceptanceTestRuntime.extendsFrom testRuntime
+ uiTestCompile.extendsFrom testCompile
+ uiTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+ acceptanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+ }
+ uiTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/uiTest/java')
+ }
+ resources.srcDir file('src/uiTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ acceptanceTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ uiTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ uiTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9Test.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9Test.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9Test.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6Test.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7Test.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8Test.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
rename to geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
similarity index 100%
rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
rename to geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
[geode] 01/46: GEODE-5363: Creates integration test source set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit eb6aae0c1bbbf67295ac8d2b12ece533069a5e64
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 14:06:50 2018 -0700
GEODE-5363: Creates integration test source set.
---
geode-core/build.gradle | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index d409e1e..f8a0c5d 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -31,6 +31,8 @@ sourceSets {
configurations {
//declaring new configuration that will be used to associate with artifacts
archives
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
}
dependencies {
@@ -161,6 +163,11 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
+
+
+ // Integration Tests
+
+
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -172,6 +179,14 @@ sourceSets {
test {
output.dir(generatedResources, builtBy: 'createVersionPropertiesFile')
}
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
}
jmh {
[geode] 39/46: GEODE-5363: Run distributed tests from new sourceSet
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4dd085a0ceb1ce155aeecca25af7cc98ef41cd9c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 22:43:38 2018 -0700
GEODE-5363: Run distributed tests from new sourceSet
---
.../apache/geode/cache30/GlobalLockingDUnitTest.java | 2 +-
.../geode/test/dunit/rules/DistributedTestRule.java | 2 --
gradle/test.gradle | 19 +++++++++++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
index 69be5ee..667bc1c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
@@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
@Category({DistributedTest.class, DLockTest.class})
public class GlobalLockingDUnitTest extends JUnit4CacheTestCase {
- public static Region region_testBug32356;
+ private static Region region_testBug32356;
public GlobalLockingDUnitTest() {
super();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
index c8af8a9..e01e1f3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.query.QueryTestUtils;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache30.ClientServerTestCase;
-import org.apache.geode.cache30.GlobalLockingDUnitTest;
import org.apache.geode.cache30.MultiVMRegionTestCase;
import org.apache.geode.cache30.RegionTestCase;
import org.apache.geode.distributed.internal.DistributionConfig;
@@ -212,7 +211,6 @@ public class DistributedTestRule extends AbstractDistributedTestRule {
DiskStoreObserver.setInstance(null);
unregisterInstantiatorsInThisVM();
DistributionMessageObserver.setInstance(null);
- GlobalLockingDUnitTest.region_testBug32356 = null;
InitialImageOperation.slowImageProcessing = 0;
InternalClientMembership.unregisterAllListeners();
LogWrapper.close();
diff --git a/gradle/test.gradle b/gradle/test.gradle
index ea0192d..858b623 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -92,6 +92,15 @@ subprojects {
}
resources.srcDir file('src/integrationTest/resources')
}
+
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
}
task integrationTest(type:Test) {
@@ -116,11 +125,21 @@ subprojects {
}
task distributedTest(type:Test) {
+ testClassesDirs = sourceSets.distributedTest.output.classesDirs
+ classpath = sourceSets.distributedTest.runtimeClasspath
+
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.DistributedTest'
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
+
forkEvery 1
+
+ if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+ if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
outputs.upToDateWhen{false}
}
[geode] 24/46: GEODE-5363: Moves geode-experimental-driver tests
into new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 79a48bef8e2ae1c1545ce6abf349565796354774
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:25:50 2018 -0700
GEODE-5363: Moves geode-experimental-driver tests into new source sets.
---
geode-experimental-driver/build.gradle | 21 +++++++++++++++++++++
.../experimental/driver/AuthenticationTest.java | 0
.../experimental/driver/DriverConnectionTest.java | 0
.../driver/FunctionServiceIntegrationTest.java | 0
.../driver/PostProcessingIntegrationTest.java | 0
.../driver/QueryServiceIntegrationTest.java | 0
.../experimental/driver/RegionIntegrationTest.java | 0
.../apache/geode/experimental/driver/SSLTest.java | 0
.../driver/ValueSerializerIntegrationTest.java | 0
9 files changed, 21 insertions(+)
diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
index 1a4badc..e8dcdb7 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -25,3 +25,24 @@ dependencies {
testCompile project(':geode-protobuf')
testCompile files(project(':geode-core').sourceSets.test.output)
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/AuthenticationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/AuthenticationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/AuthenticationTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/DriverConnectionTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/FunctionServiceIntegrationTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/PostProcessingIntegrationTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/QueryServiceIntegrationTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/RegionIntegrationTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/SSLTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
diff --git a/geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
similarity index 100%
rename from geode-experimental-driver/src/test/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
rename to geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/ValueSerializerIntegrationTest.java
[geode] 25/46: GEODE-5363: Moves geode-old-client-support tests
into new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 10ecd0a431c8be9035f85f4cd08e0f22f7b694ac
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:30:31 2018 -0700
GEODE-5363: Moves geode-old-client-support tests into new source sets.
---
geode-connectors/build.gradle | 46 ++++++++++++++++++++++
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 0
.../geode/connectors/jdbc/JdbcDistributedTest.java | 0
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 0
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 0
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 0
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 0
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 0
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 0
.../PostgresJdbcAsyncWriterIntegrationTest.java | 0
.../jdbc/PostgresJdbcDistributedTest.java | 0
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 0
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 0
.../MySqlTableMetaDataManagerIntegrationTest.java | 0
...ostgresTableMetaDataManagerIntegrationTest.java | 0
.../TableMetaDataManagerIntegrationTest.java | 0
.../cli/AlterConnectionCommandDUnitTest.java | 0
.../internal/cli/AlterMappingCommandDUnitTest.java | 0
.../cli/CreateConnectionCommandDUnitTest.java | 0
.../cli/CreateMappingCommandDUnitTest.java | 0
.../cli/DescribeConnectionCommandDUnitTest.java | 0
.../cli/DescribeMappingCommandDUnitTest.java | 0
.../cli/DestroyConnectionCommandDUnitTest.java | 0
.../cli/DestroyMappingCommandDunitTest.java | 0
.../cli/JdbcClusterConfigDistributedTest.java | 0
.../cli/ListConnectionCommandDUnitTest.java | 0
.../internal/cli/ListMappingCommandDUnitTest.java | 0
.../AnalyzeConnectorsSerializablesJUnitTest.java | 0
.../cli/AlterConnectionCommandIntegrationTest.java | 0
.../cli/AlterMappingCommandIntegrationTest.java | 0
.../CreateConnectionCommandIntegrationTest.java | 0
.../cli/CreateMappingCommandIntegrationTest.java | 0
.../DestroyConnectionCommandIntegrationTest.java | 0
.../cli/DestroyMappingCommandIntegrationTest.java | 0
.../cli/JDBCConnectorFunctionsSecurityTest.java | 0
geode-old-client-support/build.gradle | 22 +++++++++++
.../gemfire/ClientDataSerializableObject.java | 0
.../gemfire/ClientPDXSerializableObject.java | 0
.../gemstone/gemfire/ClientSerializableObject.java | 0
.../apache/geode/ClientDataSerializableObject.java | 0
.../apache/geode/ClientPDXSerializableObject.java | 0
.../org/apache/geode/ClientSerializableObject.java | 0
.../apache/geode/OldClientSupportDUnitTest.java | 0
43 files changed, 68 insertions(+)
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index c5423b9..f9e4c88 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -41,4 +41,50 @@ dependencies {
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ acceptanceTestCompile.extendsFrom testCompile
+ acceptanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+ acceptanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ acceptanceTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ acceptanceTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
integrationTest.forkEvery 0
+
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
rename to geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
rename to geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
similarity index 100%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
rename to geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
index f5d967a..02b6d2a 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -24,3 +24,25 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+
+configurations {
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientDataSerializableObject.java b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientDataSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientDataSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientDataSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientPDXSerializableObject.java b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientPDXSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientSerializableObject.java b/geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/com/gemstone/gemfire/ClientSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/com/gemstone/gemfire/ClientSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/ClientDataSerializableObject.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientDataSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/org/apache/geode/ClientDataSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientDataSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/ClientPDXSerializableObject.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientPDXSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/org/apache/geode/ClientPDXSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientPDXSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/ClientSerializableObject.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientSerializableObject.java
similarity index 100%
rename from geode-old-client-support/src/test/java/org/apache/geode/ClientSerializableObject.java
rename to geode-old-client-support/src/distributedTest/java/org/apache/geode/ClientSerializableObject.java
diff --git a/geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java b/geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
similarity index 100%
rename from geode-old-client-support/src/test/java/org/apache/geode/OldClientSupportDUnitTest.java
rename to geode-old-client-support/src/distributedTest/java/org/apache/geode/OldClientSupportDUnitTest.java
[geode] 16/46: GEODE-5363: Moves geode-modules tests into new
source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 809792f4a18a53439c74c83b8521fc263ae5e92f
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 06:56:24 2018 -0700
GEODE-5363: Moves geode-modules tests into new source sets.
---
extensions/geode-modules/build.gradle | 22 ++++++++++++++++++++++
.../modules/session/Tomcat6SessionsJUnitTest.java | 0
.../modules/util/ModuleFunctionsSecurityTest.java | 0
3 files changed, 22 insertions(+)
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 9796096..0986f85 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -31,7 +31,29 @@ dependencies {
testRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
testCompile project(path: ':geode-junit')
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
similarity index 100%
rename from extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
rename to extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
similarity index 100%
rename from extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
rename to extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
[geode] 29/46: GEODE-5363: Cleanup unit tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c4a5128178bb06e5cdf15a0f0078091590c5d728
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 16:46:59 2018 -0700
GEODE-5363: Cleanup unit tests.
---
.../util/ClassLoaderObjectInputStreamTest.java | 2 --
.../cli/commands/StartLocatorCommandTest.java | 2 --
.../cli/commands/StartServerCommandTest.java | 2 --
.../geode/test/junit/rules/GfshRuleTest.java | 1 -
.../geode/annotations/ExperimentalJUnitTest.java | 2 --
.../geode/connectors/jdbc/JdbcAsyncWriterTest.java | 2 --
.../jdbc/JdbcConnectorExceptionTest.java | 2 --
.../geode/connectors/jdbc/JdbcLoaderTest.java | 2 --
.../geode/connectors/jdbc/JdbcWriterTest.java | 2 --
.../jdbc/internal/AbstractJdbcCallbackTest.java | 2 --
.../connectors/jdbc/internal/ColumnDataTest.java | 2 --
.../jdbc/internal/DataSourceManagerUnitTest.java | 2 --
.../jdbc/internal/JdbcConnectorServiceTest.java | 2 --
.../jdbc/internal/RegionMappingTest.java | 2 --
.../connectors/jdbc/internal/SqlHandlerTest.java | 2 --
.../jdbc/internal/SqlStatementFactoryTest.java | 2 --
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 2 --
.../jdbc/internal/TableMetaDataManagerTest.java | 2 --
.../internal/cli/AlterConnectionCommandTest.java | 2 --
.../internal/cli/AlterConnectionFunctionTest.java | 2 --
.../jdbc/internal/cli/AlterMappingCommandTest.java | 2 --
.../internal/cli/AlterMappingFunctionTest.java | 2 --
.../internal/cli/CreateConnectionFunctionTest.java | 2 --
.../internal/cli/CreateMappingFunctionTest.java | 2 --
.../cli/DescribeConnectionCommandTest.java | 2 --
.../cli/DescribeConnectionFunctionTest.java | 2 --
.../internal/cli/DescribeMappingCommandTest.java | 2 --
.../internal/cli/DescribeMappingFunctionTest.java | 2 --
.../cli/DestroyConnectionFunctionTest.java | 2 --
.../cli/DestroyMappingCommandFunctionTest.java | 2 --
.../cli/FunctionContextArgumentProviderTest.java | 2 --
.../internal/cli/JDBCCommandsAvailabilityTest.java | 2 --
.../internal/cli/ListConnectionCommandTest.java | 2 --
.../internal/cli/ListConnectionFunctionTest.java | 2 --
.../jdbc/internal/cli/ListMappingCommandTest.java | 2 --
.../jdbc/internal/cli/ListMappingFunctionTest.java | 2 --
.../configuration/ConnectorServiceTest.java | 2 --
.../jdbc/internal/xml/ElementTypeTest.java | 2 --
.../xml/JdbcConnectorServiceXmlParserTest.java | 2 --
.../internal/xml/JdbcServiceConfigurationTest.java | 2 --
.../geode/distributed/LocatorLauncherTest.java | 2 --
.../internal/deadlock/DeadlockDetectorTest.java | 2 --
.../fixed/FixedPartitioningTestBaseJUnitTest.java | 2 --
.../dunit/rules/tests/MemberStarterRuleTest.java | 2 --
.../internal/ProductUseLogJUnitTest.java | 1 -
.../java/org/apache/geode/DataSerializerTest.java | 1 -
.../java/org/apache/geode/InstantiatorTest.java | 2 --
.../org/apache/geode/SystemFailureJUnitTest.java | 1 -
.../apache/geode/admin/AlertLevelJUnitTest.java | 2 --
.../geode/admin/RegionSubRegionSnapshotTest.java | 2 --
.../geode/cache/AttributesFactoryJUnitTest.java | 2 --
.../geode/cache/DiskAccessExceptionTest.java | 2 --
.../geode/cache/ExpirationAttributesTest.java | 2 --
...cArrayShouldNotCauseSegFaultRegressionTest.java | 2 --
...hipAttributesAreSerializableRegressionTest.java | 1 -
.../org/apache/geode/cache/OperationJUnitTest.java | 2 --
.../geode/cache/RegionNameValidationJUnitTest.java | 2 --
.../org/apache/geode/cache/RegionShortcutTest.java | 2 --
.../apache/geode/cache/RoleExceptionJUnitTest.java | 2 --
.../cache/client/internal/AbstractOpTest.java | 1 -
.../client/internal/ConnectionConnectorTest.java | 2 --
.../internal/ConnectionFactoryJUnitTest.java | 2 --
.../client/internal/OpExecutorImplJUnitTest.java | 1 -
.../internal/QueueConnectionImplJUnitTest.java | 1 -
.../client/internal/ServerBlackListJUnitTest.java | 1 -
...pClientExecutorSubmitTaskWithExceptionTest.java | 1 -
.../cache/client/internal/TXFailoverOpTest.java | 2 --
.../locator/LocatorStatusResponseJUnitTest.java | 1 -
.../geode/cache/configuration/CacheConfigTest.java | 2 --
.../cache/configuration/DeclarableTypeTest.java | 2 --
.../cache/execute/FunctionAdapterJUnitTest.java | 2 --
.../geode/cache/execute/FunctionExceptionTest.java | 2 --
.../apache/geode/cache/query/IndexTypeTest.java | 1 -
.../functional/JavaSerializationJUnitTest.java | 2 --
.../CompiledAggregateFunctionJUnitTest.java | 2 --
.../cache/query/internal/CompiledInJUnitTest.java | 2 --
.../internal/CompiledIteratorDefJUnitTest.java | 2 --
.../query/internal/NWayMergeResultsJUnitTest.java | 2 --
.../internal/QueryExecutionContextJUnitTest.java | 2 --
.../QueryObjectSerializationJUnitTest.java | 2 --
.../RestrictedMethodInvocationAuthorizerTest.java | 1 -
.../cache/query/internal/ResultsBagJUnitTest.java | 2 --
.../ResultsBagLimitBehaviourJUnitTest.java | 2 --
.../ResultsCollectionWrapperLimitJUnitTest.java | 2 --
.../internal/SelectResultsComparatorJUnitTest.java | 2 --
.../internal/StructBagLimitBehaviourJUnitTest.java | 2 --
.../cache/query/internal/StructSetJUnitTest.java | 2 --
.../internal/aggregate/AggregatorJUnitTest.java | 2 --
.../internal/cq/CqAttributesImplJUnitTest.java | 2 --
.../internal/index/HashIndexSetJUnitTest.java | 2 --
.../internal/index/IndexElemArrayJUnitTest.java | 2 --
.../internal/index/MemoryIndexStoreJUnitTest.java | 2 --
...IndexStoreWithInplaceModificationJUnitTest.java | 2 --
.../cache/query/internal/parse/OQLParserTest.java | 2 --
.../query/internal/types/TypeUtilsJUnitTest.java | 2 --
.../internal/ConnectionCountProbeJUnitTest.java | 2 --
.../cache/server/internal/LoadMonitorTest.java | 2 --
.../StringPrefixPartitionResolverJUnitTest.java | 2 --
.../AbstractLauncherServiceStateTest.java | 2 --
.../geode/distributed/AbstractLauncherTest.java | 2 --
.../distributed/DistributedSystemJUnitTest.java | 1 -
.../distributed/LocatorLauncherBuilderTest.java | 2 --
.../apache/geode/distributed/LocatorStateTest.java | 2 --
.../distributed/ServerLauncherBuilderTest.java | 2 --
.../geode/distributed/ServerLauncherTest.java | 2 --
...erverLauncherWaitOnServerMultiThreadedTest.java | 2 --
.../AtomicLongWithTerminalStateJUnitTest.java | 2 --
.../internal/ClusterDistributionManagerTest.java | 2 --
.../internal/DistributionAdvisorTest.java | 2 --
.../internal/DistributionConfigJUnitTest.java | 1 -
.../internal/DistributionMessageTest.java | 1 -
...nternalConfigurationPersistenceServiceTest.java | 2 --
.../internal/LocatorLoadSnapshotJUnitTest.java | 1 -
.../distributed/internal/ReplyProcessor21Test.java | 1 -
.../internal/ServerLocatorJUnitTest.java | 1 -
.../internal/StartupMessageDataJUnitTest.java | 1 -
.../deadlock/DependencyGraphJUnitTest.java | 2 --
.../deadlock/UnsafeThreadLocalJUnitTest.java | 2 --
.../internal/membership/InternalRoleJUnitTest.java | 1 -
.../internal/membership/NetViewJUnitTest.java | 1 -
.../membership/gms/GMSMemberJUnitTest.java | 1 -
.../gms/auth/AbstractGMSAuthenticatorTestCase.java | 0
.../GMSAuthenticatorWithAuthenticatorTest.java | 1 -
.../GMSAuthenticatorWithSecurityManagerTest.java | 1 -
.../gms/membership/StatRecorderJUnitTest.java | 1 -
.../apache/geode/internal/AbstractConfigTest.java | 2 --
.../org/apache/geode/internal/AssertJUnitTest.java | 2 --
.../apache/geode/internal/ClassPathLoaderTest.java | 2 --
.../geode/internal/ConfigSourceJUnitTest.java | 2 --
.../internal/CopyOnWriteHashSetJUnitTest.java | 2 --
.../java/org/apache/geode/internal/DSCODETest.java | 1 -
.../geode/internal/DataSerializableJUnitTest.java | 1 -
.../internal/DataSerializerHolderJUnitTest.java | 2 --
.../geode/internal/GemFireVersionJUnitTest.java | 2 --
.../internal/HeapDataOutputStreamJUnitTest.java | 1 -
.../geode/internal/HeapDataOutputStreamTest.java | 1 -
.../internal/InternalDataSerializerJUnitTest.java | 1 -
...InternalDataSerializerQuickcheckStringTest.java | 1 -
...alDataSerializerSerializationWhitelistTest.java | 1 -
.../geode/internal/LineWrapUnitJUnitTest.java | 2 --
.../apache/geode/internal/NanoTimerJUnitTest.java | 2 --
.../geode/internal/ObjIdConcurrentMapTest.java | 2 --
.../apache/geode/internal/ObjIdMapJUnitTest.java | 2 --
.../internal/OneTaskOnlyDecoratorJUnitTest.java | 2 --
.../internal/PutAllOperationContextJUnitTest.java | 2 --
.../geode/internal/UniqueIdGeneratorJUnitTest.java | 2 --
.../apache/geode/internal/VersionJUnitTest.java | 2 --
.../remote/DistributionLocatorIdJUnitTest.java | 2 --
.../admin/remote/RemoteGfManagerAgentTest.java | 2 --
.../internal/cache/AbstractDiskRegionTest.java | 2 --
.../cache/AbstractOplogDiskRegionEntryTest.java | 2 --
.../internal/cache/AbstractRegionJUnitTest.java | 2 --
.../internal/cache/AbstractRegionMapTest.java | 2 --
.../cache/AbstractRegionMapTxApplyDestroyTest.java | 2 --
.../geode/internal/cache/AbstractRegionTest.java | 2 --
.../geode/internal/cache/BucketAdvisorTest.java | 2 --
.../cache/BucketPersistenceAdvisorTest.java | 2 --
.../cache/BucketRedundancyTrackerTest.java | 2 --
.../internal/cache/BucketRegionJUnitTest.java | 3 ---
.../internal/cache/CacheOperationMessageTest.java | 2 --
.../geode/internal/cache/CacheProfileTest.java | 2 --
.../cache/CacheServerLauncherJUnitTest.java | 2 --
.../geode/internal/cache/ColocationHelperTest.java | 2 --
.../geode/internal/cache/DestroyMessageTest.java | 2 --
.../geode/internal/cache/DiskIdJUnitTest.java | 2 --
.../geode/internal/cache/DiskStoreMonitorTest.java | 2 --
.../apache/geode/internal/cache/DiskUsageTest.java | 2 --
.../cache/DiskWriteAttributesJUnitTest.java | 2 --
.../internal/cache/DistPeerTXStateStubTest.java | 2 --
.../cache/DistributedCacheOperationTest.java | 2 --
.../cache/DistributedPutAllOperationTest.java | 2 --
...tributedRegionFunctionStreamingMessageTest.java | 2 --
.../internal/cache/DistributedRegionJUnitTest.java | 2 --
.../DistributedRegionSearchLoadJUnitTest.java | 2 --
.../internal/cache/DistributedRegionTest.java | 2 --
.../cache/DistributedRemoveAllOperationTest.java | 2 --
.../geode/internal/cache/EntryEventImplTest.java | 2 --
.../cache/EntryEventSerializationTest.java | 2 --
.../internal/cache/EnumListenerEventJUnitTest.java | 2 --
.../internal/cache/EvictionAttributesImplTest.java | 2 --
.../geode/internal/cache/ExpiryTaskTest.java | 2 --
.../FilterProfileNullCqBaseRegionJUnitTest.java | 2 --
.../geode/internal/cache/FlusherThreadTest.java | 2 --
.../geode/internal/cache/GemFireCacheImplTest.java | 2 --
.../geode/internal/cache/GridProfileTest.java | 2 --
.../internal/cache/InitialImageOperationTest.java | 2 --
.../cache/InternalCacheForClientAccessTest.java | 2 --
.../cache/JtaAfterCompletionMessageTest.java | 2 --
.../cache/JtaBeforeCompletionMessageTest.java | 2 --
.../geode/internal/cache/LocalDataSetTest.java | 2 --
.../cache/MemberFunctionStreamingMessageTest.java | 2 --
.../internal/cache/NonLocalRegionEntryTest.java | 2 --
.../cache/OffHeapValueWrapperJUnitTest.java | 2 --
.../geode/internal/cache/OldVLJUnitTest.java | 2 --
.../internal/cache/OplogEntryIdMapJUnitTest.java | 2 --
.../internal/cache/OplogEntryIdSetJUnitTest.java | 2 --
.../org/apache/geode/internal/cache/OplogTest.java | 2 --
.../cache/OrderedTombstoneMapJUnitTest.java | 2 --
.../cache/PartitionAttributesImplJUnitTest.java | 2 --
.../cache/PartitionRegionConfigJUnitTest.java | 2 --
.../internal/cache/PartitionRegionConfigTest.java | 2 --
.../cache/PartitionedRegionDataStoreTest.java | 2 --
.../cache/PartitionedRegionHelperJUnitTest.java | 2 --
.../cache/PartitionedRegionQueryEvaluatorTest.java | 2 --
.../PartitionedRegionRedundancyTrackerTest.java | 2 --
.../internal/cache/PlaceHolderDiskRegionTest.java | 2 --
.../internal/cache/ProxyBucketRegionTest.java | 2 --
.../geode/internal/cache/RegionCommitTest.java | 2 --
.../cache/RequestFilterInfoMessageTest.java | 2 --
.../internal/cache/RequestImageMessageTest.java | 2 --
.../internal/cache/RequestRVVMessageTest.java | 2 --
.../cache/SearchLoadAndWriteProcessorTest.java | 2 --
.../internal/cache/StateMarkerMessageTest.java | 2 --
.../apache/geode/internal/cache/TXEventTest.java | 2 --
.../geode/internal/cache/TXManagerImplTest.java | 2 --
.../apache/geode/internal/cache/TXMessageTest.java | 2 --
.../cache/TXRegionLockRequestImplTest.java | 2 --
.../geode/internal/cache/TXStateProxyImplTest.java | 2 --
.../geode/internal/cache/TXStateStubTest.java | 2 --
.../cache/TXSynchronizationRunnableTest.java | 2 --
.../geode/internal/cache/TxCommitMessageTest.java | 2 --
.../apache/geode/internal/cache/VLJUnitTest.java | 2 --
.../geode/internal/cache/VMLRURegionMapTest.java | 2 --
.../cache/backup/AbortBackupFactoryTest.java | 2 --
.../cache/backup/AbortBackupRequestTest.java | 2 --
.../internal/cache/backup/AbortBackupStepTest.java | 2 --
.../backup/AbstractBackupWriterConfigTest.java | 2 --
.../cache/backup/BackupDefinitionTest.java | 2 --
.../cache/backup/BackupReplyProcessorTest.java | 2 --
.../internal/cache/backup/BackupServiceTest.java | 2 --
.../cache/backup/BackupWriterFactoryTest.java | 2 --
.../backup/FileSystemBackupWriterConfigTest.java | 2 --
.../FileSystemIncrementalBackupLocationTest.java | 2 --
.../cache/backup/FinishBackupFactoryTest.java | 2 --
.../cache/backup/FinishBackupRequestTest.java | 2 --
.../cache/backup/FinishBackupStepTest.java | 2 --
.../cache/backup/FlushToDiskFactoryTest.java | 2 --
.../cache/backup/FlushToDiskRequestTest.java | 2 --
.../internal/cache/backup/FlushToDiskStepTest.java | 2 --
.../cache/backup/PrepareBackupFactoryTest.java | 2 --
.../cache/backup/PrepareBackupRequestTest.java | 2 --
.../cache/backup/PrepareBackupStepTest.java | 2 --
.../cache/backup/TemporaryBackupFilesTest.java | 2 --
.../cache/control/FilterByPathJUnitTest.java | 2 --
.../cache/control/MemoryThresholdsJUnitTest.java | 2 --
.../cache/control/ResourceAdvisorTest.java | 2 --
.../cache/entries/AbstractRegionEntryTest.java | 2 --
.../cache/event/DistributedEventTrackerTest.java | 2 --
.../cache/event/EventTrackerExpiryTaskTest.java | 2 --
.../event/NonDistributedEventTrackerTest.java | 2 --
.../cache/eviction/AbstractEvictionListTest.java | 2 --
.../cache/eviction/EvictionListBuilderTest.java | 2 --
.../internal/cache/eviction/LIFOListTest.java | 2 --
.../eviction/LRUListWithAsyncSortingTest.java | 2 --
.../cache/eviction/LRUListWithSyncSortingTest.java | 2 --
.../extension/SimpleExtensionPointJUnitTest.java | 2 --
.../cache/ha/EventIdOptimizationJUnitTest.java | 1 -
.../geode/internal/cache/ha/HARegionQueueTest.java | 1 -
.../cache/ha/ThreadIdentifierJUnitTest.java | 1 -
.../cache/map/AbstractRegionMapPutTest.java | 2 --
.../internal/cache/map/RegionMapCommitPutTest.java | 2 --
.../internal/cache/map/RegionMapDestroyTest.java | 2 --
.../geode/internal/cache/map/RegionMapPutTest.java | 2 --
.../cache/partitioned/BucketBackupMessageTest.java | 2 --
.../ColocatedRegionDetailsJUnitTest.java | 2 --
.../DeposePrimaryBucketMessageTest.java | 2 --
.../partitioned/FetchEntriesMessageJUnitTest.java | 2 --
.../cache/partitioned/FetchEntryMessageTest.java | 2 --
.../cache/partitioned/FetchKeysMessageTest.java | 2 --
.../FetchPartitionDetailsMessageTest.java | 2 --
.../ManageBackupBucketReplyMessageTest.java | 2 --
.../cache/partitioned/MoveBucketMessageTest.java | 2 --
.../OfflineMembersDetailsJUnitTest.java | 2 --
.../cache/partitioned/PartitionMessageTest.java | 2 --
.../partitioned/PutPutReplyMessageJUnitTest.java | 3 ---
.../partitioned/RemotePutMessageJUnitTest.java | 2 --
.../cache/partitioned/RemoveAllPRMessageTest.java | 2 --
.../cache/partitioned/RemoveBucketMessageTest.java | 2 --
.../cache/partitioned/SizeMessageTest.java | 2 --
.../rebalance/BucketOperatorImplTest.java | 2 --
.../rebalance/BucketOperatorWrapperTest.java | 2 --
.../PartitionedRegionLoadModelJUnitTest.java | 2 --
.../cache/persistence/DefaultDiskDirsTest.java | 2 --
.../PersistenceInitialImageAdvisorTest.java | 2 --
.../query/TemporaryResultSetFactoryJUnitTest.java | 2 --
.../entry/RegionEntryFactoryBuilderJUnitTest.java | 2 --
.../cache/snapshot/ClientExporterTest.java | 2 --
.../snapshot/ParallelSnapshotFileMapperTest.java | 2 --
.../internal/cache/tier/sockets/CCUStatsTest.java | 1 -
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 1 -
.../cache/tier/sockets/FilterProfileJUnitTest.java | 1 -
.../internal/cache/tier/sockets/HandshakeTest.java | 1 -
.../cache/tier/sockets/MessageIdExtractorTest.java | 1 -
.../cache/tier/sockets/MessageJUnitTest.java | 1 -
.../tier/sockets/ObjectPartListJUnitTest.java | 1 -
.../internal/cache/tier/sockets/PartTest.java | 1 -
.../tier/sockets/ServerConnectionFactoryTest.java | 1 -
.../cache/tier/sockets/ServerConnectionTest.java | 1 -
.../cache/tier/sockets/TcpServerFactoryTest.java | 1 -
.../tier/sockets/command/CommitCommandTest.java | 1 -
.../tier/sockets/command/ContainsKey66Test.java | 1 -
.../tier/sockets/command/ContainsKeyTest.java | 1 -
.../tier/sockets/command/CreateRegionTest.java | 1 -
.../cache/tier/sockets/command/Destroy65Test.java | 1 -
.../tier/sockets/command/DestroyRegionTest.java | 1 -
.../cache/tier/sockets/command/DestroyTest.java | 1 -
.../sockets/command/ExecuteFunction65Test.java | 1 -
.../sockets/command/ExecuteFunction66Test.java | 1 -
.../tier/sockets/command/ExecuteFunctionTest.java | 1 -
.../cache/tier/sockets/command/Get70Test.java | 1 -
.../cache/tier/sockets/command/GetAll651Test.java | 1 -
.../cache/tier/sockets/command/GetAll70Test.java | 1 -
.../cache/tier/sockets/command/GetAllTest.java | 1 -
.../sockets/command/GetAllWithCallbackTest.java | 1 -
.../GetClientPartitionAttributesCommand66Test.java | 1 -
.../GetClientPartitionAttributesCommandTest.java | 1 -
.../cache/tier/sockets/command/InvalidateTest.java | 1 -
.../cache/tier/sockets/command/KeySetTest.java | 1 -
.../cache/tier/sockets/command/Put61Test.java | 1 -
.../cache/tier/sockets/command/Put65Test.java | 1 -
.../cache/tier/sockets/command/PutTest.java | 1 -
.../sockets/command/RegisterInterest61Test.java | 1 -
.../command/RegisterInterestList61Test.java | 1 -
.../command/RegisterInterestList66Test.java | 1 -
.../sockets/command/RegisterInterestListTest.java | 1 -
.../tier/sockets/command/RegisterInterestTest.java | 1 -
.../cache/tier/sockets/command/RemoveAllTest.java | 1 -
.../cache/tier/sockets/command/RequestTest.java | 1 -
.../sockets/command/TXFailoverCommandTest.java | 1 -
.../sockets/command/UnregisterInterestTest.java | 1 -
.../cache/tx/AbstractPeerTXRegionStubTest.java | 2 --
.../internal/cache/tx/ClientTXStateStubTest.java | 2 --
.../cache/tx/RemoteFetchEntryMessageTest.java | 2 --
.../cache/tx/RemoteOperationMessageTest.java | 2 --
.../cache/tx/RemoteOperationResponseTest.java | 2 --
.../internal/cache/tx/RemotePutAllMessageTest.java | 2 --
.../internal/cache/tx/RemotePutMessageTest.java | 2 --
.../cache/tx/RemotePutReplyMessageJUnitTest.java | 3 ---
.../cache/tx/RemoteRemoveAllMessageTest.java | 2 --
.../cache/versions/RVVExceptionJUnitTest.java | 2 --
.../versions/RegionVersionHolder2JUnitTest.java | 2 --
.../versions/RegionVersionHolderJUnitTest.java | 2 --
.../RegionVersionHolderRandomJUnitTest.java | 2 --
.../RegionVersionHolderSmallBitSetJUnitTest.java | 2 --
.../cache/versions/RegionVersionVectorTest.java | 21 ++++++++++-----
.../internal/cache/versions/VMVersionTagTest.java | 2 --
...rallelGatewaySenderEventProcessorJUnitTest.java | 2 --
.../ParallelGatewaySenderQueueJUnitTest.java | 2 --
.../ParallelQueueRemovalMessageJUnitTest.java | 2 --
...SerialGatewaySenderEventProcessorJUnitTest.java | 2 --
.../cache/wan/serial/DestroyMessageTest.java | 2 --
...SerialGatewaySenderEventProcessorJUnitTest.java | 2 --
.../cache/xmlcache/AbstractXmlParserJUnitTest.java | 2 --
.../cache/xmlcache/CacheCreationJUnitTest.java | 2 --
.../CacheTransactionManagerCreationTest.java | 2 --
.../cache/xmlcache/CacheXmlVersionJUnitTest.java | 2 --
.../cache/xmlcache/DefaultEntityResolver2Test.java | 2 --
.../xmlcache/GeodeEntityResolverJUnitTest.java | 2 --
.../xmlcache/PivotalEntityResolverJUnitTest.java | 2 --
.../cache/xmlcache/RegionCreationJUnitTest.java | 2 --
.../cache/xmlcache/XmlGeneratorUtilsJUnitTest.java | 2 --
.../geode/internal/config/JAXBServiceTest.java | 2 --
.../io/CompositeOutputStreamJUnitTest.java | 2 --
.../geode/internal/jndi/ContextJUnitTest.java | 2 --
.../geode/internal/lang/ClassUtilsJUnitTest.java | 2 --
.../internal/lang/InOutParameterJUnitTest.java | 2 --
.../geode/internal/lang/ObjectUtilsJUnitTest.java | 2 --
.../geode/internal/lang/StringUtilsJUnitTest.java | 2 --
.../internal/lang/SystemPropertyHelperTest.java | 2 --
.../geode/internal/lang/SystemUtilsJUnitTest.java | 2 --
.../geode/internal/lang/ThrowableUtilsTest.java | 2 --
.../internal/logging/LogServiceJUnitTest.java | 2 --
.../internal/logging/LogWriterImplJUnitTest.java | 2 --
.../internal/logging/SortLogFileJUnitTest.java | 2 --
.../logging/log4j/AlertAppenderJUnitTest.java | 2 --
.../logging/log4j/FastLoggerJUnitTest.java | 2 --
.../logging/log4j/LocalizedMessageJUnitTest.java | 2 --
.../geode/internal/logging/log4j/LogLevelTest.java | 2 --
.../logging/log4j/LogWriterAppenderJUnitTest.java | 2 --
.../net/SSLConfigurationFactoryJUnitTest.java | 1 -
.../geode/internal/net/SocketCloserJUnitTest.java | 1 -
.../net/SocketCloserWithWaitJUnitTest.java | 1 -
.../net/SocketCreatorFactoryJUnitTest.java | 1 -
.../geode/internal/net/SocketCreatorJUnitTest.java | 1 -
.../geode/internal/net/SocketUtilsJUnitTest.java | 1 -
.../geode/internal/offheap/DataTypeJUnitTest.java | 2 --
...nectingOutOfOffHeapMemoryListenerJUnitTest.java | 2 --
.../geode/internal/offheap/FragmentJUnitTest.java | 2 --
.../internal/offheap/FreeListManagerTest.java | 2 --
.../offheap/LifecycleListenerJUnitTest.java | 2 --
.../MemoryAllocatorFillPatternJUnitTest.java | 2 --
.../internal/offheap/MemoryAllocatorJUnitTest.java | 2 --
.../internal/offheap/MemoryBlockNodeJUnitTest.java | 2 --
.../offheap/MemoryInspectorImplJUnitTest.java | 2 --
.../internal/offheap/OffHeapHelperJUnitTest.java | 2 --
.../offheap/OffHeapRegionEntryHelperJUnitTest.java | 2 --
.../internal/offheap/OffHeapStorageJUnitTest.java | 2 --
.../OffHeapStoredObjectAddressStackJUnitTest.java | 2 --
.../offheap/OffHeapStoredObjectJUnitTest.java | 2 --
.../offheap/OffHeapStoredObjectSliceJUnitTest.java | 2 --
.../OffHeapStoredObjectWithHeapFormJUnitTest.java | 2 --
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 2 --
.../offheap/RefCountChangeInfoJUnitTest.java | 2 --
.../offheap/ReferenceCountHelperImplTest.java | 2 --
.../offheap/ReferenceCountHelperJUnitTest.java | 2 --
.../internal/offheap/TinyMemoryBlockJUnitTest.java | 2 --
.../offheap/TinyStoredObjectJUnitTest.java | 2 --
.../internal/process/AttachProcessUtilsTest.java | 2 --
.../process/FileProcessControllerTest.java | 2 --
.../internal/process/NativeProcessUtilsTest.java | 2 --
.../process/ProcessControllerFactoryTest.java | 2 --
.../process/ProcessLauncherContextTest.java | 2 --
.../geode/internal/process/StartupStatusTest.java | 2 --
.../internal/process/lang/AvailablePidTest.java | 2 --
.../AbstractSignalNotificationHandlerTest.java | 2 --
.../security/CallbackInstantiatorTest.java | 1 -
.../IntegratedSecurityServiceConstructorTest.java | 2 --
.../security/IntegratedSecurityServiceTest.java | 2 --
.../security/LegacySecurityServiceTest.java | 2 --
.../security/SecurityServiceFactoryTest.java | 1 -
.../internal/security/SecurityServiceTest.java | 1 -
.../geode/internal/size/ObjectSizerJUnitTest.java | 2 --
.../internal/size/ObjectTraverserJUnitTest.java | 2 --
.../size/ReflectionObjectSizerJUnitTest.java | 2 --
.../size/SizeClassOnceObjectSizerJUnitTest.java | 2 --
.../size/WellKnownClassSizerJUnitTest.java | 2 --
.../internal/statistics/CallbackSamplerTest.java | 2 --
.../internal/statistics/ResourceInstTest.java | 2 --
.../internal/statistics/SampleCollectorTest.java | 2 --
.../internal/statistics/StatArchiveWriterTest.java | 2 --
.../statistics/StatMonitorHandlerTest.java | 2 --
...MonitorHandlerWithEnabledMonitorThreadTest.java | 2 --
.../internal/statistics/StatisticsImplTest.java | 2 --
.../internal/statistics/StatisticsMonitorTest.java | 2 --
.../geode/internal/tcp/ConnectionJUnitTest.java | 1 -
.../geode/internal/tcp/ConnectionTableTest.java | 1 -
.../apache/geode/internal/tcp/ConnectionTest.java | 1 -
.../util/AbortableTaskServiceJUnitTest.java | 2 --
.../internal/util/ArgumentRedactorJUnitTest.java | 2 --
.../apache/geode/internal/util/ArrayUtilsTest.java | 2 --
.../apache/geode/internal/util/BlobHelperTest.java | 2 --
...BlobHelperWithThreadContextClassLoaderTest.java | 2 --
.../internal/util/CollectionUtilsJUnitTest.java | 2 --
.../internal/util/DelayedActionJUnitTest.java | 2 --
.../apache/geode/internal/util/HostNameTest.java | 2 --
.../geode/internal/util/IOUtilsJUnitTest.java | 2 --
.../geode/internal/util/PasswordUtilJUnitTest.java | 1 -
.../geode/internal/util/PluckStacksUnitTest.java | 2 --
.../CompactConcurrentHashSetJUnitTest.java | 2 --
.../util/concurrent/FutureResultJUnitTest.java | 2 --
.../concurrent/ReentrantSemaphoreJUnitTest.java | 2 --
.../SemaphoreReadWriteLockJUnitTest.java | 2 --
.../geode/management/DiskBackupStatusTest.java | 2 --
.../management/bean/stats/StatsRateJUnitTest.java | 2 --
.../internal/CompositeBuilderViaFromTest.java | 2 --
.../internal/CompositeBuilderViaProxyTest.java | 2 --
.../management/internal/IdentityConverterTest.java | 2 --
.../management/internal/JettyHelperJUnitTest.java | 2 --
...ServerBridgeClientMembershipRegressionTest.java | 2 --
.../beans/DistributedSystemBridgeJUnitTest.java | 2 --
.../internal/beans/FileUploaderTest.java | 2 --
.../QueryDataFunctionApplyLimitClauseTest.java | 2 --
.../beans/stats/MBeanStatsMonitorTest.java | 2 --
.../cli/ClasspathScanLoadHelperJUnitTest.java | 2 --
.../geode/management/internal/cli/CliUtilTest.java | 2 --
.../internal/cli/CommandManagerJUnitTest.java | 2 --
.../cli/CommandSeparatorEscapeJUnitTest.java | 2 --
.../internal/cli/DataCommandJsonJUnitTest.java | 2 --
.../internal/cli/GfshParserJUnitTest.java | 2 --
.../commands/AlterAsyncEventQueueCommandTest.java | 2 --
.../cli/commands/AlterDiskStoreJUnitTest.java | 2 --
.../cli/commands/AlterRegionCommandTest.java | 2 --
.../commands/CommandAvailabilityIndicatorTest.java | 2 --
.../cli/commands/ConfigurePDXCommandTest.java | 2 --
.../internal/cli/commands/ConnectCommandTest.java | 2 --
.../commands/CreateAsyncEventQueueCommandTest.java | 2 --
.../commands/CreateDefinedIndexesCommandTest.java | 2 --
.../commands/CreateGatewayReceiverCommandTest.java | 2 --
.../commands/CreateGatewaySenderCommandTest.java | 2 --
.../cli/commands/CreateIndexCommandTest.java | 2 --
.../cli/commands/CreateJndiBindingCommandTest.java | 2 --
.../cli/commands/CreateRegionCommandTest.java | 2 --
.../internal/cli/commands/DeployCommandTest.java | 2 --
.../cli/commands/DescribeConfigCommandTest.java | 2 --
.../cli/commands/DescribeRegionJUnitTest.java | 2 --
.../DestroyAsyncEventQueueCommandTest.java | 2 --
.../DestroyGatewayReceiverCommandTest.java | 2 --
.../commands/DestroyGatewaySenderCommandTest.java | 2 --
.../commands/DestroyJndiBindingCommandTest.java | 2 --
.../cli/commands/DestroyRegionCommandTest.java | 2 --
.../cli/commands/DiskStoreCommandsJUnitTest.java | 2 --
.../cli/commands/ExecuteFunctionCommandTest.java | 2 --
.../cli/commands/ExportConfigCommandTest.java | 2 --
.../cli/commands/ExportDataCommandTest.java | 2 --
.../cli/commands/ExportLogsCommandTest.java | 2 --
.../commands/ExportLogsInterceptorJUnitTest.java | 2 --
.../cli/commands/ExportStackTraceCommandTest.java | 2 --
.../cli/commands/GfshCommandJUnitTest.java | 2 --
.../cli/commands/ImportDataCommandTest.java | 2 --
.../cli/commands/ListAsyncEventQueuesTest.java | 1 -
.../cli/commands/ListGatewayCommandTest.java | 2 --
.../cli/commands/ListIndexCommandJUnitTest.java | 2 --
.../cli/commands/ListJndiBindingCommandTest.java | 2 --
.../cli/commands/ListMembersCommandTest.java | 2 --
.../cli/commands/LogLevelInterceptorTest.java | 2 --
.../cli/commands/ShowMetricsJUnitTest.java | 2 --
.../cli/commands/UserInputPropertyTest.java | 2 --
.../lifecycle/StartJConsoleCommandTest.java | 2 --
.../converters/BaseStringConverterJUnitTest.java | 2 --
.../cli/converters/ClassNameConverterTest.java | 2 --
.../converters/ConfigPropertyConverterTest.java | 2 --
.../cli/converters/IndexTypeConverterTest.java | 2 --
.../cli/converters/LogLevelConverterTest.java | 2 --
.../converters/RegionPathConverterJUnitTest.java | 2 --
.../internal/cli/domain/ClassNameTest.java | 2 --
.../cli/domain/RegionDescriptionJUnitTest.java | 2 --
.../cli/functions/CliFunctionResultTest.java | 2 --
.../CreateDefinedIndexesFunctionTest.java | 2 --
.../DescribeDiskStoreFunctionJUnitTest.java | 2 --
.../DestroyAsyncEventQueueFunctionTest.java | 2 --
.../DestroyGatewayReceiverFunctionTest.java | 2 --
.../cli/functions/ExpirationAttrsTest.java | 2 --
.../cli/functions/ExportLogsFunctionTest.java | 2 --
.../GatewayReceiverCreateFunctionTest.java | 2 --
.../GatewaySenderDestroyFunctionTest.java | 2 --
.../cli/functions/GetRegionsFunctionJUnitTest.java | 2 --
.../cli/functions/GetRegionsFunctionTest.java | 2 --
.../functions/ListDiskStoresFunctionJUnitTest.java | 2 --
.../cli/functions/ListIndexFunctionJUnitTest.java | 2 --
.../cli/functions/RegionDestroyFunctionTest.java | 2 --
.../cli/functions/RegionFunctionArgsTest.java | 2 --
.../ShowMissingDiskStoresFunctionJUnitTest.java | 2 --
.../internal/cli/help/HelpBlockUnitTest.java | 2 --
.../internal/cli/help/HelperUnitTest.java | 2 --
.../internal/cli/json/GfJsonArrayTest.java | 2 --
.../internal/cli/json/GfJsonObjectTest.java | 2 --
.../internal/cli/json/TypedJsonTest.java | 2 --
.../internal/cli/remote/CommandExecutorTest.java | 2 --
.../cli/remote/OnlineCommandProcessorTest.java | 2 --
.../internal/cli/result/CommandResultTest.java | 2 --
.../cli/result/CompositeResultDataTest.java | 2 --
.../cli/result/DownloadFileResultTest.java | 2 --
.../internal/cli/result/ErrorResultDataTest.java | 2 --
.../internal/cli/result/FileResultTest.java | 2 --
.../internal/cli/result/InfoResultDataTest.java | 2 --
.../internal/cli/result/ResultBuilderTest.java | 2 --
.../internal/cli/result/TabularResultDataTest.java | 2 --
.../model/LegacyVsResultModelComparisonTest.java | 2 --
.../internal/cli/result/model/ResultModelTest.java | 2 --
.../cli/result/model/TabularResultModelTest.java | 2 --
.../cli/shell/GfshExecutionStrategyTest.java | 2 --
.../internal/cli/shell/GfshInitFileJUnitTest.java | 2 --
.../internal/cli/shell/GfshJunitTest.java | 2 --
.../internal/cli/util/BytesToStringTest.java | 2 --
.../internal/cli/util/CommentSkipHelperTest.java | 2 --
.../cli/util/ExportLogsCacheWriterUnitTest.java | 2 --
.../internal/cli/util/HostUtilsTest.java | 2 --
.../internal/cli/util/HyphenFormatterTest.java | 2 --
.../management/internal/cli/util/JdkToolTest.java | 2 --
.../internal/cli/util/LogFilterTest.java | 2 --
.../internal/cli/util/LogLevelExtractorTest.java | 2 --
.../management/internal/cli/util/LogSizerTest.java | 2 --
.../cli/util/ThreePhraseGeneratorTest.java | 2 --
.../domain/CacheElementJUnitTest.java | 2 --
.../GetClusterConfigurationFunctionTest.java | 2 --
.../configuration/utils/XmlUtilsJUnitTest.java | 2 --
.../internal/security/ResourcePermissionTest.java | 1 -
.../geode/pdx/internal/PdxInstanceImplTest.java | 1 -
.../executor/AbstractScanExecutorTest.java | 1 -
.../security/GemFireSecurityExceptionTest.java | 1 -
.../geode/security/NotAuthorizedExceptionTest.java | 1 -
.../geode/security/SimpleSecurityManagerTest.java | 1 -
.../security/templates/PKCSPrincipalTest.java | 1 -
.../security/templates/UsernamePrincipalTest.java | 1 -
.../geode/test/process/MainLauncherJUnitTest.java | 2 --
.../query/internal/cq/CqServiceImplJUnitTest.java | 2 --
.../cache/query/internal/cq/CqServiceUnitTest.java | 2 --
.../cache/tier/sockets/command/CloseCQTest.java | 2 --
.../tier/sockets/command/ExecuteCQ61Test.java | 2 --
.../cache/tier/sockets/command/StopCQTest.java | 2 --
.../experimental/driver/ValueEncoderTest.java | 1 -
.../test/compiler/ClassNameExtractorTest.java | 2 --
.../test/compiler/UncompiledSourceCodeTest.java | 2 --
.../dunit/standalone/VersionManagerJUnitTest.java | 1 -
.../test/junit/rules/ExecutorServiceRuleTest.java | 2 --
.../test/junit/rules/ExpectedTimeoutRuleTest.java | 2 --
.../test/junit/rules/IgnoreUntilRuleTest.java | 2 --
.../geode/test/junit/rules/RepeatRuleTest.java | 2 --
.../test/junit/rules/RestoreLocaleRuleTest.java | 2 --
.../junit/rules/RetryRuleGlobalWithErrorTest.java | 2 --
.../rules/RetryRuleGlobalWithExceptionTest.java | 2 --
.../junit/rules/RetryRuleLocalWithErrorTest.java | 2 --
.../rules/RetryRuleLocalWithExceptionTest.java | 2 --
.../geode/test/junit/rules/RuleListTest.java | 2 --
.../examples/RepeatingTestCasesExampleTest.java | 2 --
.../junit/rules/examples/RetryRuleExampleTest.java | 2 --
.../junit/rules/examples/RuleAndClassRuleTest.java | 2 --
.../SerializableExternalResourceTest.java | 2 --
.../serializable/SerializableRuleListTest.java | 2 --
.../SerializableTemporaryFolderTest.java | 2 --
.../serializable/SerializableTestNameTest.java | 2 --
.../serializable/SerializableTestWatcherTest.java | 2 --
.../serializable/SerializableTimeoutTest.java | 2 --
...CategoryWithParameterizedRunnerFactoryTest.java | 6 ++---
.../lucene/FlatFormatPdxSerializerJunitTest.java | 1 -
.../lucene/FlatFormatSerializerJUnitTest.java | 1 -
.../internal/LuceneEventListenerJUnitTest.java | 1 -
.../LuceneIndexCreationProfileJUnitTest.java | 1 -
.../internal/LuceneIndexFactoryImplJUnitTest.java | 1 -
.../LuceneIndexForPartitionedRegionTest.java | 1 -
.../lucene/internal/LuceneIndexImplJUnitTest.java | 1 -
.../lucene/internal/LuceneIndexStatsJUnitTest.java | 1 -
.../internal/LuceneQueryFactoryImplJUnitTest.java | 1 -
.../lucene/internal/LuceneQueryImplJUnitTest.java | 1 -
.../internal/LuceneRegionListenerJUnitTest.java | 1 -
.../internal/LuceneResultStructImpJUnitTest.java | 1 -
.../internal/LuceneServiceImplJUnitTest.java | 1 -
.../PageableLuceneQueryResultsImplJUnitTest.java | 1 -
.../PartitionedRepositoryManagerJUnitTest.java | 1 -
.../internal/StringQueryProviderJUnitTest.java | 1 -
.../internal/ValidateCommandParametersTest.java | 1 -
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 1 -
.../LuceneCreateIndexFunctionJUnitTest.java | 1 -
.../LuceneDescribeIndexFunctionJUnitTest.java | 1 -
.../LuceneDestroyIndexFunctionJUnitTest.java | 1 -
.../LuceneListIndexFunctionJUnitTest.java | 1 -
.../LuceneSearchIndexFunctionJUnitTest.java | 1 -
.../directory/DumpDirectoryFilesJUnitTest.java | 1 -
.../directory/RegionDirectoryJUnitTest.java | 1 -
.../distributed/DistributedScoringJUnitTest.java | 1 -
.../internal/distributed/EntryScoreJUnitTest.java | 1 -
.../LuceneQueryFunctionContextJUnitTest.java | 1 -
.../distributed/LuceneQueryFunctionJUnitTest.java | 1 -
.../distributed/TopEntriesCollectorJUnitTest.java | 1 -
.../TopEntriesFunctionCollectorJUnitTest.java | 1 -
.../internal/distributed/TopEntriesJUnitTest.java | 1 -
.../WaitUntilFlushedFunctionJUnitTest.java | 1 -
.../internal/filesystem/ChunkKeyJUnitTest.java | 1 -
.../lucene/internal/filesystem/FileJUnitTest.java | 1 -
.../internal/filesystem/FileSystemJUnitTest.java | 1 -
.../filesystem/FileSystemStatsJUnitTest.java | 1 -
.../BucketTargetingFixedResolverTest.java | 1 -
.../internal/partition/BucketTargetingMapTest.java | 1 -
.../HeterogeneousLuceneSerializerJUnitTest.java | 1 -
.../serializer/PdxFieldMapperJUnitTest.java | 1 -
.../serializer/ReflectionFieldMapperJUnitTest.java | 1 -
.../results/LuceneGetPageFunctionJUnitTest.java | 1 -
.../internal/results/PageEntryJUnitTest.java | 1 -
.../internal/results/PageResultsJUnitTest.java | 1 -
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 1 -
.../xml/LuceneIndexXmlParserJUnitTest.java | 1 -
.../OutputCapturingServerConnectionTest.java | 1 -
.../tier/sockets/ProtobufServerConnectionTest.java | 1 -
.../protobuf/ProtobufStreamProcessorTest.java | 1 -
.../protobuf/security/SecureCacheImplTest.java | 1 -
.../security/SecureFunctionServiceImplTest.java | 1 -
.../v1/ProtobufProtocolServiceJUnitTest.java | 1 -
.../ClearRequestOperationHandlerJUnitTest.java | 1 -
...ionOnGroupRequestOperationHandlerJUnitTest.java | 1 -
...onOnMemberRequestOperationHandlerJUnitTest.java | 1 -
...onOnRegionRequestOperationHandlerJUnitTest.java | 1 -
.../GetAllRequestOperationHandlerJUnitTest.java | 1 -
...egionNamesRequestOperationHandlerJUnitTest.java | 1 -
.../GetRequestOperationHandlerJUnitTest.java | 1 -
.../GetServerOperationHandlerJUnitTest.java | 1 -
.../GetSizeRequestOperationHandlerJUnitTest.java | 1 -
.../KeySetOperationHandlerJUnitTest.java | 1 -
.../v1/operations/OperationHandlerJUnitTest.java | 1 -
...ueryRequestOperationHandlerIntegrationTest.java | 1 -
.../OqlQueryRequestOperationHandlerJUnitTest.java | 1 -
.../ProtocolVersionHandlerJUnitTest.java | 1 -
.../PutAllRequestOperationHandlerJUnitTest.java | 1 -
...utIfAbsentRequestOperationHandlerJUnitTest.java | 1 -
.../PutRequestOperationHandlerJUnitTest.java | 1 -
.../RemoveRequestOperationHandlerJUnitTest.java | 1 -
.../v1/operations/VersionValidatorJUnitTest.java | 1 -
.../codec/JsonPdxConverterJUnitTest.java | 1 -
.../ProtobufProtocolSerializerJUnitTest.java | 1 -
.../v1/utilities/ProtobufUtilitiesJUnitTest.java | 1 -
.../tools/pulse/internal/PulseAppListenerTest.java | 2 --
.../data/JMXDataUpdaterGetDoubleAttributeTest.java | 2 --
.../internal/security/LogoutHandlerUnitTest.java | 2 --
.../cache/wan/AckReaderThreadJUnitTest.java | 2 --
.../wan/GatewayReceiverFactoryImplJUnitTest.java | 2 --
.../cache/wan/GatewayReceiverImplJUnitTest.java | 2 --
...atewaySenderEventRemoteDispatcherJUnitTest.java | 2 --
.../AbstractBaseControllerJUnitTest.java | 1 -
.../web/controllers/support/RegionDataTest.java | 1 -
.../support/LoginHandlerInterceptorJUnitTest.java | 2 --
...inHandlerInterceptorRequestHeaderJUnitTest.java | 2 --
.../web/domain/QueryParameterSourceJUnitTest.java | 2 --
...lizableObjectHttpMessageConverterJUnitTest.java | 2 --
gradle/test.gradle | 30 ++--------------------
693 files changed, 18 insertions(+), 1241 deletions(-)
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
index 99d369a..60900e6 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/util/ClassLoaderObjectInputStreamTest.java
@@ -35,10 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
@SuppressWarnings("unused")
public class ClassLoaderObjectInputStreamTest {
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
index acb0965..e520374 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandTest.java
@@ -36,13 +36,11 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.lang.SystemUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartLocatorCommandTest {
private StartLocatorCommand locatorCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
index 2d26916..30ffb7a 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandTest.java
@@ -35,13 +35,11 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.ServerLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.PdxSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartServerCommandTest {
private StartServerCommand serverCommands;
diff --git a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
index 9d02a5b..6f28cae 100644
--- a/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/test/junit/rules/GfshRuleTest.java
@@ -25,7 +25,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.GfshTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
@Category({GfshTest.class})
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
index 97f6eca..7e8ed6a 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
@@ -19,11 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.lang.reflect.AnnotatedElement;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.annotations.experimentalpackage.ClassInExperimentalPackage;
import org.apache.geode.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for the <tt>Experimental</tt> annotation. Verifies that the annotation can be applied
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
index fc80d53..69c17df 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
@@ -37,7 +36,6 @@ import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcAsyncWriterTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
index dd5ae27..e5cd35d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcConnectorExceptionTest.java
@@ -20,10 +20,8 @@ import java.sql.SQLException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorExceptionTest {
@Rule
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
index 71eada9..0a6e4f1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderTest.java
@@ -22,14 +22,12 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcLoaderTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
index 56275f3..5963015 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Operation;
@@ -37,7 +36,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcWriterTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
index 174d733..eb2ee54 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
@@ -24,12 +24,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractJdbcCallbackTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
index 82b9a31..d79720c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ColumnDataTest.java
@@ -20,9 +20,7 @@ import java.sql.JDBCType;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ColumnDataTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
index ab4c283..a470c90 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/DataSourceManagerUnitTest.java
@@ -23,10 +23,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataSourceManagerUnitTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
index da5a38c..1913930 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
@@ -21,12 +21,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorServiceTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index a98458e..9416c51 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
@@ -33,7 +32,6 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMappingTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index f936f3e..f27fa32 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -39,7 +39,6 @@ import junitparams.JUnitParamsRunner;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
@@ -51,7 +50,6 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxType;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class SqlHandlerTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
index ec8d1fd..e4ccc4b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlStatementFactoryTest.java
@@ -21,9 +21,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SqlStatementFactoryTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
index 3d11dc1..693d257 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
@@ -38,7 +38,6 @@ import junitparams.Parameters;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
@@ -51,7 +50,6 @@ import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class SqlToPdxInstanceCreatorTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
index f7be757..9390263 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
@@ -33,10 +33,8 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TableMetaDataManagerTest {
private static final String TABLE_NAME = "testTable";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
index f173d9c..2c25ab6 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterConnectionCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
index c003c14..cb30d07 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.Map;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -43,7 +42,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AlterConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
index 0a7be6d..a0eba4a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterMappingCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index ce1a92c..d515985 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.List;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -44,7 +43,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AlterMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
index d1bf869..eabaf36 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index b90e3c4..335d3f4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -41,7 +40,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
index 55c7c82..03e3b20 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DescribeConnectionCommandTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
index 0c6878c..baf003e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DescribeConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index d8a1bb4..3e859fb 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index 08afb85..2a0c546 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DescribeMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
index dbdd1c8..19397da 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
index 84d2c19..c0b8c42 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMappingCommandFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
index 717e8b7..3ef5081 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
@@ -29,7 +28,6 @@ import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FunctionContextArgumentProviderTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
index fc56be6..f572248 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCCommandsAvailabilityTest.java
@@ -23,12 +23,10 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.apache.geode.management.internal.cli.CommandManager;
import org.apache.geode.management.internal.cli.commands.CommandAvailabilityIndicatorTest;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JDBCCommandsAvailabilityTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
index 0779389..2bf865f 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
index c49b595..8a467b4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ListConnectionFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
index 02efbc4..b050ffa 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
@@ -28,7 +28,6 @@ import java.util.stream.Stream;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.execute.ResultCollector;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
index d924e61..4814592 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ListMappingFunctionTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
index b4c66d6..1d83270 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
@@ -24,12 +24,10 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.config.JAXBService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectorServiceTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index d875932..0a5c175 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -38,7 +38,6 @@ import java.util.Stack;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.apache.geode.cache.Cache;
@@ -47,7 +46,6 @@ import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ElementTypeTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
index 26bbfd3..4f8beb2 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
@@ -25,13 +25,11 @@ import java.util.Stack;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcConnectorServiceXmlParserTest {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
index a64a5d0..3a3cf38 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
@@ -22,12 +22,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcServiceConfigurationTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
index e32b0da..d7ba3c5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
index fa394e3..4fe5cbb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
@@ -27,9 +27,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeadlockDetectorTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
index aef5677..d43fba7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
@@ -21,9 +21,7 @@ import java.lang.reflect.Method;
import java.util.Date;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* FixedPartitioningTestBase Tester.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
index d9e2cb3..018c5e4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
public class MemberStarterRuleTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
index 3bb600f..b08d6d9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class}) // Fails on Windows -- see GEODE-373
public class ProductUseLogJUnitTest {
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 78ab8e8..bab9d10 100644
--- a/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/DataSerializerTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class DataSerializerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
index 3779567..072dc82 100644
--- a/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/InstantiatorTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InstantiatorTest {
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 9f87dec..be35819 100644
--- a/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/SystemFailureJUnitTest.java
@@ -26,7 +26,6 @@ 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({MembershipTest.class})
public class SystemFailureJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
index b4b7aed..0d5e0b0 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/AlertLevelJUnitTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertFalse;
import java.lang.reflect.Constructor;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* AlertLevel Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
index 3894899..75ed6b9 100644
--- a/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
+++ b/geode-core/src/test/java/org/apache/geode/admin/RegionSubRegionSnapshotTest.java
@@ -23,9 +23,7 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionSubRegionSnapshotTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
index 2d6198a..a1d39e1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/AttributesFactoryJUnitTest.java
@@ -25,12 +25,10 @@ import java.io.File;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link AttributesFactory} class.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
index 3ed9358..1baac6b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/DiskAccessExceptionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskAccessExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
index 872f6f0..e00c757 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ExpirationAttributesTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.cache;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpirationAttributesTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
index 8c475d1..1315a85 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/FinalStaticArrayShouldNotCauseSegFaultRegressionTest.java
@@ -21,9 +21,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Asserts fixes for bug JDK-8076152 in JDK 1.8.0u20 to 1.8.0.u45.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
index 87ba4b1..ef80e5a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableRegressionTest.java
@@ -25,7 +25,6 @@ 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 MembershipAttributes and SubscriptionAttributes to make sure they are Serializable
diff --git a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
index 7d9cafa..9272ac7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/OperationJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OperationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
index 573a86b..64c1076 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionNameValidationJUnitTest.java
@@ -20,11 +20,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionNameValidationJUnitTest {
private static final Pattern NAME_PATTERN = Pattern.compile("[aA-zZ0-9-_.]+");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
index e8f16ad..233800b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionShortcutTest.java
@@ -20,9 +20,7 @@ package org.apache.geode.cache;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionShortcutTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
index 7ca30ab..4179d9e 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RoleExceptionJUnitTest.java
@@ -27,10 +27,8 @@ import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalRole;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the subclasses of RoleException to make sure they are Serializable
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 08744b6..5327a21 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
@@ -25,7 +25,6 @@ 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({ClientServerTest.class})
public class AbstractOpTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
index 50d5d8d..bc21ad5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionConnectorTest.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.PoolCancelledException;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionConnectorTest {
private CancelCriterion cancelCriterion;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
index 1022417..40857ea 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionFactoryJUnitTest.java
@@ -25,14 +25,12 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.distributed.PoolCancelledException;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 7a2bbbc..4cdd354 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class OpExecutorImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
index 6bb7332..b72663b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueConnectionImplJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class QueueConnectionImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index b982c8f..1386e05 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.client.internal.ServerBlackList.FailureTracker;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ServerBlackListJUnitTest {
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 11109be..617ff61 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
@@ -23,7 +23,6 @@ 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
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
index 288a5df..92c89d3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/TXFailoverOpTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.CancelCriterion;
@@ -30,7 +29,6 @@ import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.internal.pooling.ConnectionManager;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXFailoverOpTest {
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 67b03e0..3ae374e 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
@@ -29,7 +29,6 @@ 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;
/**
* The LocatorStatusResponseJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
index b578ed2..056e544 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
@@ -22,10 +22,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.config.JAXBService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
index ded2ba2..42c3608 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
@@ -20,9 +20,7 @@ package org.apache.geode.cache.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeclarableTypeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
index d7e1092..aa6e2bc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionAdapterJUnitTest.java
@@ -24,12 +24,10 @@ import java.io.FileInputStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
public class FunctionAdapterJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
index b30a9bb..87206f6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/execute/FunctionExceptionTest.java
@@ -25,9 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FunctionExceptionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
index 6a1ef74..c695331 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/IndexTypeTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({OQLIndexTest.class})
public class IndexTypeTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
index 8a83e0e..2484bbf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/JavaSerializationJUnitTest.java
@@ -20,14 +20,12 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JavaSerializationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
index 9012987..1b337bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledAggregateFunctionJUnitTest.java
@@ -26,7 +26,6 @@ import org.jmock.lib.concurrent.Synchroniser;
import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Aggregator;
import org.apache.geode.cache.query.internal.aggregate.Avg;
@@ -45,7 +44,6 @@ import org.apache.geode.cache.query.internal.aggregate.SumDistinct;
import org.apache.geode.cache.query.internal.aggregate.SumDistinctPRQueryNode;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledAggregateFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
index b1dfcf2..9003730 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledInJUnitTest.java
@@ -28,13 +28,11 @@ import java.util.Collection;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledInJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
index 467fe35..3336df3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledIteratorDefJUnitTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.query.internal.types.TypeUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompiledIteratorDefJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
index ef26d66..dff18f7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/NWayMergeResultsJUnitTest.java
@@ -31,13 +31,11 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NWayMergeResultsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
index ae0eceb..d1e15de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryExecutionContextJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class QueryExecutionContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
index d22716a..024411d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryObjectSerializationJUnitTest.java
@@ -29,13 +29,11 @@ import java.util.Collection;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.CachePerfStats;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the Serialization of the Query related class.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
index fda8a2f..7370e0d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/RestrictedMethodInvocationAuthorizerTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class RestrictedMethodInvocationAuthorizerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
index a5ea788..c1c92be 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagJUnitTest.java
@@ -24,14 +24,12 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test ResultsBag, including null elements
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
index c38ed73..77f1ed2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsBagLimitBehaviourJUnitTest.java
@@ -30,13 +30,11 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test ResultsBag Limit behaviour
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index afdb2f5..802b70e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
@@ -29,10 +29,8 @@ import java.util.Set;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultsCollectionWrapperLimitJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
index cac20c0..11f087d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/SelectResultsComparatorJUnitTest.java
@@ -26,11 +26,9 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SelectResultsComparatorJUnitTest implements OQLLexerTokenTypes {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index fa6e9c6..94b5f25 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
@@ -21,14 +21,12 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test StructBag Limit behaviour
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
index 68142da..ef489cd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructSetJUnitTest.java
@@ -25,14 +25,12 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StructSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
index 56a39a8..66526ab 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/aggregate/AggregatorJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AggregatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
index 3b58864..00838d0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/cq/CqAttributesImplJUnitTest.java
@@ -19,10 +19,8 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CqListener;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CqAttributesImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
index 6bc255a..1d97d5d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/HashIndexSetJUnitTest.java
@@ -32,13 +32,11 @@ import java.util.Set;
import java.util.stream.IntStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HashIndexSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
index cc58bdc..0b7b0ac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexElemArrayJUnitTest.java
@@ -30,10 +30,8 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.MultithreadedTester;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IndexElemArrayJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
index 3f69b4f..0706877 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreJUnitTest.java
@@ -28,7 +28,6 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.QueryService;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.query.internal.index.AbstractIndex.InternalIndexSt
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryIndexStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
index c7f8881..bf55dd2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MemoryIndexStoreWithInplaceModificationJUnitTest.java
@@ -18,12 +18,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.After;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryIndexStoreWithInplaceModificationJUnitTest extends MemoryIndexStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
index 4582c19..ff83c8a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/parse/OQLParserTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* TODO: class created to fix GEODE-3938. Add more tests for other queries, parameters, etc.
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
index a32ed70..2553370 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/types/TypeUtilsJUnitTest.java
@@ -56,7 +56,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -75,7 +74,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.pdx.internal.PdxInstanceEnum;
import org.apache.geode.pdx.internal.PdxString;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
index 3b6f024..f4013bf 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/ConnectionCountProbeJUnitTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.cache.server.internal;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConnectionCountProbeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
index 14c7ea2..6d4cff2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/server/internal/LoadMonitorTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LoadMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
index 1b3f754..62b1f11 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/util/StringPrefixPartitionResolverJUnitTest.java
@@ -18,11 +18,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.internal.cache.EntryOperationImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StringPrefixPartitionResolverJUnitTest {
static final String DELIMITER = StringPrefixPartitionResolver.DEFAULT_DELIMITER;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
index 1db8fe7..f2f328e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
@@ -26,14 +26,12 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessUtils;
import org.apache.geode.management.internal.cli.json.GfJsonArray;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractLauncher.ServiceState}. Tests marshalling of ServiceState to and
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
index 45989c6..c7b9c2c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
@@ -32,9 +32,7 @@ import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
index cb79b4a..2da8834 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
@@ -22,7 +22,6 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for DistributedSystem class.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
index cb3f0b7..363edda 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
@@ -27,12 +27,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.Builder}. Extracted from {@link LocatorLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
index 933219f..e9709ee 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
@@ -25,14 +25,12 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.AbstractLauncher.ServiceState;
import org.apache.geode.distributed.AbstractLauncher.Status;
import org.apache.geode.distributed.LocatorLauncher.LocatorState;
import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link LocatorLauncher.LocatorState}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
index 009c0e6..df4493c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
@@ -26,13 +26,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ServerLauncher.Builder}. Extracted from {@link ServerLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
index 5cb9453..879096f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
@@ -29,14 +29,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.CacheConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ServerLauncher}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
similarity index 97%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
index 4606ccb..a8c9eca 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
@@ -25,10 +25,8 @@ import edu.umd.cs.mtc.MultithreadedTestCase;
import edu.umd.cs.mtc.TestFramework;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Multithreaded unit tests for {@link ServerLauncher}. Extracted from {@link ServerLauncherTest}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
similarity index 92%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
index b70eb32..5a21f79 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.distributed.internal;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AtomicLongWithTerminalStateJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
similarity index 94%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
index 8808ba0..1cf3ad5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
@@ -23,10 +23,8 @@ import static org.mockito.Mockito.when;
import java.util.concurrent.Executor;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClusterDistributionManagerTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
similarity index 92%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
index 486ca02..e92459c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributionAdvisorTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
index 312b65e..e0c45e6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.ConfigSource;
import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class DistributionConfigJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
index 0488c8c..91027e1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
@@ -22,7 +22,6 @@ 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({MembershipTest.class})
public class DistributionMessageTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
index 21b1dc1..e658fc9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.configuration.CacheConfig;
@@ -42,7 +41,6 @@ import org.apache.geode.internal.config.JAXBServiceTest.ElementOne;
import org.apache.geode.internal.config.JAXBServiceTest.ElementTwo;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InternalConfigurationPersistenceServiceTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
index 41b5ccc..5a38b28 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
@@ -31,7 +31,6 @@ 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
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
index b41b76c..093034e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
@@ -22,7 +22,6 @@ 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({MembershipTest.class})
public class ReplyProcessor21Test {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
similarity index 97%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
index 2091900..124ddb7 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ServerLocatorJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
index 0f88dfb..63e4248 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.ByteArrayData;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests {@link StartupMessageData}.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
index b123621..957623d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DependencyGraphJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
similarity index 95%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
index 312a3e5..5738b92 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
@@ -21,9 +21,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class UnsafeThreadLocalJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
similarity index 96%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
index a578b02..9eb763e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
@@ -20,7 +20,6 @@ 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.
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
index 7a65700..d026977 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class NetViewJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index 14bca45..3f903f3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class GMSMemberJUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
index 3a63b34..bacf349 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
index 4629edf..5c72ac3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
similarity index 99%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index 0abf401..c7eebc0 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMes
import org.apache.geode.distributed.internal.membership.gms.messenger.StatRecorder;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
index f111d2d..9ad7403 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AbstractConfigTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
index a3ba920..2e4aa97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/AssertJUnitTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.internal;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AssertJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
index 17978f0..90303db 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassPathLoaderTest.java
@@ -38,11 +38,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ClassPathLoader}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
index c14c910..dd4193a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ConfigSourceJUnitTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConfigSourceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
index 372d315..f7fa32b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/CopyOnWriteHashSetJUnitTest.java
@@ -28,9 +28,7 @@ import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CopyOnWriteHashSetJUnitTest {
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 72035d8..7bc7684 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
@@ -23,7 +23,6 @@ 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({SerializationTest.class})
public class DSCODETest {
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 0df01f2..b73b0f7 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
@@ -71,7 +71,6 @@ 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;
/**
* Tests the functionality of the {@link DataSerializable} class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
index 448d629..eb089d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializerHolderJUnitTest.java
@@ -26,10 +26,8 @@ import java.util.stream.Collectors;
import junit.framework.TestCase;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataSerializerHolderJUnitTest extends TestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
index 22ba473..b684c82 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/GemFireVersionJUnitTest.java
@@ -21,10 +21,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This test prints out the version information obtained from the {@link GemFireVersion} class. It
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 be91e8f..b2c327b 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
@@ -30,7 +30,6 @@ 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;
/**
* Test of methods on HeapDataOutputStream
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 77de04b..4638fa0 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
@@ -22,7 +22,6 @@ 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({SerializationTest.class})
public class HeapDataOutputStreamTest {
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 4c40ca0..6d0f1c9 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
@@ -30,7 +30,6 @@ 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.
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 c37fa15..ff74e61 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
@@ -30,7 +30,6 @@ 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;
/**
* Tests the serialization and deserialization of randomly generated Strings.
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 0a42787..6a601a4 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
@@ -21,7 +21,6 @@ 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;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
diff --git a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
index 05edced..937957d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/LineWrapUnitJUnitTest.java
@@ -20,9 +20,7 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LineWrapUnitJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
index 6a1b0b8..028e774 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/NanoTimerJUnitTest.java
@@ -19,10 +19,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer.TimeService;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for NanoTimer.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
index d43f990..9052fbf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdConcurrentMapTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.ObjIdConcurrentMap.Segment;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjIdConcurrentMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
index c46e515..78ffe93 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ObjIdMapJUnitTest.java
@@ -30,9 +30,7 @@ import java.util.List;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This class tests the functionality of the {@link ObjIdMap} class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
index 9071507..ac5e5fd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/OneTaskOnlyDecoratorJUnitTest.java
@@ -25,9 +25,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OneTaskOnlyDecoratorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
index c9d96be..bb1c79e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PutAllOperationContextJUnitTest.java
@@ -26,13 +26,11 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.operations.PutAllOperationContext;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
import org.apache.geode.internal.cache.Token;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PutAllOperationContextJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
index 8db169b..c844486 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/UniqueIdGeneratorJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests UniqueIdGenerator.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index b9802b9..a82c73a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -18,11 +18,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VersionJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
index 8f1012f..f0f9ec7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/DistributionLocatorIdJUnitTest.java
@@ -21,9 +21,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* DistributionLocatorId Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
index 64c1e56..242924a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgentTest.java
@@ -26,14 +26,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.internal.admin.GfManagerAgentConfig;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteGfManagerAgentTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
index 1dd9915..0a311cc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractDiskRegionTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
index 9c6cb9e..75743a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntryTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.AbstractOplogDiskRegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractOplogDiskRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
index edbdd87..41c79f0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionJUnitTest.java
@@ -18,12 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.spy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractRegion}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index 6d1bba7..5ac359f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -37,7 +37,6 @@ import java.util.List;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
@@ -59,7 +58,6 @@ import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
index ba4fd9d..3cd2de0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTxApplyDestroyTest.java
@@ -40,7 +40,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.Mock;
@@ -54,7 +53,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
-import org.apache.geode.test.junit.categories.UnitTest;
@SuppressWarnings("unchecked")
public class AbstractRegionMapTxApplyDestroyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
index c84b747..42b5b0b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
index c452aab..26a89b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketAdvisorTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.Bucket;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
index 3669cca..cb4232e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketPersistenceAdvisorTest.java
@@ -20,14 +20,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.internal.cache.PartitionedRegion.BucketLock;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberView;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketPersistenceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
index 41a067d..f6c2102 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRedundancyTrackerTest.java
@@ -23,9 +23,7 @@ import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
index 6e6d1c4..314378d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java
@@ -31,10 +31,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketRegionJUnitTest extends DistributedRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
index 3a885a0..7beced8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheOperationMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheOperationMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
index 3eb5dd0..9b7340a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheProfileTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheProfileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
index db40e76..e9aef8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CacheServerLauncherJUnitTest.java
@@ -18,9 +18,7 @@ import static org.apache.geode.internal.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* CacheServerLauncher Tester.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
index 8942795..5e5d522 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ColocationHelperTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.PartitionAttributes;
@@ -38,7 +37,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.i18n.StringId;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RestoreLocaleRule;
public class ColocationHelperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
index 1b73497..d967f18 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DestroyMessageTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DestroyOperation.DestroyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
index 3e3b42d..b8cca1f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskIdJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test verifies the setting and getting of disk id values are correctly
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
index 2368921..6c5bded 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskStoreMonitorTest.java
@@ -22,9 +22,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskStoreMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
index 0ae0b48..58eb7d2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskUsageTest.java
@@ -23,11 +23,9 @@ import static org.mockito.Mockito.when;
import java.io.File;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DiskStoreMonitor.DiskState;
import org.apache.geode.internal.cache.DiskStoreMonitor.DiskUsage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskUsageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
index 4e27716..b989bed 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskWriteAttributesJUnitTest.java
@@ -18,11 +18,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskWriteAttributes;
import org.apache.geode.cache.DiskWriteAttributesFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests if DiskWriteAttributeFactory returns the correct DWA object with the desired values
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
index a6f6a66..79250c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistPeerTXStateStubTest.java
@@ -21,10 +21,8 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistPeerTXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
index 2c0d063..a97fecc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheOperationTest.java
@@ -26,13 +26,11 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.DistributedCacheOperation.CacheOperationMessage;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedCacheOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
index d3689f7..a06920e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedPutAllOperationTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedPutAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
index 15bb817..a5752b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessageTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
index bbedb64..12f9dfe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.RegionAttributes;
@@ -39,7 +38,6 @@ import org.apache.geode.internal.cache.event.EventTracker;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionJUnitTest extends AbstractDistributedRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
index 624dabc..f260c3f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionSearchLoadJUnitTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationExcep
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
index d9864bc..731082b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
index 33cff8a..bd84116 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRemoveAllOperationTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedRemoveAllOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
index fdbad8f..fb02950 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventImplTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.SerializedCacheValue;
@@ -40,7 +39,6 @@ import org.apache.geode.internal.cache.EntryEventImpl.NewValueImporter;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EntryEventImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
index 95fabb1..0594394 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EntryEventSerializationTest.java
@@ -33,13 +33,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.Scope;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EntryEventSerializationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
index 2fdc0ac..edb6f72 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EnumListenerEventJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EnumListenerEventJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
index 555b384..9d68123 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesImplTest.java
@@ -18,10 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EvictionAttributesImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
index edf3ea3..0783139 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ExpiryTaskTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpiryTaskTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
index 47ce409..00d272d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FilterProfileNullCqBaseRegionJUnitTest.java
@@ -26,14 +26,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CqException;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.internal.CqStateImpl;
import org.apache.geode.cache.query.internal.cq.CqService;
import org.apache.geode.cache.query.internal.cq.ServerCQ;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FilterProfileNullCqBaseRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
index 0e117b0..ad81413 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FlusherThreadTest.java
@@ -26,10 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskAccessException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlusherThreadTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
index 731c78e..0d356be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GemFireCacheImplTest.java
@@ -34,7 +34,6 @@ import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SerializationException;
import org.apache.geode.cache.CacheClosedException;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.eviction.HeapEvictor;
import org.apache.geode.internal.cache.eviction.OffHeapEvictor;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GemFireCacheImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
index d07e361..5a5a255 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GridProfileTest.java
@@ -24,13 +24,11 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
import org.apache.geode.internal.cache.GridAdvisor.GridProfile;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GridProfileTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
index a597b39..840379a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InitialImageOperationTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InitialImageOperationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
index 0b8b531..888d4f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
@@ -27,12 +27,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InternalCacheForClientAccessTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
index 4f02bb2..25a1438 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaAfterCompletionMessageTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JtaAfterCompletionMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
index f46359e..8036d2d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessageTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JtaBeforeCompletionMessageTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
index a1ffa6a..572fd91 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LocalDataSetTest.java
@@ -25,10 +25,8 @@ import static org.mockito.Mockito.when;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LocalDataSetTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
index e2aff0e..a081046 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemberFunctionStreamingMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
index 267a174..53c2e49 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NonLocalRegionEntryTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NonLocalRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
index 5ceb472..7f28eb1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OffHeapValueWrapperJUnitTest.java
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.Flushable;
import org.apache.geode.internal.cache.entries.DiskEntry.Helper.OffHeapValueWrapper;
@@ -32,7 +31,6 @@ import org.apache.geode.internal.offheap.NullOffHeapMemoryStats;
import org.apache.geode.internal.offheap.NullOutOfOffHeapMemoryListener;
import org.apache.geode.internal.offheap.SlabImpl;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapValueWrapperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
index 6185db8..ba5474e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OldVLJUnitTest.java
@@ -25,10 +25,8 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OldVLJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
index 8407701..54361f8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdMapJUnitTest.java
@@ -18,10 +18,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.Oplog.OplogEntryIdMap;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdMap
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
index a521352..5b57803 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogEntryIdSetJUnitTest.java
@@ -18,10 +18,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests DiskStoreImpl.OplogEntryIdSet
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
index 75713e7..d33345d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogTest.java
@@ -27,9 +27,7 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OplogTest {
private final DiskStoreImpl.OplogCompactor compactor = mock(DiskStoreImpl.OplogCompactor.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
index 9312249..88cb947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OrderedTombstoneMapJUnitTest.java
@@ -17,11 +17,9 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OrderedTombstoneMapJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
index ec32d17..3810766 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionAttributesImplJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
@@ -40,7 +39,6 @@ import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.partition.PartitionListener;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test suite for PartitionAttributesImpl.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
index d462ed3..1925e67 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigJUnitTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionRegionConfigJUnitTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
index acacf1f..8a63784 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionRegionConfigTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.ExpirationAttributes;
@@ -31,7 +30,6 @@ import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionRegionConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
index 48ff5f1..5e0d480 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreTest.java
@@ -25,10 +25,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mock;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionDataStoreTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
index 0e251e1..1c08144 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHelperJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionHelperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
index 5f67276..f040b9f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorTest.java
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.query.QueryException;
@@ -50,7 +49,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionQueryEvaluatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
index e5623a4..3ee96dc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyTrackerTest.java
@@ -24,9 +24,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionRedundancyTrackerTest {
private static final int TARGET_COPIES = 2;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
index 01d5b00..1dfa2e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PlaceHolderDiskRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PlaceHolderDiskRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
index c1bb112..2c30f80 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ProxyBucketRegionTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ProxyBucketRegionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
index 2c2ed13..193faf2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionCommitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.TXCommitMessage.RegionCommit;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionCommitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
index 8c508ef..b86eb27 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestFilterInfoMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.InitialImageOperation.RequestFilterInfoMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestFilterInfoMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
index ff9d703..9c20331 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestImageMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestImageMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
index 0cf6cb8..d89fd8f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RequestRVVMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InitialImageOperation.RequestRVVMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RequestRVVMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
index 31edd50..a5a92bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
@@ -41,7 +40,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SearchLoadAndWriteProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
index e874ba6..0fe3bed 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/StateMarkerMessageTest.java
@@ -23,13 +23,11 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireIOException;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StateMarkerMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
index 3413d8d..6f92bd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXEventTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXEventTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index 97eef1f..91ba412 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -30,13 +30,11 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.DestroyMessage;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXManagerImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
index 6fea7e8..d0b9630 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXMessageTest.java
@@ -19,10 +19,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
index ffd52db..91346b0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXRegionLockRequestImplTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXRegionLockRequestImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
index 95c3320..1113246 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateProxyImplTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.region.entry.RegionEntryFactoryBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXStateProxyImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
index 294c7b7..b09ccfd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXStateStubTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.tx.TXRegionStub;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
index 6e27021..0210874 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXSynchronizationRunnableTest.java
@@ -21,12 +21,10 @@ import static org.mockito.Mockito.mock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.internal.cache.tier.sockets.CommBufferPool;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TXSynchronizationRunnableTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
index 5bd5174..dab050a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageTest.java
@@ -27,7 +27,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataStream;
import org.apache.geode.internal.cache.versions.VersionSource;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for TxCommitMessage.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
index 7354d68..3d76321 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VLJUnitTest.java
@@ -25,10 +25,8 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test for the new variable length format
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
index 188f864..dbfacdb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/VMLRURegionMapTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VMLRURegionMapTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
index 3171f6d..2e7e96b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
index a545a58..c2cfaa5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupRequestTest.java
@@ -26,12 +26,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
index ef0bfd2..480c836 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupStepTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbortBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
index c1c8ece..ebd32e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbstractBackupWriterConfigTest.java
@@ -25,9 +25,7 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractBackupWriterConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
index a74865e..ca84aa6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDefinitionTest.java
@@ -23,10 +23,8 @@ import java.nio.file.Paths;
import java.util.Collections;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskStore;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupDefinitionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
index b8a3292..ffd637d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.persistence.PersistentID;
@@ -34,7 +33,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupReplyProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
index 8074648..9c4979c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupServiceTest.java
@@ -26,13 +26,11 @@ import java.util.HashSet;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
index fd0b407..6b12dff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupWriterFactoryTest.java
@@ -27,9 +27,7 @@ import java.nio.file.Paths;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BackupWriterFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
index 2da3b20..7f7c80f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterConfigTest.java
@@ -24,9 +24,7 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileSystemBackupWriterConfigTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
index 2756a1d..9d02fb5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FileSystemIncrementalBackupLocationTest.java
@@ -32,13 +32,11 @@ import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileSystemIncrementalBackupLocationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
index 3a3f999..19650e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
index 9a7940d..19ee880 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
@@ -27,14 +27,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
index 151c884..04c2a19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupStepTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FinishBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
index b63ff55..7995de4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
@@ -23,14 +23,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
index d0e1e68..09aa2e8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
@@ -26,12 +26,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
index 33d2866..056244e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskStepTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.cache.CacheClosedException;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FlushToDiskStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
index f0c8956..24bdd22 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
@@ -24,14 +24,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
index 00336f9..7ddd284 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
@@ -29,14 +29,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupRequestTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
index c2a54f5..797dc42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupStepTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.stubbing.Answer;
@@ -42,7 +41,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PrepareBackupStepTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
index fb5167e..0c04042 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/TemporaryBackupFilesTest.java
@@ -25,12 +25,10 @@ import java.nio.file.Path;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.internal.cache.DirectoryHolder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TemporaryBackupFilesTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
index 36a9ad2..c5ab00b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/FilterByPathJUnitTest.java
@@ -23,10 +23,8 @@ import java.lang.reflect.Proxy;
import java.util.HashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FilterByPathJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
index bc57437..557fe76 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryThresholdsJUnitTest.java
@@ -20,10 +20,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryThresholdsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
index 65cc575..3b9219f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/ResourceAdvisorTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResourceAdvisorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
index 560bbac..b1684ac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/entries/AbstractRegionEntryTest.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.query.QueryException;
@@ -51,7 +50,6 @@ import org.apache.geode.internal.offheap.SlabImpl;
import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionEntryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
index 729d63b..1f3b877 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/DistributedEventTrackerTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentMap;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.DataPolicy;
@@ -46,7 +45,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedEventTrackerTest {
LocalRegion region;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
index 7c7306c..eeaebaf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerExpiryTaskTest.java
@@ -19,12 +19,10 @@ import static org.mockito.Mockito.mock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EventTrackerExpiryTaskTest {
private static final long TIME_TO_LIVE = 100;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
index a141997..e6c2df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/event/NonDistributedEventTrackerTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCacheEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class NonDistributedEventTrackerTest {
private NonDistributedEventTracker tracker = NonDistributedEventTracker.getInstance();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
index 8a4bb9e..858f834 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/AbstractEvictionListTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractEvictionListTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
index 36cd9eb..6c9f7b6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionListBuilderTest.java
@@ -23,10 +23,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ClearSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAlgorithm;
-import org.apache.geode.test.junit.categories.UnitTest;
public class EvictionListBuilderTest {
private static final String EVICTION_PROPERTY_NAME = "geode." + EVICTION_SCAN_ASYNC;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
index 0b572c6..189c358 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LIFOListTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LIFOListTest {
private BucketRegion bucketRegion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
index 3cc356c..5dbe9af 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingTest.java
@@ -33,13 +33,11 @@ import java.util.stream.IntStream;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LRUListWithAsyncSortingTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
index 1ddb3ae..4a61e68 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingTest.java
@@ -24,12 +24,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LRUListWithSyncSortingTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index 728ced4..8d77bb6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -25,12 +25,10 @@ import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SimpleExtensionPoint}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index 51d9ba6..e04feab 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This test verifies that eventId, while being sent across the network ( client to server, server
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 1e0cc52..081a3e5 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
@@ -33,7 +33,6 @@ 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({ClientSubscriptionTest.class})
public class HARegionQueueTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index 8155cd1..c467e4e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.ha.ThreadIdentifier.WanType;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ThreadIdentifierJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
index c5e4781..a02c35a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/AbstractRegionMapPutTest.java
@@ -33,7 +33,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.cache.DiskAccessException;
@@ -43,7 +42,6 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionEntryFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractRegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
index d99aee3..023cebc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapCommitPutTest.java
@@ -34,7 +34,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.cache.TransactionId;
@@ -52,7 +51,6 @@ import org.apache.geode.internal.cache.TXEntryState;
import org.apache.geode.internal.cache.TXRmtEvent;
import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapCommitPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
index 4e2c122..774f090 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapDestroyTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EntryNotFoundException;
@@ -53,7 +52,6 @@ import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapDestroyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
index 1abd7d9..e525785 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/map/RegionMapPutTest.java
@@ -37,7 +37,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheWriter;
import org.apache.geode.cache.DiskAccessException;
@@ -57,7 +56,6 @@ import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationExcep
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionMapPutTest {
private final InternalRegion internalRegion = mock(InternalRegion.class);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
index 1a6e2fe..e4e7573 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketBackupMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketBackupMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
index 5637bfe..4e3c706 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetailsJUnitTest.java
@@ -27,9 +27,7 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ColocatedRegionDetailsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
index e1cb981..ae92fd2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DeposePrimaryBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index 55e2112..dfc4b77 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -36,7 +35,6 @@ import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntr
import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesResponse;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchEntriesMessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
index 46b7029..e57a026 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntryMessageTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
index 3ea3be3..547144a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessageTest.java
@@ -30,7 +30,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InOrder;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.TXId;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchKeysMessageTest {
@Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
index 587adac..d24f4bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FetchPartitionDetailsMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
index 728e0cf..d4dd278 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketReplyMessageTest.java
@@ -24,7 +24,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
@@ -35,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.internal.cache.PartitionedRegionStats;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ManageBackupBucketReplyMessageTest {
@Mock
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
index b6e2606..ab5763f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/MoveBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
index 8bae667..76721bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/OfflineMembersDetailsJUnitTest.java
@@ -24,11 +24,9 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OfflineMembersDetailsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
index 19cf462..1014863 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionMessageTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.DistributionAdvisor;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
index ea56652..39f76a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PutPutReplyMessageJUnitTest.java
@@ -18,14 +18,11 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PutPutReplyMessageJUnitTest extends OldValueImporterTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
index c52b407..17dd397 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemotePutMessageJUnitTest.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.cache.Operation;
@@ -32,7 +31,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutMessageJUnitTest {
static final int UNKNOWN_REGION = 234;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
index f5c4040..e9e4fb0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveAllPRMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoveAllPRMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
index bea842b..4f3acb3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RemoveBucketMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoveBucketMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
index 544dca5..90f23e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/SizeMessageTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SizeMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
index eb19d52..9602002 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorImplTest.java
@@ -29,14 +29,12 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.partitioned.PartitionedRegionRebalanceOp;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketOperatorImplTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
index ba49ff8..3f7b920 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperatorWrapperTest.java
@@ -36,7 +36,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.control.PartitionRebalanceDetailsImpl;
import org.apache.geode.internal.cache.control.ResourceManagerStats;
import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BucketOperatorWrapperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
index 31940ec..4d32913 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModelJUnitTest.java
@@ -34,7 +34,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.partition.PartitionMemberInfo;
@@ -47,7 +46,6 @@ import org.apache.geode.internal.cache.partitioned.rebalance.BucketOperator.Comp
import org.apache.geode.internal.cache.partitioned.rebalance.model.AddressComparor;
import org.apache.geode.internal.cache.partitioned.rebalance.model.PartitionedRegionLoadModel;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PartitionedRegionLoadModelJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
index 78139c2..588dc81 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
@@ -27,9 +27,7 @@ import java.io.File;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DefaultDiskDirsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
index 650b8eb..f976fd3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceInitialImageAdvisorTest.java
@@ -43,7 +43,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.CancelCriterion;
@@ -54,7 +53,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.InitialImageAdvice;
import org.apache.geode.internal.lang.SystemPropertyHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class PersistenceInitialImageAdvisorTest {
@Rule
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
index 03c5ec7..410d3d8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/query/TemporaryResultSetFactoryJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.TreeMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.persistence.query.IndexMap.IndexEntry;
@@ -31,7 +30,6 @@ import org.apache.geode.internal.cache.persistence.query.mock.IndexMapImpl;
import org.apache.geode.internal.cache.persistence.query.mock.NaturalComparator;
import org.apache.geode.internal.cache.persistence.query.mock.Pair;
import org.apache.geode.internal.cache.persistence.query.mock.PairComparator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TemporaryResultSetFactoryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
index cb9ccd0..cf22315 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -20,10 +20,8 @@ import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class RegionEntryFactoryBuilderJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
index 640d9d3..5a8aff0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ClientExporterTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -30,7 +29,6 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClientExporterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
index 8212622..df96a4c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/ParallelSnapshotFileMapperTest.java
@@ -25,11 +25,9 @@ import java.net.UnknownHostException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelSnapshotFileMapperTest {
private static final int PORT = 1234;
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 ce62a49..88a713c 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
@@ -23,7 +23,6 @@ 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({ClientSubscriptionTest.class})
public class CCUStatsTest {
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 50bf246..42a7124 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
@@ -29,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* This is a functional-test for <code>ClientHealthMonitor</code>.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index b987318..a711a7c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientSubscriptionTest.class})
public class FilterProfileJUnitTest {
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 f244b92..71579d2 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
@@ -24,7 +24,6 @@ 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({ClientServerTest.class})
public class HandshakeTest {
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 218ce16..e11bcbd 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
@@ -34,7 +34,6 @@ import org.mockito.MockitoAnnotations;
import org.apache.geode.internal.cache.tier.Encryptor;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class MessageIdExtractorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index b0f4223..c2a9139 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -37,7 +37,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Version;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class MessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index dea2fde..c1f8880 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({ClientServerTest.class})
public class ObjectPartListJUnitTest {
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 c73b6ba..2684685 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
@@ -25,7 +25,6 @@ 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({ClientServerTest.class})
public class PartTest {
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 6832f33..4931f8d 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
@@ -36,7 +36,6 @@ 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;
/**
* We don't test the path where the service providing protobufProtocolHandler is actually present,
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 c1b0e8f..f55f41a 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
@@ -47,7 +47,6 @@ 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({ClientServerTest.class})
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 e4b2d52..ec2bea7 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
@@ -22,7 +22,6 @@ 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({MembershipTest.class})
public class TcpServerFactoryTest {
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 2143e79..e77c533 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
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.tier.ServerSideHandshake;
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
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 ff60cf0..c859c2e 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
@@ -40,7 +40,6 @@ 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({ClientServerTest.class})
public class ContainsKey66Test {
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 e3681e7..540accd 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
@@ -41,7 +41,6 @@ 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({ClientServerTest.class})
public class ContainsKeyTest {
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 d57a434..93134d3 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
@@ -42,7 +42,6 @@ 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({ClientServerTest.class})
public class CreateRegionTest {
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 64f240f..68315ab 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
@@ -44,7 +44,6 @@ 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({ClientServerTest.class})
public class Destroy65Test {
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 2b91d74..b1146dc 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
@@ -44,7 +44,6 @@ 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({ClientServerTest.class})
public class DestroyRegionTest {
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 678f1e1..13ed684 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
@@ -44,7 +44,6 @@ 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({ClientServerTest.class})
public class DestroyTest {
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 c83e18d..0ba095d 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
@@ -60,7 +60,6 @@ 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({ClientServerTest.class})
@RunWith(PowerMockRunner.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 9e3810f..a61e49f 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
@@ -58,7 +58,6 @@ 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({ClientServerTest.class})
@RunWith(PowerMockRunner.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 88f4fef..d9fd4aa 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
@@ -58,7 +58,6 @@ 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({ClientServerTest.class})
@RunWith(PowerMockRunner.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 db90063..51bf52f 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
@@ -45,7 +45,6 @@ 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({ClientServerTest.class})
public class Get70Test {
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 54956a6..dc49e7d 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
@@ -49,7 +49,6 @@ 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({ClientServerTest.class})
public class GetAll651Test {
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 2a03e2f..6bc3a9c 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
@@ -49,7 +49,6 @@ 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({ClientServerTest.class})
public class GetAll70Test {
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 67028d0..fbd5c6c 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
@@ -48,7 +48,6 @@ 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({ClientServerTest.class})
public class GetAllTest {
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 539ebc9..a71dac5 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
@@ -46,7 +46,6 @@ 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({ClientServerTest.class})
public class GetAllWithCallbackTest {
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 694b2dc..abc7d50 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
@@ -34,7 +34,6 @@ 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({ClientServerTest.class})
public class GetClientPartitionAttributesCommand66Test {
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 002587d..0141363 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
@@ -34,7 +34,6 @@ 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({ClientServerTest.class})
public class GetClientPartitionAttributesCommandTest {
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 9e4e050..40f75cf 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
@@ -47,7 +47,6 @@ 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({ClientServerTest.class})
public class InvalidateTest {
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 0a1bc57..81f549b 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
@@ -50,7 +50,6 @@ 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({ClientServerTest.class})
public class KeySetTest {
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 343337c..34a97f4 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
@@ -47,7 +47,6 @@ 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({ClientServerTest.class})
public class Put61Test {
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 53e3c7d..2f31f0d 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
@@ -48,7 +48,6 @@ 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({ClientServerTest.class})
public class Put65Test {
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 7515b1e..34dd0ee 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
@@ -49,7 +49,6 @@ 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({ClientServerTest.class})
public class PutTest {
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 bf73cd5..e6ab019 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
@@ -49,7 +49,6 @@ 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({ClientServerTest.class})
public class RegisterInterest61Test {
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 6277237..789c1f9 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
@@ -48,7 +48,6 @@ 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({ClientServerTest.class})
public class RegisterInterestList61Test {
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 8d841e8..15fb326 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
@@ -50,7 +50,6 @@ 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({ClientServerTest.class})
public class RegisterInterestList66Test {
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 7976057..cb8d6b3 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
@@ -48,7 +48,6 @@ 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({ClientServerTest.class})
public class RegisterInterestListTest {
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 9c578f1..c6bcf109 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
@@ -47,7 +47,6 @@ 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({ClientServerTest.class})
public class RegisterInterestTest {
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 e16632a..8ebe735 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
@@ -45,7 +45,6 @@ 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({ClientServerTest.class})
public class RemoveAllTest {
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 5407e08..85c23bd 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
@@ -45,7 +45,6 @@ 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({ClientServerTest.class})
public class RequestTest {
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 dbd1427..e8105db 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
@@ -36,7 +36,6 @@ 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({ClientServerTest.class})
public class TXFailoverCommandTest {
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 fec92c6..c27175d 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
@@ -54,7 +54,6 @@ 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"})
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
index 7a6b232..aa3cbc8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/AbstractPeerTXRegionStubTest.java
@@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.RemoteOperationException;
import org.apache.geode.internal.cache.TXStateStub;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.test.junit.categories.UnitTest;
public class AbstractPeerTXRegionStubTest {
private AbstractPeerTXRegionStub txrStub;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
index c33c162..443bbbb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/ClientTXStateStubTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.CancelCriterion;
@@ -45,7 +44,6 @@ import org.apache.geode.internal.cache.TXLockRequest;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClientTXStateStubTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
index 7963de0..bba0003 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteFetchEntryMessageTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteFetchEntryMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
index f7222ad..145d711 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationMessageTest.java
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.CacheClosedException;
@@ -49,7 +48,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteOperationMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
index 4ed9acb..3778a6b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteOperationResponseTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RemoteOperationException;
import org.apache.geode.internal.cache.tx.RemoteOperationMessage.RemoteOperationResponse;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteOperationResponseTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
index 6f33951..0413504 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutAllMessageTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import java.io.DataInput;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
index e7b1d4d..f5a8c1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RemoteOperationException;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
index 96f9897..1855e42 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutReplyMessageJUnitTest.java
@@ -18,14 +18,11 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl.OldValueImporter;
import org.apache.geode.internal.cache.OldValueImporterTestBase;
import org.apache.geode.internal.cache.tx.RemotePutMessage.PutReplyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemotePutReplyMessageJUnitTest extends OldValueImporterTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
index f445eb4..ce476a5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemoteRemoveAllMessageTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import java.io.DataInput;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RemoteRemoveAllMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
index 4918c32..88a7a19 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RVVExceptionJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.cache.versions;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RVVExceptionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
index 266fcfd..97189fa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolder2JUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionVersionHolder2JUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index 341385d..38f1397 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -24,12 +24,10 @@ import java.util.BitSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.versions.RVVException.ReceivedVersionsIterator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionVersionHolderJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
index e6231a3..b36535b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderRandomJUnitTest.java
@@ -24,9 +24,7 @@ import java.util.Random;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* A test of the region version holder, where all of the test methods will now build there RVV by
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
index cf6f3da..4676348 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderSmallBitSetJUnitTest.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* A test of the region version holder, but using a smaller bit set so that we test the merging of
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
similarity index 98%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
index 96932a6..deb7d4e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
@@ -30,6 +30,7 @@ import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.net.UnknownHostException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -38,7 +39,6 @@ import java.util.concurrent.Future;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.DataSerializer;
@@ -48,8 +48,7 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class RegionVersionVectorTest {
@@ -66,7 +65,7 @@ public class RegionVersionVectorTest {
*/
@Test
public void testSynchronizationVectorContainsAllVersionsForOwnerAndNonTarget() {
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember server1 = new InternalDistributedMember(local, 101);
InternalDistributedMember server2 = new InternalDistributedMember(local, 102);
InternalDistributedMember server3 = new InternalDistributedMember(local, 103);
@@ -120,7 +119,7 @@ public class RegionVersionVectorTest {
public void testRegionVersionVectors() throws Exception {
// this is just a quick set of unit tests for basic RVV functionality
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember server1 = new InternalDistributedMember(local, 101);
InternalDistributedMember server2 = new InternalDistributedMember(local, 102);
InternalDistributedMember server3 = new InternalDistributedMember(local, 103);
@@ -592,7 +591,7 @@ public class RegionVersionVectorTest {
public void testRecordVersionDuringRegionInit() {
LocalRegion mockRegion = mock(LocalRegion.class);
when(mockRegion.isInitialized()).thenReturn(false);
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember ownerId = new InternalDistributedMember(local, 101);
VMVersionTag tag = new VMVersionTag();
tag.setRegionVersion(1L);
@@ -606,7 +605,7 @@ public class RegionVersionVectorTest {
public void testRecordVersionAfterRegionInitThrowsException() {
LocalRegion mockRegion = mock(LocalRegion.class);
when(mockRegion.isInitialized()).thenReturn(true);
- final String local = NetworkUtils.getIPLiteral();
+ final String local = getIPLiteral();
InternalDistributedMember ownerId = new InternalDistributedMember(local, 101);
VMVersionTag tag = new VMVersionTag();
tag.setRegionVersion(1L);
@@ -741,6 +740,14 @@ public class RegionVersionVectorTest {
}
}
+ private static String getIPLiteral() {
+ try {
+ return SocketCreator.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ throw new Error("Problem determining host IP address", e);
+ }
+ }
+
private static class VersionRaceConditionRegionVersionVector extends TestableRegionVersionVector {
VersionRaceConditionRegionVersionVector(VersionSource<InternalDistributedMember> ownerId,
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
index cb37bc2..7a4971e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/VMVersionTagTest.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.versions;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class VMVersionTagTest extends AbstractVersionTagTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
index 27eda0a..920c399 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Operation;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -33,7 +32,6 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
index a0adacd..d03a15c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -48,7 +47,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.MetaRegionFactory;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue.ParallelGatewaySenderQueueMetaRegion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelGatewaySenderQueueJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 88c35af..7633044 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -68,7 +67,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ParallelQueueRemovalMessageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
index 4901bdf..afb379e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessorJUnitTest.java
@@ -20,11 +20,9 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConcurrentSerialGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
index c091ce6..1aa67f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/DestroyMessageTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.InternalCacheEvent;
import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation.DestroyMessage;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyMessageTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
index 20844af..2f15517 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.test.util.ReflectionTestUtils;
import org.apache.geode.cache.Operation;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SerialGatewaySenderEventProcessorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index 275ab24..7d529d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -19,12 +19,10 @@ import static org.junit.Assert.assertSame;
import java.util.Stack;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractXmlParser}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
index 0bdd6cd..6fa5cbc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheCreationJUnitTest.java
@@ -35,7 +35,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.CacheServerLauncher;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheCreationJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
index 2f94665..721479e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheTransactionManagerCreationTest.java
@@ -21,11 +21,9 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.TransactionListener;
import org.apache.geode.cache.TransactionWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CacheTransactionManagerCreationTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index b4c856a..9947be6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -34,9 +34,7 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* @since GemFire 8.1
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
index b18128f..11c3ce4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/DefaultEntityResolver2Test.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.InputSource;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DefaultEntityResolver2Test {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
index a3ef878..4746947 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/GeodeEntityResolverJUnitTest.java
@@ -15,10 +15,8 @@
package org.apache.geode.internal.cache.xmlcache;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.xml.sax.EntityResolver;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link GeodeEntityResolver} and {@link DefaultEntityResolver2}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 0c5f2b5..9017429 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -15,10 +15,8 @@
package org.apache.geode.internal.cache.xmlcache;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.xml.sax.EntityResolver;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link PivotalEntityResolver} and {@link DefaultEntityResolver2}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 9bf61c0..8984ffe 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -18,13 +18,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
import org.apache.geode.internal.cache.extension.SimpleExtensionPointJUnitTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit test for {@link RegionCreation}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index 91342eb..fd6cd0d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -23,14 +23,12 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.xml.XMLConstants;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit Tests for {@link XmlGeneratorUtils}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
index 15bcb71..311022a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
@@ -30,12 +30,10 @@ import javax.xml.bind.annotation.XmlType;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.cache.configuration.CacheElement;
import org.apache.geode.cache.configuration.RegionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JAXBServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
index 5c5714e..d5d73b7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/io/CompositeOutputStreamJUnitTest.java
@@ -29,9 +29,7 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for CompositeOutputStream.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
index 9afb8d4..3d33697 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/ContextJUnitTest.java
@@ -35,9 +35,7 @@ import javax.naming.NoPermissionException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests all basic methods of ContextImpl.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
index b18cd87..ad118ef 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java
@@ -23,9 +23,7 @@ import java.util.Calendar;
import java.util.Date;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ClassUtilsJUnitTest class is a test suite with test cases to test the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
index fdc92e6..3a95eee 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/InOutParameterJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The InOutParameterJUnitTest class is a test suite with test cases to test the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
index 70a1ab4..279ac18 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ObjectUtilsJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ObjectUtilsJUnitTest class is a test suite of test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
index b6e1ac2..c4c23f3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java
@@ -24,12 +24,10 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.cache.CachedDeserializable;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The StringUtilsJUnitTest is a test suite containing test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
index 2bc0056..5193003 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemPropertyHelperTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.lang;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SystemPropertyHelperTest {
private String restoreSetOperationTransactionBehavior = "restoreSetOperationTransactionBehavior";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
index 0bc4cfd..999cba1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/SystemUtilsJUnitTest.java
@@ -46,9 +46,7 @@ import static org.junit.Assume.assumeNotNull;
import java.lang.management.ManagementFactory;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The SystemUtilsJUnitTest class is a test suite of test cases for testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
index c97b8c3..e1f107a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ThrowableUtilsTest.java
@@ -19,9 +19,7 @@ import static com.googlecode.catchexception.CatchException.caughtException;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ThrowableUtils}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
index 4f0d8bd..42cca54 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogServiceJUnitTest.java
@@ -26,12 +26,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.logging.log4j.AppenderContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for LogService
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
index 79074f5..f899ae5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterImplJUnitTest.java
@@ -17,9 +17,7 @@ package org.apache.geode.internal.logging;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogWriterImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
index 1c0ba77..3792f04 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/SortLogFileJUnitTest.java
@@ -27,10 +27,8 @@ import java.util.Date;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the functionality of the {@link SortLogFile} program.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
index 6d5a026..3bef251 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertAppenderJUnitTest.java
@@ -31,14 +31,12 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DurableClientAttributes;
import org.apache.geode.distributed.Role;
import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the AlertAppender.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
index 5bc039b..7ef021a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/FastLoggerJUnitTest.java
@@ -31,9 +31,7 @@ import org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests the FastLogger class which wraps and delegates to an actual Logger with optimizations
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
index b7ddedb..b41a055 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LocalizedMessageJUnitTest.java
@@ -20,10 +20,8 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests for LocalizedMessage which bridges our StringId LocalizedStrings for Log4J2 usage.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
index eff451f..85663d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogLevelTest.java
@@ -20,10 +20,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
index 5f3d2ec..0bb4192 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderJUnitTest.java
@@ -31,12 +31,10 @@ import org.apache.logging.log4j.message.ParameterizedMessage;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.PureLogWriter;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the LogWriterAppender.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index c09df5e..b2c5d59 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.admin.SSLConfig;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class SSLConfigurationFactoryJUnitTest {
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 50e86e3..5c0398c 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
@@ -30,7 +30,6 @@ 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.
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 4e48bc5..7776003 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
@@ -19,7 +19,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests SocketCloser with a wait time. The default SocketCloser does not wait. This test configures
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 d0f45ba..6d2c807 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
@@ -85,7 +85,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
@Category({MembershipTest.class})
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 49c84de..df7cd47 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
@@ -31,7 +31,6 @@ 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({MembershipTest.class})
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 e82511a..226eea4 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
@@ -32,7 +32,6 @@ 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;
/**
* The SocketUtilsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
index fa710ed..90b5532 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DataTypeJUnitTest.java
@@ -50,7 +50,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -68,7 +67,6 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
import org.apache.geode.internal.cache.execute.data.CustId;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests the DataType support for off-heap MemoryInspector.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
index 1996fe0..69e3757 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/DisconnectingOutOfOffHeapMemoryListenerJUnitTest.java
@@ -24,13 +24,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DisconnectingOutOfOffHeapMemoryListenerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
index 875f1f3..1007815 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FragmentJUnitTest.java
@@ -26,10 +26,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FragmentJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
index c882054..8d1373a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/FreeListManagerTest.java
@@ -31,10 +31,8 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FreeListManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
index 492906c..5de48a7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/LifecycleListenerJUnitTest.java
@@ -23,9 +23,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests LifecycleListener
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index ca230b8..4a3c508 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -22,10 +22,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
index 55daf58..44ae3bf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -31,11 +31,9 @@ import java.util.concurrent.atomic.AtomicReference;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryAllocatorJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
index 6c605d2..f2e9bc1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryBlockNodeJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.ProvideSystemProperty;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.cache.CacheClosedException;
@@ -40,7 +39,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.DSCODE;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryBlockNodeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
index 4302aed..891e328 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryInspectorImplJUnitTest.java
@@ -27,9 +27,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MemoryInspectorImplJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
index 6b53963..1c72e11 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -29,11 +29,9 @@ import java.nio.ByteBuffer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.VMCachedDeserializable;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
index c29fa92..897cfb4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperJUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
@@ -48,7 +47,6 @@ import org.apache.geode.internal.cache.VMCachedDeserializable;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.UnitTest")
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
index 1b761c0..4481ddb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.verify;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.OutOfOffHeapMemoryException;
import org.apache.geode.StatisticsFactory;
@@ -34,7 +33,6 @@ import org.apache.geode.distributed.internal.DistributionStats;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.statistics.LocalStatisticsFactory;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStorageJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
index 00c67b7..f742804 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectAddressStackJUnitTest.java
@@ -22,11 +22,9 @@ import static org.mockito.Mockito.withSettings;
import org.apache.logging.log4j.Logger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.listeners.InvocationListener;
import org.mockito.listeners.MethodInvocationReport;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectAddressStackJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
index 92bf770..87b5f1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -35,7 +35,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.DSCODE;
@@ -46,7 +45,6 @@ import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
index d65bbbe..302f27b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectSliceJUnitTest.java
@@ -18,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectSliceJUnitTest extends OffHeapStoredObjectJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
index 28da0ba..a74d7e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectWithHeapFormJUnitTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapStoredObjectWithHeapFormJUnitTest extends OffHeapStoredObjectJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
index fa07c34..420f30d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapWriteObjectAsByteArrayJUnitTest.java
@@ -25,12 +25,10 @@ import java.io.IOException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.cache.EntryEventImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OffHeapWriteObjectAsByteArrayJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
index f61378e..f9bcc52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/RefCountChangeInfoJUnitTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RefCountChangeInfoJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
index 781c030..03fac15 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperImplTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -36,7 +35,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.UnitTest;
/*
* PowerMock used in this test to verify static method MemoryAllocatorImpl.debugLog
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
index baf9c81..a7ca6101 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/ReferenceCountHelperJUnitTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
@@ -35,7 +34,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.apache.geode.test.junit.categories.UnitTest;
/*
* This test simply verifies the static class delegates properly to the impl
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
index 59354a1..1d58f95 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyMemoryBlockJUnitTest.java
@@ -24,12 +24,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.offheap.MemoryBlock.State;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TinyMemoryBlockJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
index 7507144..d4f311c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/TinyStoredObjectJUnitTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
import java.nio.ByteBuffer;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.DSCODE;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.RegionEntryContext;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TinyStoredObjectJUnitTest extends AbstractStoredObjectTestBase {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
index a05f9da..b6e8ec9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/AttachProcessUtilsTest.java
@@ -21,11 +21,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.lang.AvailablePid;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RetryRule;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
index da4796c..adaa02d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/FileProcessControllerTest.java
@@ -25,10 +25,8 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.lang.AttachAPINotFoundException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FileProcessController}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
index 904b061..65ab647 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/NativeProcessUtilsTest.java
@@ -20,11 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.lang.AvailablePid;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.RetryRule;
/**
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
index 9af22a8..dbd1932 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessControllerFactoryTest.java
@@ -24,9 +24,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ProcessControllerFactory}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
index cbc632f..d301d43 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ProcessLauncherContextTest.java
@@ -31,9 +31,7 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ProcessLauncherContext}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
index 8f8ad64..011806f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/StartupStatusTest.java
@@ -29,10 +29,8 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartupStatusTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
index 012371b..b8227cb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/lang/AvailablePidTest.java
@@ -36,10 +36,8 @@ import com.google.common.base.Stopwatch;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AvailablePid}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
index 909f0eb..ad08a86 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/signal/AbstractSignalNotificationHandlerTest.java
@@ -24,10 +24,8 @@ import static org.mockito.Mockito.verify;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.CollectionUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link AbstractSignalNotificationHandler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
index 5edf3ba..5e72310 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/CallbackInstantiatorTest.java
@@ -22,7 +22,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class CallbackInstantiatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
index 0c9ed4c..cc603ce 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceConstructorTest.java
@@ -23,12 +23,10 @@ import org.apache.shiro.SecurityUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.shiro.SecurityManagerProvider;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IntegratedSecurityServiceConstructorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
index e9b1939..f1aa2eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -31,13 +31,11 @@ import org.apache.shiro.util.ThreadState;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.shiro.SecurityManagerProvider;
import org.apache.geode.security.AuthenticationRequiredException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IntegratedSecurityServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
index 91b6c23..a832a1c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/LegacySecurityServiceTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.internal.security;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LegacySecurityServiceTest {
private LegacySecurityService service;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
index 5819e48..1f70b04 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.SimpleTestSecurityManager;
import org.apache.geode.security.TestPostProcessor;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SecurityServiceFactoryTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
index aae6763..055cace 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.TestSecurityManager;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SecurityServiceTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
index babbf1d..66ee786 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectSizerJUnitTest.java
@@ -20,9 +20,7 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
index 6b0c138..5502baa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserJUnitTest.java
@@ -25,10 +25,8 @@ import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ObjectTraverserJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
index df352bd..0415253 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ReflectionObjectSizerJUnitTest.java
@@ -19,11 +19,9 @@ import static org.junit.Assert.assertNotEquals;
import static org.mockito.Mockito.mock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ReflectionObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
index 64a3b93b..0a93778 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/SizeClassOnceObjectSizerJUnitTest.java
@@ -20,10 +20,8 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SizeClassOnceObjectSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
index e2859c5..3e6756f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/WellKnownClassSizerJUnitTest.java
@@ -19,10 +19,8 @@ import static org.apache.geode.internal.size.SizeTestUtil.roundup;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.junit.categories.UnitTest;
public class WellKnownClassSizerJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
index 93c5b84..4cfcd52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/CallbackSamplerTest.java
@@ -26,14 +26,12 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link CallbackSampler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
index f5118df..4488d7c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/ResourceInstTest.java
@@ -21,13 +21,11 @@ import java.lang.reflect.Field;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mock;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceType;
import org.apache.geode.internal.statistics.StatArchiveReader.StatArchiveFile;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ResourceInst}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
index 515d5fd..ebbd8ba 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/SampleCollectorTest.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
@@ -39,7 +38,6 @@ import org.apache.geode.internal.statistics.TestSampleHandler.Info;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceInstanceInfo;
import org.apache.geode.internal.statistics.TestSampleHandler.ResourceTypeInfo;
import org.apache.geode.internal.statistics.TestSampleHandler.SampledInfo;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link SampleCollector}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
index 62743d7..d2fec96 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWriterTest.java
@@ -21,9 +21,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StatArchiveWriterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
index 30c45e5..9b6c39e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerTest.java
@@ -24,11 +24,9 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link StatMonitorHandler}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
index 05f5961..60b4bff 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatMonitorHandlerWithEnabledMonitorThreadTest.java
@@ -25,12 +25,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.statistics.StatMonitorHandler.StatMonitorNotifier;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted tests from StatMonitorHandlerTest that require enableMonitorThread
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
index 7d0fff5..8ce0dd8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsImplTest.java
@@ -33,10 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link StatisticsImpl}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
index d50793f..68533c6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsMonitorTest.java
@@ -28,11 +28,9 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for the StatisticsMonitor class. No disk IO.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index 0b5ebc2..075b252 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.internal.net.SocketCloser;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.MembershipTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({MembershipTest.class})
public class ConnectionJUnitTest {
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 7a3e4f3..ff46493 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
@@ -33,7 +33,6 @@ 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({MembershipTest.class})
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 f2b0741..e7928b9 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
@@ -26,7 +26,6 @@ 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({MembershipTest.class})
public class ConnectionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
index 985b1b9..adb9cfd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/AbortableTaskServiceJUnitTest.java
@@ -32,10 +32,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.AbortableTaskService.AbortableTask;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
public class AbortableTaskServiceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
index a45fe00..2b968bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArgumentRedactorJUnitTest.java
@@ -30,10 +30,8 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.Banner;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ArgumentRedactorJUnitTest {
private static final String someProperty = "redactorTest.someProperty";
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
index 9d5f08e..015b00d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/ArrayUtilsTest.java
@@ -26,10 +26,8 @@ import java.util.List;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link ArrayUtils}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
index 295bce6..b2f9030 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperTest.java
@@ -29,14 +29,12 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.internal.ByteArrayDataInput;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.offheap.StoredObject;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit Tests for {@link BlobHelper}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index 5109980..b6fc58a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -40,9 +40,7 @@ import org.apache.bcel.generic.Type;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link BlobHelper} with Thread Context ClassLoader.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
index ca9f430..cc378e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java
@@ -41,9 +41,7 @@ import java.util.Vector;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The CollectionUtilsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
index b4b1d8a..ad6f5f5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/DelayedActionJUnitTest.java
@@ -23,9 +23,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DelayedActionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
index 5d2c31f..2aa1df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/HostNameTest.java
@@ -31,10 +31,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import org.apache.geode.test.junit.categories.UnitTest;
@RunWith(JUnitParamsRunner.class)
public class HostNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
index 4f9ba53..a396aa9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/IOUtilsJUnitTest.java
@@ -37,9 +37,7 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test class for testing the contract and functionality of the IOUtils class.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
index 1bd78d7..d28a844 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PasswordUtilJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class PasswordUtilJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
index 5229d89..6d07b88 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksUnitTest.java
@@ -23,9 +23,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.util.test.TestUtil;
public class PluckStacksUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
index d7bdb85..df8dfb7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/CompactConcurrentHashSetJUnitTest.java
@@ -23,10 +23,8 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.concurrent.CompactConcurrentHashSet2;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompactConcurrentHashSetJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
index ca1af84..e50951c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/FutureResultJUnitTest.java
@@ -20,11 +20,9 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link FutureResult}.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
index ac33adc..cf2c2d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/ReentrantSemaphoreJUnitTest.java
@@ -26,10 +26,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ReentrantSemaphoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
index b54ec9c..cbd4283 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/util/concurrent/SemaphoreReadWriteLockJUnitTest.java
@@ -27,10 +27,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.Timeout;
-import org.apache.geode.test.junit.categories.UnitTest;
public class SemaphoreReadWriteLockJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
index 2a19a6d..400cb1a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/DiskBackupStatusTest.java
@@ -24,12 +24,10 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.DiskBackupStatusImpl;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DiskBackupStatusTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
index c4b462a..b6403b6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/StatsRateJUnitTest.java
@@ -18,13 +18,11 @@ import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.Statistics;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
import org.apache.geode.management.internal.beans.stats.StatType;
import org.apache.geode.management.internal.beans.stats.StatsRate;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StatsRateJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
index 4c46065..21ada46 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaFromTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import javax.management.openmbean.CompositeData;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaFrom;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeBuilderViaFromTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
index cc35a04..ff440f9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/CompositeBuilderViaProxyTest.java
@@ -22,10 +22,8 @@ import static org.mockito.Mockito.when;
import javax.management.openmbean.CompositeData;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.OpenTypeConverter.CompositeBuilderViaProxy;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeBuilderViaProxyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
index 80ff3b2..0d10834 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/IdentityConverterTest.java
@@ -19,9 +19,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IdentityConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
index 4fe177b..2ea00a7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/JettyHelperJUnitTest.java
@@ -25,13 +25,11 @@ import org.eclipse.jetty.server.ServerConnector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireConfigException;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The JettyHelperJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
index 8a7acae..0e53284 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/CacheServerBridgeClientMembershipRegressionTest.java
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.query.internal.InternalQueryService;
@@ -38,7 +37,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* JMX and membership should not deadlock on CacheFactory.getAnyInstance.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
index d40dc51..a0e12e4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/DistributedSystemBridgeJUnitTest.java
@@ -35,7 +35,6 @@ import javax.management.ObjectName;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.management.GatewaySenderMXBean;
import org.apache.geode.management.internal.FederationComponent;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DistributedSystemBridgeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
index 18f5135..a1f554c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/FileUploaderTest.java
@@ -27,11 +27,9 @@ import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileUploaderTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
index edcda31..cf8e97b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/QueryDataFunctionApplyLimitClauseTest.java
@@ -20,9 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class QueryDataFunctionApplyLimitClauseTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
index 8654e8e..573d8ca 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/beans/stats/MBeanStatsMonitorTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -42,7 +41,6 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.statistics.FakeValueMonitor;
import org.apache.geode.internal.statistics.ValueMonitor;
import org.apache.geode.management.internal.beans.stats.MBeanStatsMonitor.DefaultHashMap;
-import org.apache.geode.test.junit.categories.UnitTest;
public class MBeanStatsMonitorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
index 714004a..0972054 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/ClasspathScanLoadHelperJUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.Versionable;
import org.apache.geode.management.internal.cli.domain.AbstractImpl;
@@ -29,7 +28,6 @@ import org.apache.geode.management.internal.cli.domain.Impl12;
import org.apache.geode.management.internal.cli.domain.Interface1;
import org.apache.geode.management.internal.cli.domain.Interface2;
import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClasspathScanLoadHelperJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
index cef0550..3f1aeb9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilTest.java
@@ -25,10 +25,8 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CliUtilTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
index 8409648..2d7b193 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandManagerJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import com.examples.UserGfshCommand;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.Completion;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
@@ -38,7 +37,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* CommandManagerTest - Includes tests to check the CommandManager functions
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
index 6504510..aa983a9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CommandSeparatorEscapeJUnitTest.java
@@ -20,9 +20,7 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandSeparatorEscapeJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
index dd7acc3..bcb83be 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/DataCommandJsonJUnitTest.java
@@ -23,11 +23,9 @@ import java.util.HashMap;
import java.util.HashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.dto.Car;
import org.apache.geode.management.internal.cli.util.JsonUtil;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DataCommandJsonJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
index 455f0e4..57bb490 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserJUnitTest.java
@@ -22,9 +22,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshParserJUnitTest - Includes tests to check the parsing and auto-completion capabilities of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
index 86f86b1..15e9285 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -43,7 +42,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
index 4574d06..f2f0440 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class AlterDiskStoreJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
index 7e95d4c..d8d6725 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandTest.java
@@ -23,12 +23,10 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.domain.ClassName;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
index 7ce9d5f..9f3a41c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliCommand;
@@ -29,7 +28,6 @@ import org.apache.geode.internal.cache.extension.mock.MockExtensionCommands;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CommandManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandAvailabilityIndicatorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
index d0ad9fd..e190127 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
@@ -32,12 +32,10 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ConfigurePDXCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
index cb6f9ed..97aadc0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java
@@ -37,7 +37,6 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.management.cli.Result;
@@ -45,7 +44,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.shell.OperationInvoker;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ConnectCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
index 8e78dc3..754c634 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java
@@ -43,7 +43,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -51,7 +50,6 @@ import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult.StatusState;
import org.apache.geode.management.internal.cli.remote.CommandExecutor;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
index f7cf7de..2fb692d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java
@@ -36,7 +36,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.cache.execute.ResultCollector;
@@ -45,7 +44,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateDefinedIndexesCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
index 171271b..1742bea 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java
@@ -31,14 +31,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
index cb4b796..c15ae97 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -42,7 +41,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
index d70b729..483fd02 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandTest.java
@@ -30,7 +30,6 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.configuration.CacheConfig;
@@ -38,7 +37,6 @@ import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateIndexCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
index 04f8117..a65e4b3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
@@ -38,7 +38,6 @@ import javax.xml.parsers.ParserConfigurationException;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.xml.sax.SAXException;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateJndiBindingCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
index d046fa8..4d68704 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.RegionShortcut;
@@ -46,7 +45,6 @@ import org.apache.geode.management.internal.cli.domain.ClassName;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs.ExpirationAttrs;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class CreateRegionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
index 80c595b..f7cccb1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DeployCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
index b476e33..b9e7c34 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
index e28f372..836ec67 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionJUnitTest.java
@@ -32,12 +32,10 @@ import java.util.Map;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.domain.RegionDescriptionPerMember;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DescribeRegionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
index e5ce26b..461109e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.ResultCollector;
@@ -42,7 +41,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunction;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunctionArgs;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyAsyncEventQueueCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
index 40f14fa..c19869f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
@@ -28,7 +28,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -38,7 +37,6 @@ import org.apache.geode.management.internal.cli.exceptions.UserErrorException;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyGatewayReceiverCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
index 7db09eb..28daa69 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java
@@ -30,13 +30,11 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
index 628618f..a69bbd0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java
@@ -35,7 +35,6 @@ import java.util.function.UnaryOperator;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Region;
@@ -48,7 +47,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction;
import org.apache.geode.management.internal.cli.functions.DestroyJndiBindingFunction;
import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyJndiBindingCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
index 015ad70..b393275 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -41,7 +40,6 @@ import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class DestroyRegionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index ac3a991..7cee1b8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
@@ -48,7 +47,6 @@ import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundExcepti
import org.apache.geode.management.internal.cli.functions.DescribeDiskStoreFunction;
import org.apache.geode.management.internal.cli.functions.ListDiskStoresFunction;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The DiskStoreCommandsJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
index 3b98ec0..a8b977b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandTest.java
@@ -20,9 +20,7 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ExecuteFunctionCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
index 7c73e3b..419acd7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandTest.java
@@ -21,10 +21,8 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ExportConfigCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
index ffb6812..619ab75 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportDataCommandTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
index 0f35d87..f7ccb4c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java
@@ -32,7 +32,6 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Matchers;
import org.apache.geode.cache.Cache;
@@ -47,7 +46,6 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.BytesToString;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
index 20cd8ff..dbcfdf3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorJUnitTest.java
@@ -20,12 +20,10 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsInterceptorJUnitTest {
private ExportLogsInterceptor interceptor;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
index cec2dbd..e046154 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandTest.java
@@ -27,10 +27,8 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
index 55d35aa..cef8bfd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
@@ -25,14 +25,12 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfshCommandJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
index 5d5efac..fa9f41d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ImportDataCommandTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
index c99100d..56ab979 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.management.internal.cli.domain.AsyncEventQueueDetails;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
@Category({AEQTest.class})
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
index 90d12ee..5d0c31f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
@@ -30,7 +30,6 @@ import org.json.JSONObject;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.DistributedSystemMXBean;
@@ -39,7 +38,6 @@ import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ListGatewayCommandTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
index 3c223c0..1cc8098 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
@@ -44,7 +43,6 @@ import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
import org.apache.geode.management.internal.cli.functions.ListIndexFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListIndexCommandJUnitTest class is a test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
index 688aa09..cba392a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandTest.java
@@ -27,11 +27,9 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
index 07b0a1b..27a43c5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandTest.java
@@ -30,11 +30,9 @@ import java.util.Set;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
index 95d29ef..6cd337c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java
@@ -23,13 +23,11 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelInterceptorTest {
private List<AbstractCliAroundInterceptor> interceptors = new ArrayList<>();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
index 7cac276..00f6979 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsJUnitTest.java
@@ -19,11 +19,9 @@ import static org.mockito.Mockito.spy;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
public class ShowMetricsJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
index a1faec2..7a9c8ae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserInputPropertyTest.java
@@ -24,10 +24,8 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.shell.Gfsh;
-import org.apache.geode.test.junit.categories.UnitTest;
public class UserInputPropertyTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
index 7b2744d..9b4733e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommandTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.management.internal.cli.commands.lifecycle;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.junit.categories.UnitTest;
public class StartJConsoleCommandTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
index 558795d..2d5dd47 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/BaseStringConverterJUnitTest.java
@@ -23,11 +23,9 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
index 37288b1..f00985a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ClassNameConverterTest.java
@@ -20,10 +20,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.domain.ClassName;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClassNameConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
index 2bf1640..ba22113 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/ConfigPropertyConverterTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.JndiBindingsType;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ConfigPropertyConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
index b953df4..8cc0437 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/IndexTypeConverterTest.java
@@ -20,11 +20,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.test.junit.categories.UnitTest;
public class IndexTypeConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
index 8e4f2ab..03ad5ac 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/LogLevelConverterTest.java
@@ -23,10 +23,8 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.Completion;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelConverterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
index e45449b..943b5e5 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/converters/RegionPathConverterJUnitTest.java
@@ -24,10 +24,8 @@ import java.util.stream.Collectors;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.ConverterHint;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
import org.apache.geode.test.junit.rules.GfshParserRule.CommandCandidate;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
index 98e6dd0..4d4d9eb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/ClassNameTest.java
@@ -21,9 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ClassNameTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
index a868499..2c4ec1f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/domain/RegionDescriptionJUnitTest.java
@@ -27,9 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionDescriptionJUnitTest {
private static final String evictionKeyShared = "sharedEvictionKey";
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
index 2f1aeb0..097b76c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CliFunctionResultTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.management.internal.cli.functions;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CliFunctionResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
index 3214d95..cc02a41 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunctionTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.query.internal.index.HashIndex;
import org.apache.geode.cache.query.internal.index.PrimaryKeyIndex;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CreateDefinedIndexesFunctionTest {
private Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index ff6e9e7..5ea34cb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -37,7 +37,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -60,7 +59,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The DescribeDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
index 179c50e..86b9190 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyAsyncEventQueueFunctionTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
@@ -34,7 +33,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyAsyncEventQueueFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
index 44e92b9..6b48442 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DestroyGatewayReceiverFunctionTest {
private DestroyGatewayReceiverFunction function;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
index c92b48c..fdd02fe 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExpirationAttrsTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.management.internal.cli.functions.RegionFunctionArgs.ExpirationAttrs;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExpirationAttrsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
index 4ee6cba..721dbe3 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionTest.java
@@ -22,11 +22,9 @@ import static org.junit.Assert.assertTrue;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.internal.cli.commands.ExportLogsCommand;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsFunctionTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
index cbd1712..d2b7026 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunctionTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.cache.wan.GatewayReceiver;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GatewayReceiverCreateFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
index c90b3ed..2fba310 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GatewaySenderDestroyFunctionTest.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GatewaySenderDestroyFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
index cc5bbae..e6b8bcc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionJUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.control.InternalResourceManager;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GetRegionsFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
index 0007c98..3a7181a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/GetRegionsFunctionTest.java
@@ -26,13 +26,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.awaitility.core.ConditionTimeoutException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GetRegionsFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index b4b3107..bcd3444 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -34,7 +34,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
@@ -44,7 +43,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListDiskStoreFunctionJUnitTest test suite class tests the contract and functionality of the
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index 4b791aa..ecbaf27 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -34,7 +34,6 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -51,7 +50,6 @@ import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.IndexDetails;
import org.apache.geode.management.internal.cli.domain.IndexDetails.IndexStatisticsDetails;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* The ListIndexFunctionJUnitTest class is test suite of test cases testing the contract and
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
index 0a114b2..4bfcbd9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunctionTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.Region;
@@ -33,7 +32,6 @@ import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionDestroyFunctionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
index a9495dc..de22efb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/RegionFunctionArgsTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class RegionFunctionArgsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
index f0c0a3e..a07aefc 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunctionJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.core.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.mockito.ArgumentCaptor;
@@ -59,7 +58,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID;
import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.test.fake.Fakes;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ShowMissingDiskStoresFunctionJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
index 0530111..25f5e8c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
@@ -19,10 +19,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.GfshParser;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HelpBlockUnitTest {
private HelpBlock firstBlock, secondBlock, thirdBlock;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
index f89c63a..757c419 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
@@ -25,13 +25,11 @@ import java.lang.reflect.Method;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HelperUnitTest {
private Helper helper;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
index dd2d098..0b62275 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonArrayTest.java
@@ -24,9 +24,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfJsonArrayTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
index 82b2fc1..0f5082a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/GfJsonObjectTest.java
@@ -20,9 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfJsonObjectTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
index ed1c3ec..625cc26 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/json/TypedJsonTest.java
@@ -27,9 +27,7 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Extracted from {@link TypedJsonPdxIntegrationTest}.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
index 52b264b..fb21824 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.spy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -33,7 +32,6 @@ import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundExcepti
import org.apache.geode.management.internal.cli.exceptions.UserErrorException;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandExecutorTest {
GfshParseResult parseResult;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
index be1d532..4c3d27d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/OnlineCommandProcessorTest.java
@@ -26,14 +26,12 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.security.NotAuthorizedException;
-import org.apache.geode.test.junit.categories.UnitTest;
public class OnlineCommandProcessorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
index 9e5508b..e186dae 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CommandResultTest.java
@@ -22,9 +22,7 @@ import java.nio.file.Paths;
import org.assertj.core.api.Assertions;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommandResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
index 83b2f59..19ae683 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/CompositeResultDataTest.java
@@ -18,10 +18,8 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CompositeResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
index b332fe4..ec668c2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/DownloadFileResultTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class DownloadFileResultTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
index 25be25c..445dc28 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ErrorResultDataTest.java
@@ -18,10 +18,8 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ErrorResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
index ba47cb1..b4fee14 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/FileResultTest.java
@@ -21,9 +21,7 @@ import java.io.File;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class FileResultTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
index 40df6fb..eecc99c 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/InfoResultDataTest.java
@@ -18,9 +18,7 @@ package org.apache.geode.management.internal.cli.result;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class InfoResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
index 54538a5..30aa4ff 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/ResultBuilderTest.java
@@ -20,10 +20,8 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultBuilderTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
index 3d08e6d..a3e7ec0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/TabularResultDataTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TabularResultDataTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
index 44d40c1..72712ed 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/LegacyVsResultModelComparisonTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CommandResponseBuilder;
@@ -30,7 +29,6 @@ import org.apache.geode.management.internal.cli.result.CompositeResultData;
import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LegacyVsResultModelComparisonTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
index 959a0bf..9f11da4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/ResultModelTest.java
@@ -25,11 +25,9 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ResultModelTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
index dd0de03..4ff70ad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/result/model/TabularResultModelTest.java
@@ -22,9 +22,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class TabularResultModelTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
index c36a96e..695f162 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.shell.core.CommandMarker;
import org.apache.geode.management.cli.CliMetaData;
@@ -33,7 +32,6 @@ import org.apache.geode.management.internal.cli.LogWrapper;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
index caad990..a533aeb 100755
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshInitFileJUnitTest.java
@@ -40,11 +40,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.management.internal.cli.LogWrapper;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for supplying an init file to Gfsh.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
index 7927217..31a4847 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
@@ -23,9 +23,7 @@ import java.util.logging.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class GfshJunitTest {
private String testString;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
index 8702c1d..d96b4d8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/BytesToStringTest.java
@@ -18,9 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class BytesToStringTest {
private static long KB = 1024;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
index e075ad1..972b502 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/CommentSkipHelperTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class CommentSkipHelperTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
index c703a6a..ad51dbf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ExportLogsCacheWriterUnitTest.java
@@ -20,10 +20,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ExportLogsCacheWriterUnitTest {
private ExportLogsCacheWriter writer = new ExportLogsCacheWriter();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
index 46bdae4..351822a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HostUtilsTest.java
@@ -17,11 +17,9 @@ package org.apache.geode.management.internal.cli.util;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.DistributionLocator;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HostUtilsTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
index fb4ebdc..79674b7 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/HyphenFormatterTest.java
@@ -21,9 +21,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class HyphenFormatterTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
index 88db77e..a1d841e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/JdkToolTest.java
@@ -20,11 +20,9 @@ import static org.junit.Assert.assertEquals;
import java.util.Stack;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.GemFireException;
import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.UnitTest;
public class JdkToolTest {
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
index c1896a5..fee27db 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogFilterTest.java
@@ -32,9 +32,7 @@ import java.time.LocalDateTime;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogFilterTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
index 61d7422..04bc6c8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogLevelExtractorTest.java
@@ -21,9 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.logging.log4j.Level;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogLevelExtractorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
index c637693..9668c01 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/LogSizerTest.java
@@ -27,13 +27,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.management.internal.cli.functions.ExportLogsFunction;
import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction;
-import org.apache.geode.test.junit.categories.UnitTest;
public class LogSizerTest {
private LogFilter logFilter;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
index fb1795e..a74543b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/ThreePhraseGeneratorTest.java
@@ -19,9 +19,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
public class ThreePhraseGeneratorTest {
@Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
index 2e7ccbe..63c29da 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Map.Entry;
import javax.xml.XMLConstants;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.XMLReader;
@@ -37,7 +36,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
import org.apache.geode.internal.cache.xmlcache.CacheXmlVersion;
import org.apache.geode.management.internal.configuration.utils.XmlUtils;
import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Test cases for {@link CacheElement}.
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
index 9fd874e..2f0f4ab 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.powermock.api.mockito.PowerMockito;
@@ -42,7 +41,6 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
-import org.apache.geode.test.junit.categories.UnitTest;
@PowerMockIgnore("*.UnitTest")
@RunWith(PowerMockRunner.class)
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index dfe8f9b..77576fa 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -34,7 +34,6 @@ import javax.xml.xpath.XPathExpressionException;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,7 +42,6 @@ import org.w3c.dom.NodeList;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link XmlUtils}. See Also {@link XmlUtilsAddNewNodeJUnitTest} for tests related
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
index c61f734..44b4f7b 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/ResourcePermissionTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.security.ResourcePermission.Target;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class ResourcePermissionTest {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
index db93fcc..59f19af 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.FieldType;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SerializationTest.class})
public class PdxInstanceImplTest {
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 e8d8b10..a7a17f0 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
@@ -25,7 +25,6 @@ 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({RedisTest.class})
public class AbstractScanExecutorTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
index 9c7f4fe..e42654e 100644
--- a/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/GemFireSecurityExceptionTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link GemFireSecurityException}.
diff --git a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
index a549e24..0d20f90 100644
--- a/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/NotAuthorizedExceptionTest.java
@@ -33,7 +33,6 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link NotAuthorizedException}.
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
index c9a1d3c..1a7c5c9 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
@@ -28,7 +28,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
@Category({SecurityTest.class})
public class SimpleSecurityManagerTest {
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
index 6d4c656..b591926 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/PKCSPrincipalTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link PKCSPrincipal}
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
index a73afe7..742371f 100644
--- a/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/templates/UsernamePrincipalTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for {@link UsernamePrincipal}
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
index a2ad73f..8503d24 100755
--- a/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/process/MainLauncherJUnitTest.java
@@ -26,9 +26,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.TextFromStandardInputStream;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
index 6f676f2..1a644b0 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/internal/cq/CqServiceImplJUnitTest.java
@@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.query.CqException;
@@ -29,7 +28,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
... 1623 lines suppressed ...
[geode] 38/46: GEODE-5363: Rebase cleanup.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e2383f3ee640b927d0227d89e4d107edd953e0b8
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 19:16:55 2018 -0700
GEODE-5363: Rebase cleanup.
---
.../org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java | 3 ---
.../java/org/apache/geode/cache30/GlobalLockingDUnitTest.java | 0
.../apache/geode/management/internal/JMXMBeanFederationDUnitTest.java | 0
.../geode/management/internal/MBeanFederationErrorPathDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java | 3 ---
.../org/apache/geode/internal/cache/backup/BackupOperationTest.java | 3 ---
.../org/apache/geode/management/internal/BackupStatusImplTest.java | 3 ---
7 files changed, 12 deletions(-)
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
similarity index 99%
rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
index faed3fe..d4d5af4 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestRegionAPIDUnitTest.java
@@ -38,18 +38,15 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.springframework.http.MediaType;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class RestRegionAPIDUnitTest {
@ClassRule
public static ServerStarterRule server = new ServerStarterRule()
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/JMXMBeanFederationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/MBeanFederationErrorPathDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
index 690fbf0..21b99e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyJUnitTest.java
@@ -21,14 +21,11 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionAdvisor;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class PartitionedRegionDestroyJUnitTest {
private PartitionedRegion partitionedRegion;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
index 6adb998..77d99d6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupOperationTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.when;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.InOrder;
import org.apache.geode.distributed.internal.DistributionManager;
@@ -33,9 +32,7 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.backup.BackupOperation.MissingPersistentMembersProvider;
import org.apache.geode.management.BackupStatus;
import org.apache.geode.management.ManagementException;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupOperationTest {
private FlushToDiskFactory flushToDiskFactory;
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
index 0f165ec..81604ed 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/BackupStatusImplTest.java
@@ -24,14 +24,11 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.BackupStatus;
-import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
public class BackupStatusImplTest {
private Map<DistributedMember, Set<PersistentID>> backedUpDiskStores;
[geode] 34/46: GEODE-5363: Ignore inner classes.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 836dccd199b6b462bd0cb3765d54176dfc5b3c6c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 16:47:13 2018 -0700
GEODE-5363: Ignore inner classes.
---
geode-junit/build.gradle | 5 +++++
.../geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java | 1 +
2 files changed, 6 insertions(+)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 560cb42..e3c2268 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -58,3 +58,8 @@ test {
// Some tests have inner tests that should be ignored
exclude "**/*\$*.class"
}
+
+integrationTest {
+ // Some tests have inner tests that should be ignored
+ exclude "**/*\$*.class"
+}
diff --git a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
index 5458d15..d13d4c2 100644
--- a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
+++ b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ExecutorService;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.Result;
[geode] 43/46: GEODE-5363: Remove parallel changes.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 011a66a236802127eb378ced3dd6669f63556c11
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 08:10:27 2018 -0700
GEODE-5363: Remove parallel changes.
---
gradle/test.gradle | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 7ec5ced..61459ee 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -122,11 +122,6 @@ subprojects {
forkEvery 1
- if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
- if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
@@ -143,11 +138,6 @@ subprojects {
forkEvery 1
- if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
- if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
outputs.upToDateWhen{false}
}
@@ -162,11 +152,6 @@ subprojects {
forkEvery 1
- if (project.hasProperty('maxParallelForks'))
- maxParallelForks = project.maxParallelForks as int
- if (project.hasProperty('forkEvery'))
- forkEvery = project.forkEvery as int
-
outputs.upToDateWhen{false}
}
[geode] 33/46: GEODE-5363: Fixes tomcat tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6d7ecaf4b5b3b87e23e7e5bc061dd1e7cfa9c160
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 16:43:15 2018 -0700
GEODE-5363: Fixes tomcat tests.
---
.../test/java/org/apache/geode/modules/session/TestSessionsBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
index 41ecbc4..64ac4c3 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
@@ -60,7 +60,7 @@ public abstract class TestSessionsBase {
// Set up the servers we need
public static void setupServer(DeltaSessionManager manager) throws Exception {
- FileUtils.copyDirectory(Paths.get("..", "resources", "test", "tomcat").toFile(),
+ FileUtils.copyDirectory(Paths.get("..", "resources", "integrationTest", "tomcat").toFile(),
new File("./tomcat"));
port = AvailablePortHelper.getRandomAvailableTCPPort();
server = new EmbeddedTomcat("/test", port, "JVM-1");
[geode] 42/46: GEODE-5363: Remove acceptanceTest category
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 02d42d15d4245ab2ea24aeb1a28aff28db13887b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 07:41:24 2018 -0700
GEODE-5363: Remove acceptanceTest category
---
.../cli/commands/ConfigureEvictionThroughGfsh.java | 3 ---
.../cli/commands/DeployWithLargeJarTest.java | 3 ---
.../cli/commands/DestroyIndexIfExistsTest.java | 3 ---
.../cli/commands/GfshStartLocatorLogTest.java | 3 ---
.../cli/commands/ImportClusterConfigTest.java | 3 ---
...scribeConfigAreFullyRedactedAcceptanceTest.java | 3 ---
.../cli/commands/PutCommandWithJsonTest.java | 3 ---
.../cli/commands/StartLocatorAcceptanceTest.java | 3 ---
.../cli/commands/StatusLocatorRealGfshTest.java | 3 ---
.../cli/commands/StopServerAcceptanceTest.java | 3 ---
.../StopServerWithSecurityAcceptanceTest.java | 3 ---
.../cli/shell/GfshDisconnectWithinScript.java | 3 ---
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 3 ---
.../shell/StatusServerExitCodeAcceptanceTest.java | 3 ---
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 3 ---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 3 ---
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 3 ---
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 3 ---
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 3 ---
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 3 ---
.../PostgresJdbcAsyncWriterIntegrationTest.java | 3 ---
.../jdbc/PostgresJdbcDistributedTest.java | 3 ---
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 3 ---
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 3 ---
.../MySqlTableMetaDataManagerIntegrationTest.java | 3 ---
...ostgresTableMetaDataManagerIntegrationTest.java | 3 ---
.../TableMetaDataManagerIntegrationTest.java | 3 ---
.../test/junit/categories/AcceptanceTest.java | 26 ----------------------
30 files changed, 113 deletions(-)
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
index 710abc9..e40ec3a 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
@@ -22,16 +22,13 @@ import java.io.IOException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
// GEODE-1897 Users should be able to configure eviction through gfsh
-@Category(AcceptanceTest.class)
public class ConfigureEvictionThroughGfsh {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
index 82d0900..2cf835d 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
@@ -21,14 +21,11 @@ import java.util.stream.Collectors;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class DeployWithLargeJarTest {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
index f17f78c..12e47af 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
@@ -19,14 +19,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class DestroyIndexIfExistsTest {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
index dc9fc3b..b7169f4 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
@@ -22,14 +22,11 @@ import java.nio.charset.StandardCharsets;
import com.google.common.io.Files;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class GfshStartLocatorLogTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
index 2b6a38b..2da651b 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
@@ -21,15 +21,12 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.management.internal.configuration.ClusterConfigTestBase;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class ImportClusterConfigTest extends ClusterConfigTestBase {
private static final String locatorName = "locator";
private static final String serverNotShutDownName = "serverNotShutDown";
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
index 35a21a0..9a860c6 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
@@ -31,11 +31,9 @@ import org.assertj.core.api.SoftAssertions;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.examples.security.ExampleSecurityManager;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.util.test.TestUtil;
@@ -48,7 +46,6 @@ import org.apache.geode.util.test.TestUtil;
*
* Each password shares the string below for easier log scanning.
*/
-@Category(AcceptanceTest.class)
public class LogsAndDescribeConfigAreFullyRedactedAcceptanceTest {
private static String sharedPasswordString = "abcdefg";
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
index 6950b4b..4ccdb30 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
@@ -22,15 +22,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class PutCommandWithJsonTest {
private File jarToDeploy;
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
index faa80d6..0e9897e 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
@@ -18,14 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StartLocatorAcceptanceTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
index dfad50e..b8d6245 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
@@ -16,13 +16,10 @@ package org.apache.geode.management.internal.cli.commands;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StatusLocatorRealGfshTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
index 126c66b..3ccf59d 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
@@ -17,13 +17,10 @@ package org.apache.geode.management.internal.cli.commands;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StopServerAcceptanceTest {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
index 7d5405a..b58e1f2 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
@@ -24,16 +24,13 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StopServerWithSecurityAcceptanceTest {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
index 064aa1b..e2ebd32 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
@@ -17,12 +17,9 @@ package org.apache.geode.management.internal.cli.shell;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
-@Category(AcceptanceTest.class)
public class GfshDisconnectWithinScript {
@Rule
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
index f043ceb..2b07229 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
@@ -25,14 +25,12 @@ import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.process.PidFile;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
@@ -40,7 +38,6 @@ import org.apache.geode.test.junit.rules.gfsh.GfshScript;
/**
* See also org.apache.geode.management.internal.cli.shell.StatusServerExitCodeAcceptanceTest
*/
-@Category(AcceptanceTest.class)
public class StatusLocatorExitCodeAcceptanceTest {
private static File toolsJar;
private static final ThreePhraseGenerator nameGenerator = new ThreePhraseGenerator();
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
index 9d0e766..28277f8 100755
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
@@ -24,14 +24,12 @@ import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.process.PidFile;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
@@ -41,7 +39,6 @@ import org.apache.geode.test.junit.rules.gfsh.GfshScript;
/**
* See also org.apache.geode.management.internal.cli.shell.StatusLocatorExitCodeAcceptanceTest
*/
-@Category(AcceptanceTest.class)
public class StatusServerExitCodeAcceptanceTest {
private static File toolsJar;
private static final ThreePhraseGenerator nameGenerator = new ThreePhraseGenerator();
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index 819551b..c3da482 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -27,7 +27,6 @@ import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -40,9 +39,7 @@ import org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcAsyncWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index 4046244..4243799 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -35,7 +35,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCacheFactory;
@@ -49,14 +48,12 @@ import org.apache.geode.test.dunit.rules.ClientVM;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* End-to-end dunits for JDBC connector
*/
-@Category(AcceptanceTest.class)
public abstract class JdbcDistributedTest implements Serializable {
static final String DB_NAME = "test";
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
index 805f8b4..2febfb6 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -29,7 +29,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -45,9 +44,7 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.pdx.internal.AutoSerializableManager;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcLoaderIntegrationTest {
static final String DB_NAME = "test";
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
index dbdc18a..404d7c2 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -42,9 +41,7 @@ import org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
index 1391fb9..838b262 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcAsyncWriterIntegrationTest extends JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
index 7d79c70..a84d543 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
@@ -23,17 +23,14 @@ import java.sql.Statement;
import java.sql.Types;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(AcceptanceTest.class)
public class MySqlJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
index f74fd0b..30bc01d 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
@@ -20,13 +20,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
index 329b8c1..012ac1b 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
index dcaaaf0..fd3fb59 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcAsyncWriterIntegrationTest extends JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
index 0ec4eb5..f4931c9 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
@@ -22,16 +22,13 @@ import java.sql.Statement;
import java.sql.Types;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(AcceptanceTest.class)
public class PostgresJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
index f90a37c..f7d47d2 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
@@ -20,13 +20,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
index 7b324c3..7a5c76a 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
index e75472f..7684542 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlTableMetaDataManagerIntegrationTest extends TableMetaDataManagerIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
index 0697abd..7fca1fd 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresTableMetaDataManagerIntegrationTest
extends TableMetaDataManagerIntegrationTest {
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
index ffbebde..2136f4a 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
@@ -27,11 +27,8 @@ import java.sql.Types;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class TableMetaDataManagerIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
deleted file mode 100644
index 78b78fd..0000000
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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;
-
-/**
- * JUnit Test Category that specifies a test to determine whether or not a system satisfies the
- * acceptance criteria and to determine whether or not to accept the system.
- *
- * Based on definition by ISTQB.
- *
- * @see <a href="http://softwaretestingfundamentals.com/acceptance-testing/">Acceptance Testing</a>
- */
-public interface AcceptanceTest {
-}
[geode] 11/46: GEODE-5363: Moves geode-junit tests into new source
sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4dc60865a08abfaba4f65f1b1272df79b242d43a
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 21:42:34 2018 -0700
GEODE-5363: Moves geode-junit tests into new source sets.
---
geode-junit/build.gradle | 16 ++++++++++++++++
.../org/apache/geode/test/compiler/JarBuilderTest.java | 0
.../org/apache/geode/test/compiler/JavaCompilerTest.java | 0
.../test/concurrent/FileBasedCountDownLatchTest.java | 0
.../junit/rules/ExecutorServiceRuleIntegrationTest.java | 0
.../geode/test/junit/rules/TemporaryFileRuleTest.java | 0
6 files changed, 16 insertions(+)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index d467f0a..65517e9 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -37,3 +37,19 @@ dependencies {
compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
compile project(":geode-old-versions")
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java
rename to geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java
rename to geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
rename to geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
rename to geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
rename to geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
[geode] 30/46: GEODE-5363: Run integration tests from new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3a3331e433322b3d773c13b80241279bc0d9f65c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 14:31:54 2018 -0700
GEODE-5363: Run integration tests from new source set.
---
gradle/test.gradle | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index f8c883c..134bae9 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -83,7 +83,21 @@ subprojects {
}
}
+ sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ }
+
task integrationTest(type:Test) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.IntegrationTest'
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
[geode] 32/46: GEODE-5363: Removes IntegrationTest category.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76614c830a8d6657ea1109057e22a65da259fcba
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 16:28:55 2018 -0700
GEODE-5363: Removes IntegrationTest category.
---
.../session/installer/InstallerJUnitTest.java | 3 +-
.../SessionReplicationIntegrationJUnitTest.java | 3 +-
.../filter/SessionReplicationJUnitTest.java | 3 +-
.../SessionReplicationLocalCacheJUnitTest.java | 3 +-
.../modules/session/Tomcat7SessionsJUnitTest.java | 3 +-
.../modules/session/Tomcat6SessionsJUnitTest.java | 3 +-
.../modules/util/ModuleFunctionsSecurityTest.java | 3 +-
.../org/apache/geode/BundledJarsJUnitTest.java | 3 +-
.../management/internal/AgentUtilJUnitTest.java | 3 --
.../cli/commands/GemfireCoreClasspathTest.java | 3 --
.../StartLocatorCommandIntegrationTest.java | 3 --
.../StartServerCommandIntegrationTest.java | 3 --
.../internal/web/RestInterfaceIntegrationTest.java | 3 +-
.../internal/web/RestSecurityIntegrationTest.java | 3 +-
.../web/RestSecurityPostProcessorTest.java | 3 +-
.../rest/internal/web/RestSecurityWithSSLTest.java | 3 +-
.../internal/web/RestServersIntegrationTest.java | 3 +-
.../web/SwaggerVerificationIntegrationTest.java | 3 +-
.../PdxBasedCrudControllerIntegrationTest.java | 3 +-
.../RestQueryAndFunctionIntegrationTest.java | 3 +-
.../geode/tools/pulse/PulseConnectivityTest.java | 3 +-
.../geode/tools/pulse/PulseDataExportTest.java | 3 +-
.../tools/pulse/PulseJmxPasswordFileTest.java | 3 +-
.../tools/pulse/PulseSecurityIntegrationTest.java | 3 +-
.../geode/tools/pulse/PulseSecurityTest.java | 3 +-
.../tools/pulse/PulseSecurityWithSSLTest.java | 3 +-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 3 +-
.../cli/AlterConnectionCommandIntegrationTest.java | 3 +-
.../cli/AlterMappingCommandIntegrationTest.java | 3 +-
.../CreateConnectionCommandIntegrationTest.java | 3 +-
.../cli/CreateMappingCommandIntegrationTest.java | 3 +-
.../DestroyConnectionCommandIntegrationTest.java | 3 +-
.../cli/DestroyMappingCommandIntegrationTest.java | 3 +-
.../cli/JDBCConnectorFunctionsSecurityTest.java | 3 +-
.../java/org/apache/geode/CopyJUnitTest.java | 3 --
.../apache/geode/DiskInstantiatorsJUnitTest.java | 3 --
.../apache/geode/JtaNoninvolvementJUnitTest.java | 3 --
.../java/org/apache/geode/LonerDMJUnitTest.java | 3 +-
.../org/apache/geode/SetOperationTXJUnitTest.java | 3 --
.../apache/geode/TXExpirationIntegrationTest.java | 3 --
.../java/org/apache/geode/TXJUnitTest.java | 3 --
.../java/org/apache/geode/TXWriterJUnitTest.java | 3 --
.../org/apache/geode/TXWriterOOMEJUnitTest.java | 3 --
.../internal/BindDistributedSystemJUnitTest.java | 3 --
.../internal/CacheHealthEvaluatorJUnitTest.java | 3 --
.../internal/MemberHealthEvaluatorJUnitTest.java | 3 --
.../DeprecatedAgentLauncherIntegrationTest.java | 3 --
.../apache/geode/cache/CacheListenerJUnitTest.java | 3 --
.../ConcurrentRegionOperationIntegrationTest.java | 3 --
.../cache/ConnectionPoolFactoryJUnitTest.java | 3 +-
.../apache/geode/cache/PoolManagerJUnitTest.java | 3 +-
.../org/apache/geode/cache/ProxyJUnitTest.java | 2 --
.../cache/RegionExpirationIntegrationTest.java | 3 --
.../apache/geode/cache/RegionFactoryJUnitTest.java | 3 --
.../RemoveAllCacheListenerPeerRegressionTest.java | 3 --
.../geode/cache/ValueConstraintRegressionTest.java | 3 --
...ncEventQueueEvictionAndExpirationJUnitTest.java | 3 +-
.../SerialAsyncEventQueueImplJUnitTest.java | 3 +-
.../cache/client/ClientCacheFactoryJUnitTest.java | 3 +-
.../cache/client/ClientRegionFactoryJUnitTest.java | 3 +-
.../AutoConnectionSourceImplJUnitTest.java | 3 +-
.../internal/ConnectionPoolImplJUnitTest.java | 3 +-
.../cache/client/internal/LocatorSSLJUnitTest.java | 3 +-
.../client/internal/QueueManagerJUnitTest.java | 3 +-
.../pooling/ConnectionManagerJUnitTest.java | 3 +-
.../cache/execute/CoreFunctionSecurityTest.java | 3 --
.../mapInterface/ExceptionHandlingJUnitTest.java | 3 --
.../cache/mapInterface/MapFunctionalJUnitTest.java | 3 --
.../mapInterface/PutAllGlobalLockJUnitTest.java | 3 +-
.../operations/PutOperationContextJUnitTest.java | 3 --
.../internal/GetOperationContextImplJUnitTest.java | 3 --
.../cache/query/JoinQueriesIntegrationTest.java | 3 +-
.../cache/query/LocalQueryServiceJUnitTest.java | 3 +-
.../geode/cache/query/PdxStringQueryJUnitTest.java | 3 +-
.../apache/geode/cache/query/QueryJUnitTest.java | 3 +-
.../geode/cache/query/QueryServiceJUnitTest.java | 3 +-
.../cache/query/QueryServiceRegressionTest.java | 3 +-
.../geode/cache/query/QueryTestUtilsJUnitTest.java | 3 +-
.../QueryWithBucketParameterIntegrationTest.java | 3 +-
.../apache/geode/cache/query/RegionJUnitTest.java | 3 +-
.../geode/cache/query/TypedIteratorJUnitTest.java | 3 +-
.../cache/query/TypedJsonQueryIntegrationTest.java | 3 +-
.../functional/ComparisonOperatorsJUnitTest.java | 3 +-
.../cache/query/functional/ConstantsJUnitTest.java | 3 +-
.../cache/query/functional/CountStarJUnitTest.java | 3 +-
.../functional/CustomerOptimizationsJUnitTest.java | 3 +-
.../DistinctAndNonDistinctQueryJUnitTest.java | 3 +-
...tinctResultsWithDupValuesInRegionJUnitTest.java | 3 +-
.../cache/query/functional/FunctionJUnitTest.java | 3 +-
.../functional/GroupByPartitionedJUnitTest.java | 3 +-
.../functional/GroupByReplicatedJUnitTest.java | 3 +-
.../query/functional/INOperatorJUnitTest.java | 3 +-
.../query/functional/IUM6Bug32345ReJUnitTest.java | 3 +-
.../geode/cache/query/functional/IUMJUnitTest.java | 3 +-
.../functional/IUMRCompositeIteratorJUnitTest.java | 3 +-
.../IUMRMultiIndexesMultiRegionJUnitTest.java | 3 +-
.../functional/IUMRShuffleIteratorsJUnitTest.java | 3 +-
.../functional/IUMRSingleRegionJUnitTest.java | 3 +-
...IndependentOperandsInWhereClause2JUnitTest.java | 3 +-
.../functional/IndexCreationDeadLockJUnitTest.java | 3 +-
.../query/functional/IndexCreationJUnitTest.java | 3 +-
.../IndexMaintenanceAsynchJUnitTest.java | 3 +-
.../query/functional/IndexOnEntrySetJUnitTest.java | 3 +-
.../query/functional/IndexOperatorJUnitTest.java | 3 +-
.../functional/IndexPrimaryKeyUsageJUnitTest.java | 3 +-
.../IndexUsageInNestedQueryJUnitTest.java | 3 +-
.../IndexUsageWithAliasAsProjAtrbtJUnitTest.java | 3 +-
.../IndexUseMultFrmSnglCondJUnitTest.java | 3 +-
.../IndexWithSngleFrmAndMultCondQryJUnitTest.java | 3 +-
.../functional/IteratorTypeDefEmpJUnitTest.java | 3 +-
.../query/functional/IteratorTypeDefJUnitTest.java | 3 +-
.../IteratorTypeDefaultTypesJUnitTest.java | 3 +-
.../functional/IumMultConditionJUnitTest.java | 3 +-
.../query/functional/LikePredicateJUnitTest.java | 3 +-
.../query/functional/LimitClauseJUnitTest.java | 3 +-
.../functional/LogicalOperatorsJUnitTest.java | 3 +-
.../cache/query/functional/MiscJUnitTest.java | 3 +-
.../functional/MultiIndexCreationJUnitTest.java | 3 +-
.../functional/MultiRegionIndexUsageJUnitTest.java | 3 +-
.../query/functional/MultipleRegionsJUnitTest.java | 3 +-
.../functional/NegativeNumberQueriesJUnitTest.java | 3 +-
.../query/functional/NestedQueryJUnitTest.java | 3 +-
.../NonDistinctOrderByPartitionedJUnitTest.java | 3 +-
.../NonDistinctOrderByReplicatedJUnitTest.java | 3 +-
.../query/functional/NumericQueryJUnitTest.java | 3 +-
.../functional/OrderByPartitionedJUnitTest.java | 3 +-
.../functional/OrderByReplicatedJUnitTest.java | 3 +-
.../functional/ParameterBindingJUnitTest.java | 3 +-
.../functional/PdxGroupByPartitionedJUnitTest.java | 3 +-
.../functional/PdxGroupByReplicatedJUnitTest.java | 3 +-
.../query/functional/PdxOrderByJUnitTest.java | 3 +-
.../functional/QRegionInterfaceJUnitTest.java | 3 +-
.../QueryREUpdateInProgressJUnitTest.java | 7 ++---
.../query/functional/QueryUndefinedJUnitTest.java | 3 +-
.../functional/ReservedKeywordsJUnitTest.java | 3 +-
.../ResultsDataSerializabilityJUnitTest.java | 3 +-
.../query/functional/SelectToDateJUnitTest.java | 3 +-
.../functional/StructMemberAccessJUnitTest.java | 3 +-
.../TestNewFunctionSSorRSIntegrationTest.java | 3 +-
.../ArithmeticOperationsIntegrationTest.java | 3 +-
.../internal/CompiledGroupBySelectJUnitTest.java | 3 +-
.../CompiledJunctionInternalsJUnitTest.java | 3 +-
.../query/internal/CopyOnReadQueryJUnitTest.java | 3 +-
.../query/internal/ExecutionContextJUnitTest.java | 3 +-
.../query/internal/IndexManagerJUnitTest.java | 3 +-
.../query/internal/OrderByComparatorJUnitTest.java | 3 +-
.../internal/ProjectionAttributeJUnitTest.java | 3 +-
.../cache/query/internal/QCompilerJUnitTest.java | 3 +-
.../QueryFromClauseCanonicalizationJUnitTest.java | 3 +-
.../internal/QueryObserverCallbackJUnitTest.java | 3 +-
.../cache/query/internal/QueryTraceJUnitTest.java | 3 +-
.../cache/query/internal/QueryUtilsJUnitTest.java | 3 +-
.../AbstractIndexMaintenanceIntegrationTest.java | 3 +-
.../AsyncIndexUpdaterThreadShutdownJUnitTest.java | 3 +-
.../index/AsynchIndexMaintenanceJUnitTest.java | 3 +-
.../index/CompactRangeIndexIndexMapJUnitTest.java | 3 +-
.../internal/index/CompactRangeIndexJUnitTest.java | 3 +-
...ompactRangeIndexMaintenanceIntegrationTest.java | 3 +-
.../CompactRangeIndexQueryIntegrationTest.java | 3 +-
.../internal/index/CopyOnReadIndexJUnitTest.java | 3 +-
.../index/DeclarativeIndexCreationJUnitTest.java | 3 +-
.../internal/index/EquiJoinIntegrationTest.java | 3 +-
.../index/HashIndexMaintenanceIntegrationTest.java | 3 +-
.../index/HashIndexQueryIntegrationTest.java | 3 +-
.../index/IndexCreationInternalsJUnitTest.java | 3 +-
.../query/internal/index/IndexHintJUnitTest.java | 3 +-
.../cache/query/internal/index/IndexJUnitTest.java | 3 +-
.../internal/index/IndexMaintainceJUnitTest.java | 3 +-
.../internal/index/IndexMaintenanceJUnitTest.java | 3 +-
.../internal/index/IndexStatisticsJUnitTest.java | 3 +-
.../index/IndexTrackingQueryObserverJUnitTest.java | 3 +-
.../query/internal/index/IndexUseJUnitTest.java | 3 +-
.../IndexedMergeEquiJoinScenariosJUnitTest.java | 3 +-
.../internal/index/MapIndexStoreJUnitTest.java | 3 +-
.../index/MapRangeIndexMaintenanceJUnitTest.java | 3 +-
.../NewDeclarativeIndexCreationJUnitTest.java | 3 +-
.../internal/index/PartitionedIndexJUnitTest.java | 3 +-
.../PartitionedRegionEquiJoinIntegrationTest.java | 3 +-
.../index/PdxCopyOnReadQueryJUnitTest.java | 3 +-
...ProgRegionCreationIndexUpdateTypeJUnitTest.java | 3 +-
.../internal/index/RangeIndexAPIJUnitTest.java | 3 +-
.../RangeIndexMaintenanceIntegrationTest.java | 3 +-
.../partitioned/PRIndexStatisticsJUnitTest.java | 3 +-
.../query/partitioned/PRInvalidQueryJUnitTest.java | 3 +-
.../partitioned/PRQueryCacheClosedJUnitTest.java | 3 +-
.../cache/query/partitioned/PRQueryJUnitTest.java | 3 +-
.../partitioned/PRQueryNumThreadsJUnitTest.java | 3 +-
.../partitioned/PRQueryRegionClosedJUnitTest.java | 3 +-
.../PRQueryRegionDestroyedJUnitTest.java | 3 +-
.../query/transaction/QueryAndJtaJUnitTest.java | 3 +-
.../cache/snapshot/CacheSnapshotJUnitTest.java | 3 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 3 +-
.../geode/cache/snapshot/WanSnapshotJUnitTest.java | 3 +-
.../cache30/CacheXmlNotFoundRegressionTest.java | 3 --
.../CacheXmlParameterizationRegressionTest.java | 3 --
.../DefaultEvictionActionRegressionTest.java | 3 --
.../geode/cache30/DiskRegionIntegrationTest.java | 3 --
.../ShorteningExpirationTimeRegressionTest.java | 3 --
.../AnalyzeSerializablesJUnitTest.java | 3 +-
.../AbstractLauncherIntegrationTest.java | 3 --
.../DistributedSystemIntegrationJUnitTest.java | 3 +-
.../LauncherMemberMXBeanIntegrationTest.java | 3 --
.../apache/geode/distributed/LocatorJUnitTest.java | 3 +-
.../LocatorLauncherIntegrationTest.java | 3 --
...catorLauncherJmxManagerLocalRegressionTest.java | 3 --
...atorLauncherJmxManagerRemoteRegressionTest.java | 3 --
.../LocatorLauncherLocalFileIntegrationTest.java | 3 --
.../LocatorLauncherLocalIntegrationTest.java | 3 --
.../LocatorLauncherRemoteFileIntegrationTest.java | 3 --
.../LocatorLauncherRemoteIntegrationTest.java | 2 --
...cherRemoteWithCustomLoggingIntegrationTest.java | 3 --
.../distributed/ServerLauncherIntegrationTest.java | 3 --
.../ServerLauncherLocalFileIntegrationTest.java | 3 --
.../ServerLauncherLocalIntegrationTest.java | 3 --
.../ServerLauncherRemoteFileIntegrationTest.java | 3 --
.../ServerLauncherRemoteIntegrationTest.java | 3 --
...cherRemoteWithCustomLoggingIntegrationTest.java | 3 --
.../ServerLauncherWithProviderRegressionTest.java | 3 --
.../internal/CacheConfigIntegrationTest.java | 3 --
.../DefaultPropertiesGeneratorIntegrationTest.java | 3 --
.../InternalDistributedSystemJUnitTest.java | 3 +-
.../internal/InternalLocatorIntegrationTest.java | 3 --
.../LocatorLoadSnapshotIntegrationTest.java | 3 +-
.../deadlock/DeadlockDetectorIntegrationTest.java | 3 --
.../locks/DLockReentrantLockJUnitTest.java | 3 +-
.../internal/locks/DLockServiceLeakTest.java | 3 +-
.../internal/membership/MembershipJUnitTest.java | 3 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 3 +-
.../gms/locator/GMSLocatorRecoveryJUnitTest.java | 3 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 3 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 3 +-
.../gms/messenger/GMSQuorumCheckerJUnitTest.java | 3 +-
.../gms/messenger/JGroupsMessengerJUnitTest.java | 3 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 3 +-
.../internal/tcpserver/TCPServerSSLJUnitTest.java | 3 +-
.../internal/tcpserver/TcpServerJUnitTest.java | 3 +-
.../org/apache/geode/disttx/DistTXJUnitTest.java | 3 +-
.../geode/disttx/DistTXManagerImplJUnitTest.java | 3 +-
.../DistTXReleasesOffHeapOnCloseJUnitTest.java | 3 +-
.../apache/geode/disttx/DistTXWriterJUnitTest.java | 3 +-
.../geode/disttx/DistTXWriterOOMEJUnitTest.java | 3 +-
.../DistributedTXExpirationIntegrationTest.java | 3 +-
.../org/apache/geode/disttx/PRDistTXJUnitTest.java | 3 +-
.../AvailablePortHelperIntegrationTest.java | 3 --
.../geode/internal/AvailablePortJUnitTest.java | 3 --
.../internal/ClassPathLoaderIntegrationTest.java | 3 --
...eateRegionFactoryNewInstanceRegressionTest.java | 3 --
.../geode/internal/DeployedJarJUnitTest.java | 3 --
.../apache/geode/internal/InlineKeyJUnitTest.java | 3 --
.../geode/internal/JarDeployerDeadlockTest.java | 3 --
.../geode/internal/JarDeployerIntegrationTest.java | 3 --
.../geode/internal/PdxDeleteFieldJUnitTest.java | 3 +-
.../apache/geode/internal/PdxRenameJUnitTest.java | 3 +-
...qualityShouldUseArrayEqualsIntegrationTest.java | 3 --
.../internal/SSLConfigIntegrationJUnitTest.java | 3 +-
.../apache/geode/internal/SSLConfigJUnitTest.java | 3 +-
...edThreadPoolExecutorWithKeepAliveJUnitTest.java | 2 --
.../SystemFailureThreadCleanupRegressionTest.java | 3 +-
...ionCreateNotBeforeRegionInitRegressionTest.java | 3 --
.../cache/CacheLifecycleListenerJUnitTest.java | 3 --
.../internal/cache/CacheServiceJUnitTest.java | 3 --
.../CacheWriterGetOldValueIntegrationTest.java | 3 --
...tMessagesRegionCreationAndDestroyJUnitTest.java | 3 --
.../ClusterConfigurationLoaderIntegrationTest.java | 3 --
.../geode/internal/cache/ColocatedPRJUnitTest.java | 3 --
.../internal/cache/ComplexDiskRegionJUnitTest.java | 3 --
...urrentFlushingAndRegionOperationsJUnitTest.java | 3 --
.../cache/ConcurrentMapLocalJUnitTest.java | 3 --
.../cache/ConcurrentRegionOperationsJUnitTest.java | 3 --
...currentRollingAndRegionOperationsJUnitTest.java | 3 --
.../geode/internal/cache/ConflationJUnitTest.java | 3 --
.../CreatePRWithLocalExpirationRegressionTest.java | 3 --
...precatedCacheServerLauncherIntegrationTest.java | 2 --
...ccessExceptionDisablesServerRegressionTest.java | 3 --
.../geode/internal/cache/DiskIFJUnitTest.java | 3 --
.../internal/cache/DiskInitFileJUnitTest.java | 3 --
.../cache/DiskLruRegRecoveryJUnitTest.java | 3 --
.../cache/DiskOfflineCompactionJUnitTest.java | 3 --
.../geode/internal/cache/DiskOldAPIsJUnitTest.java | 3 --
.../DiskRandomOperationsAndRecoveryJUnitTest.java | 3 --
.../internal/cache/DiskRegCacheXmlJUnitTest.java | 3 --
.../cache/DiskRegCachexmlGeneratorJUnitTest.java | 3 --
.../internal/cache/DiskRegCbkChkJUnitTest.java | 3 --
.../DiskRegOplogSwtchingAndRollerJUnitTest.java | 3 --
.../internal/cache/DiskRegRecoveryJUnitTest.java | 3 --
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 2 --
...iskRegionChangingRegionAttributesJUnitTest.java | 3 --
.../internal/cache/DiskRegionClearJUnitTest.java | 3 --
.../DiskRegionIllegalArguementsJUnitTest.java | 3 --
.../DiskRegionIllegalCacheXMLvaluesJUnitTest.java | 3 --
.../geode/internal/cache/DiskRegionJUnitTest.java | 3 --
.../internal/cache/DiskStoreFactoryJUnitTest.java | 3 --
.../cache/DiskStoreImplIntegrationTest.java | 3 --
.../EnforceUniqueHostForLonerIntegrationTest.java | 3 --
...victionAttributesMutatorImplRegressionTest.java | 3 --
.../geode/internal/cache/FaultingInJUnitTest.java | 3 --
.../cache/FilterProfileConcurrencyTest.java | 3 --
.../internal/cache/InterruptDiskJUnitTest.java | 3 --
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 3 --
...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java | 3 --
.../LRUClearWithDiskRegionOpRegressionTest.java | 3 --
.../internal/cache/MapInterface2JUnitTest.java | 3 --
.../internal/cache/MapInterfaceJUnitTest.java | 3 --
.../MultipleOplogsRollingFeatureJUnitTest.java | 3 --
.../internal/cache/OfflineSnapshotJUnitTest.java | 3 --
.../geode/internal/cache/OplogFlushTest.java | 3 --
.../geode/internal/cache/OplogJUnitTest.java | 3 --
.../geode/internal/cache/OplogRVVJUnitTest.java | 3 --
.../cache/OplogTooManyFilesOpenRegressionTest.java | 3 --
.../internal/cache/OverflowOplogFlushTest.java | 3 --
.../cache/PRConcurrentMapOpsJUnitTest.java | 3 --
.../internal/cache/PRDataStoreMemoryJUnitTest.java | 3 --
.../cache/PRDataStoreMemoryOffHeapJUnitTest.java | 4 ---
.../apache/geode/internal/cache/PRTXJUnitTest.java | 3 --
.../PartitionedRegionAttributesMutatorTest.java | 3 --
.../cache/PartitionedRegionCreationJUnitTest.java | 3 --
.../cache/PartitionedRegionDataStoreJUnitTest.java | 3 --
...itionedRegionQueryEvaluatorIntegrationTest.java | 3 --
...rtitionedRegionSerializableObjectJUnitTest.java | 3 --
...itionedRegionSingleNodeOperationsJUnitTest.java | 3 --
.../cache/PartitionedRegionStatsJUnitTest.java | 3 --
.../PersistentPartitionedRegionJUnitTest.java | 3 --
.../internal/cache/RegionEntryFlagsJUnitTest.java | 3 --
.../internal/cache/RegionListenerJUnitTest.java | 3 --
...IteratorAfterLocalInvalidateRegressionTest.java | 3 --
.../cache/ReplaceWithOverflowJUnitTest.java | 3 --
.../internal/cache/SimpleDiskRegionJUnitTest.java | 3 --
.../internal/cache/TXManagerImplJUnitTest.java | 3 --
.../internal/cache/TXReservationMgrJUnitTest.java | 3 --
.../internal/cache/TombstoneCreationJUnitTest.java | 3 --
.../internal/cache/UpdateVersionJUnitTest.java | 3 --
.../backup/BackupFileCopierIntegrationTest.java | 3 --
.../backup/BackupInspectorIntegrationTest.java | 3 --
.../cache/backup/BackupIntegrationTest.java | 3 --
.../cache/backup/FileSystemBackupWriterTest.java | 3 --
.../cache/backup/UnixScriptGeneratorTest.java | 3 --
.../cache/backup/WindowsScriptGeneratorTest.java | 3 --
.../cache/control/MemoryMonitorJUnitTest.java | 3 --
.../control/MemoryMonitorOffHeapJUnitTest.java | 3 --
.../DiskRegOverflowAsyncGetInMemPerfJUnitTest.java | 3 --
.../DiskRegOverflowAsyncJUnitPerformanceTest.java | 3 --
...erflowSyncGetInMemPerfJUnitPerformanceTest.java | 3 --
.../DiskRegOverflowSyncJUnitPerformanceTest.java | 3 --
...skRegionOverflowAsyncRollingOpLogJUnitTest.java | 3 --
...iskRegionOverflowSyncRollingOpLogJUnitTest.java | 3 --
.../DiskRegionPersistOnlySyncJUnitTest.java | 3 --
.../DiskRegionRollOpLogJUnitPerformanceTest.java | 3 --
.../MultiThreadedOplogPerJUnitPerformanceTest.java | 3 --
.../LRUListWithAsyncSortingIntegrationTest.java | 3 +-
.../LRUListWithSyncSortingIntegrationTest.java | 3 +-
.../RegionEntryEvictionIntegrationTest.java | 3 +-
.../eviction/TransactionsWithOverflowTest.java | 3 --
.../FunctionExecutionOnLonerRegressionTest.java | 3 +-
.../ha/BlockingHARQAddOperationJUnitTest.java | 3 +-
.../cache/ha/BlockingHARQStatsJUnitTest.java | 3 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 3 +-
.../cache/ha/BlockingHARegionQueueJUnitTest.java | 3 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 3 +-
.../geode/internal/cache/ha/HARegionJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueIntegrationTest.java | 3 --
.../internal/cache/ha/HARegionQueueJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueStartStopJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 3 +-
.../DestroyEntryDuringCloseIntegrationTest.java | 3 --
.../DefaultDiskDirsIntegrationTest.java | 3 +-
.../cache/tier/sockets/AcceptorImplJUnitTest.java | 3 +-
.../CacheServerMaxConnectionsJUnitTest.java | 3 +-
...CacheServerSelectorMaxConnectionsJUnitTest.java | 3 +-
.../ClientHealthMonitorIntegrationTest.java | 3 +-
...ClientHealthMonitorSelectorIntegrationTest.java | 3 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 3 +-
.../sockets/FilterProfileIntegrationJUnitTest.java | 3 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 3 +-
.../sockets/ServerConnectionIntegrationTest.java | 3 +-
.../RegionVersionVectorIntegrationTest.java | 3 --
...ewayReceiverXmlParsingValidationsJUnitTest.java | 3 +-
.../AsyncEventQueueValidationsJUnitTest.java | 3 +-
...elGatewaySenderFlushedCoordinatorJUnitTest.java | 3 +-
.../cache/xmlcache/CacheXmlParserJUnitTest.java | 3 --
.../compression/SnappyCompressorJUnitTest.java | 3 --
.../datasource/AbstractPoolCacheJUnitTest.java | 3 --
.../internal/datasource/CleanUpJUnitTest.java | 3 --
.../ConnectionPoolCacheImplJUnitTest.java | 3 --
.../datasource/ConnectionPoolingJUnitTest.java | 3 --
.../datasource/DataSourceFactoryJUnitTest.java | 3 --
.../internal/datasource/RestartJUnitTest.java | 3 --
.../geode/internal/i18n/BasicI18nJUnitTest.java | 3 --
...hChildrenRollingFileHandlerIntegrationTest.java | 3 --
.../internal/jta/BlockingTimeOutJUnitTest.java | 3 --
.../geode/internal/jta/DataSourceJTAJUnitTest.java | 3 --
.../geode/internal/jta/ExceptionJUnitTest.java | 3 --
.../internal/jta/GlobalTransactionJUnitTest.java | 3 --
.../internal/jta/JtaIntegrationJUnitTest.java | 3 --
.../internal/jta/SetOperationJTAJUnitTest.java | 3 --
.../internal/jta/TransactionImplJUnitTest.java | 3 --
.../jta/TransactionManagerImplJUnitTest.java | 3 --
.../internal/jta/TransactionTimeOutJUnitTest.java | 3 --
.../internal/jta/UserTransactionImplJUnitTest.java | 3 --
.../internal/jta/functional/CacheJUnitTest.java | 3 --
.../logging/CacheLogRollingIntegrationTest.java | 3 +-
.../logging/DistributedSystemLogFileJUnitTest.java | 3 +-
.../internal/logging/LocatorLogFileJUnitTest.java | 3 +-
.../logging/LogServiceIntegrationJUnitTest.java | 3 +-
.../internal/logging/MergeLogFilesJUnitTest.java | 3 +-
.../logging/log4j/ConfigLocatorJUnitTest.java | 3 --
.../log4j/FastLoggerIntegrationJUnitTest.java | 3 --
.../FastLoggerWithDefaultConfigJUnitTest.java | 3 --
.../GeodeVerboseLogMarkerIntegrationTest.java | 3 --
.../CustomConfigWithCacheIntegrationTest.java | 3 --
.../CustomConfigWithLogServiceIntegrationTest.java | 3 --
.../net/ClientSocketFactoryIntegrationTest.java | 3 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../offheap/FreeListOffHeapRegionJUnitTest.java | 3 +-
.../geode/internal/offheap/InlineKeyJUnitTest.java | 3 +-
.../MemoryAllocatorFillPatternIntegrationTest.java | 3 +-
.../internal/offheap/OffHeapIndexJUnitTest.java | 3 +-
.../offheap/OffHeapLRURecoveryRegressionTest.java | 3 +-
.../offheap/OffHeapValidationJUnitTest.java | 3 +-
.../offheap/OldFreeListOffHeapRegionJUnitTest.java | 3 +-
.../offheap/TxReleasesOffHeapOnCloseJUnitTest.java | 3 +-
...BlockingProcessStreamReaderIntegrationTest.java | 3 --
.../BlockingProcessStreamReaderWindowsTest.java | 3 --
.../ControlFileWatchdogIntegrationTest.java | 3 --
.../ControllableProcessIntegrationTest.java | 3 --
.../FileProcessControllerIntegrationTest.java | 2 --
.../LocalProcessLauncherIntegrationTest.java | 3 --
.../process/NativeProcessUtilsIntegrationTest.java | 3 --
...BlockingProcessStreamReaderIntegrationTest.java | 3 --
.../internal/process/PidFileIntegrationTest.java | 3 --
.../ProcessControllerFactoryIntegrationTest.java | 3 --
...SecurityServiceFactoryShiroIntegrationTest.java | 3 +-
.../statistics/DiskSpaceLimitIntegrationTest.java | 3 +-
...DistributedSystemStatisticsIntegrationTest.java | 3 +-
...ributedSystemStatisticsTypeIntegrationTest.java | 3 +-
.../statistics/FileSizeLimitIntegrationTest.java | 3 +-
.../GemFireStatSamplerIntegrationTest.java | 3 +-
.../internal/statistics/LinuxSystemStatsTest.java | 3 +-
.../SimpleStatSamplerIntegrationTest.java | 3 +-
.../StatArchiveHandlerIntegrationTest.java | 3 +-
...veWithConsecutiveResourceInstGeneratorTest.java | 3 +-
...WithConsecutiveResourceInstIntegrationTest.java | 3 +-
...chiveWithMissingResourceTypeRegressionTest.java | 3 +-
.../StatArchiveWriterReaderIntegrationTest.java | 3 +-
.../statistics/StatSamplerIntegrationTest.java | 3 +-
.../StatTypesAreRolledOverRegressionTest.java | 3 +-
.../statistics/ValueMonitorIntegrationTest.java | 3 +-
.../internal/stats50/AtomicStatsJUnitTest.java | 3 --
.../ConcurrentHashMapIteratorJUnitTest.java | 3 --
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 3 --
.../concurrent/cm/ConcurrentHashMapJUnitTest.java | 3 --
.../concurrent/cm/CountedMapLoopsJUnitTest.java | 3 --
.../util/concurrent/cm/IntMapCheckJUnitTest.java | 3 --
.../util/concurrent/cm/MapCheckJUnitTest.java | 3 --
.../util/concurrent/cm/MapLoopsJUnitTest.java | 3 --
.../util/concurrent/cm/RLJBarJUnitTest.java | 3 --
.../concurrent/cm/StringMapLoopsJUnitTest.java | 3 --
.../FederatingManagerIntegrationTest.java | 3 +-
.../QueryDataFunctionIntegrationTest.java | 3 +-
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 3 +-
.../bean/stats/CacheServerStatsJUnitTest.java | 3 +-
.../management/bean/stats/DiskStatsJUnitTest.java | 3 +-
.../stats/DistributedSystemStatsJUnitTest.java | 3 +-
.../bean/stats/GatewayMBeanBridgeJUnitTest.java | 3 +-
.../bean/stats/GatewayReceiverStatsJUnitTest.java | 3 +-
.../bean/stats/MemberLevelStatsJUnitTest.java | 3 +-
.../bean/stats/RegionStatsJUnitTest.java | 3 +-
.../internal/beans/ManagementAdapterTest.java | 3 --
.../internal/beans/RegionMBeanAttributesTest.java | 3 --
.../internal/cli/GfshParserAutoCompletionTest.java | 3 +-
.../internal/cli/GfshParserConverterTest.java | 3 +-
.../internal/cli/GfshParserParsingTest.java | 3 +-
.../internal/cli/HeadlessGfshIntegrationTest.java | 3 +-
.../internal/cli/OptionAliasesParsingTest.java | 3 --
.../internal/cli/TableBuilderJUnitTest.java | 3 --
.../AlterRegionCommandIntegrationTest.java | 3 +-
.../ConfigurePDXCommandIntegrationTest.java | 3 +-
.../CreateRegionCommandIntegrationTest.java | 3 +-
.../DescribeConfigCommandIntegrationTest.java | 3 +-
.../DescribeConnectionCommandIntegrationTest.java | 3 +-
.../DescribeDiskStoreCommandIntegrationTest.java | 3 +-
.../commands/DescribeRegionIntegrationTest.java | 3 +-
.../cli/commands/ExportDataIntegrationTest.java | 3 --
.../cli/commands/ExportLogsIntegrationTest.java | 3 +-
.../cli/commands/GetCommandIntegrationTest.java | 3 --
.../cli/commands/GfshCommandIntegrationTest.java | 3 +-
.../commands/HTTPServiceSSLSupportJUnitTest.java | 3 --
.../cli/commands/ImportDataIntegrationTest.java | 3 --
.../cli/commands/IndexCommandsIntegrationTest.java | 3 +-
.../ListDiskStoreCommandIntegrationTest.java | 3 +-
.../cli/commands/ListRegionIntegrationTest.java | 3 +-
.../cli/commands/PutCommandIntegrationTest.java | 3 +-
.../cli/commands/QueryCommandIntegrationTest.java | 3 +-
.../ShowMetricsCommandIntegrationTest.java | 3 +-
.../cli/commands/StartMemberUtilsTest.java | 3 --
.../cli/commands/VersionCommandJUnitTest.java | 3 +-
.../GfshStatusCommandsIntegrationTest.java | 3 --
.../cli/domain/IndexDetailsIntegrationTest.java | 3 --
.../functions/CreateJndiBindingFunctionTest.java | 3 +-
.../functions/DataCommandFunctionJUnitTest.java | 3 +-
.../DataCommandFunctionWithPDXJUnitTest.java | 3 +-
.../functions/DestroyJndiBindingFunctionTest.java | 3 +-
.../ExportLogsFunctionIntegrationTest.java | 3 +-
.../internal/cli/functions/Geode3544JUnitTest.java | 3 --
.../cli/functions/ListJndiBindingFunctionTest.java | 3 +-
.../functions/SizeExportLogsFunctionFileTest.java | 3 +-
.../cli/functions/SizeExportLogsFunctionTest.java | 3 +-
.../internal/cli/help/HelperIntegrationTest.java | 3 --
.../cli/json/TypedJsonPdxIntegrationTest.java | 3 --
.../cli/shell/GfshConfigInitFileJUnitTest.java | 3 --
.../internal/cli/shell/GfshHistoryJUnitTest.java | 3 --
.../cli/shell/GfshMultilineCommandTest.java | 3 +-
.../cli/util/LogExporterIntegrationTest.java | 3 --
.../internal/cli/util/LogExporterTest.java | 3 --
.../internal/configuration/ZipUtilsJUnitTest.java | 3 --
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 3 --
.../internal/deployment/FunctionScannerTest.java | 3 +-
.../security/AccessControlMBeanJUnitTest.java | 3 +-
.../CacheServerMBeanAuthenticationJUnitTest.java | 3 --
.../CacheServerMBeanAuthorizationJUnitTest.java | 3 +-
...acheServerMBeanWithShiroIniIntegrationTest.java | 3 +-
.../internal/security/CliCommandsSecurityTest.java | 3 +-
.../security/DataCommandsSecurityTest.java | 3 +-
.../security/DeployCommandsSecurityTest.java | 3 +-
.../security/DiskStoreMXBeanSecurityJUnitTest.java | 3 +-
.../security/FileUploaderMBeanSecurityTest.java | 3 +-
.../security/GatewayReceiverMBeanSecurityTest.java | 3 +-
.../security/GatewaySenderMBeanSecurityTest.java | 3 +-
.../security/GfshCommandsPostProcessorTest.java | 3 +-
.../security/GfshCommandsSecurityTest.java | 3 +-
.../internal/security/JavaRmiServerNameTest.java | 3 --
.../internal/security/JmxPasswordFileTest.java | 3 --
.../LockServiceMBeanAuthorizationJUnitTest.java | 3 +-
.../internal/security/MBeanSecurityJUnitTest.java | 3 +-
.../ManagerMBeanAuthorizationJUnitTest.java | 3 +-
.../security/MemberMBeanSecurityJUnitTest.java | 3 +-
...urityServiceWithCustomRealmIntegrationTest.java | 3 +-
...SecurityServiceWithShiroIniIntegrationTest.java | 3 +-
.../ReadOpFileAccessControllerJUnitTest.java | 3 --
.../ShellCommandsControllerProcessCommandTest.java | 3 --
.../web/http/support/HttpRequesterTest.java | 3 --
.../memcached/DomainObjectsAsValuesJUnitTest.java | 3 --
.../memcached/GemcachedBinaryClientJUnitTest.java | 3 --
.../memcached/GemcachedDevelopmentJUnitTest.java | 2 --
.../geode/memcached/IntegrationJUnitTest.java | 3 --
.../geode/pdx/AutoSerializableJUnitTest.java | 3 +-
.../org/apache/geode/pdx/ByteSourceJUnitTest.java | 3 +-
.../geode/pdx/JSONFormatterBasicJUnitTest.java | 3 +-
.../apache/geode/pdx/JSONFormatterJUnitTest.java | 3 +-
.../pdx/OffHeapByteBufferByteSourceJUnitTest.java | 4 ---
.../geode/pdx/OffHeapByteSourceJUnitTest.java | 3 --
.../apache/geode/pdx/PdxAttributesJUnitTest.java | 3 +-
.../geode/pdx/PdxInstanceFactoryJUnitTest.java | 3 +-
.../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 3 +-
.../pdx/PdxInstanceLoaderIntegrationTest.java | 3 +-
.../apache/geode/pdx/PdxSerializableJUnitTest.java | 3 +-
.../org/apache/geode/pdx/PdxStringJUnitTest.java | 3 +-
.../geode/pdx/internal/MultipleCacheJUnitTest.java | 3 +-
.../java/org/apache/geode/redis/AuthJUnitTest.java | 3 +-
.../apache/geode/redis/ConcurrentStartTest.java | 3 +-
.../org/apache/geode/redis/HashesJUnitTest.java | 3 +-
.../org/apache/geode/redis/ListsJUnitTest.java | 3 +-
.../org/apache/geode/redis/RedisServerTest.java | 3 +-
.../java/org/apache/geode/redis/SetsJUnitTest.java | 3 +-
.../apache/geode/redis/SortedSetsJUnitTest.java | 3 +-
.../org/apache/geode/redis/StringsJunitTest.java | 3 +-
.../CacheFactoryWithSecurityObjectTest.java | 3 +-
.../geode/security/ExampleSecurityManagerTest.java | 3 +-
.../SecurityManagerLifecycleIntegrationTest.java | 3 +-
.../tests/MemberStarterRuleIntegrationTest.java | 3 --
.../golden/FailWithErrorInOutputJUnitTest.java | 3 --
.../golden/FailWithExtraLineInOutputJUnitTest.java | 3 --
...ailWithLineMissingFromEndOfOutputJUnitTest.java | 3 --
...WithLineMissingFromMiddleOfOutputJUnitTest.java | 3 --
.../FailWithLoggerErrorInOutputJUnitTest.java | 3 --
.../FailWithLoggerFatalInOutputJUnitTest.java | 3 --
.../FailWithLoggerWarnInOutputJUnitTest.java | 3 --
.../golden/FailWithSevereInOutputJUnitTest.java | 3 --
.../golden/FailWithWarningInOutputJUnitTest.java | 3 --
.../apache/geode/test/golden/PassJUnitTest.java | 3 --
.../golden/PassWithExpectedErrorJUnitTest.java | 3 --
.../golden/PassWithExpectedSevereJUnitTest.java | 3 --
.../golden/PassWithExpectedWarningJUnitTest.java | 3 --
.../test/process/ProcessWrapperJUnitTest.java | 3 --
.../apache/geode/cache/query/cq/CQJUnitTest.java | 3 +-
.../AnalyzeCQSerializablesJUnitTest.java | 3 +-
.../experimental/driver/AuthenticationTest.java | 3 +-
.../experimental/driver/DriverConnectionTest.java | 3 +-
.../driver/FunctionServiceIntegrationTest.java | 3 +-
.../driver/PostProcessingIntegrationTest.java | 3 +-
.../driver/QueryServiceIntegrationTest.java | 3 +-
.../experimental/driver/RegionIntegrationTest.java | 3 +-
.../apache/geode/experimental/driver/SSLTest.java | 3 +-
.../driver/ValueSerializerIntegrationTest.java | 3 +-
.../apache/geode/test/compiler/JarBuilderTest.java | 3 --
.../geode/test/compiler/JavaCompilerTest.java | 3 --
.../concurrent/FileBasedCountDownLatchTest.java | 3 --
.../rules/ExecutorServiceRuleIntegrationTest.java | 3 --
.../test/junit/rules/TemporaryFileRuleTest.java | 3 --
.../test/junit/categories/IntegrationTest.java | 21 -------------
.../geode/test/junit/categories/UnitTest.java | 36 ----------------------
.../lucene/LuceneIndexCreationIntegrationTest.java | 3 +-
.../LuceneIndexCreationOffHeapIntegrationTest.java | 3 +-
...eneIndexCreationPersistenceIntegrationTest.java | 3 +-
.../LuceneIndexMaintenanceIntegrationTest.java | 3 +-
.../cache/lucene/LuceneQueriesIntegrationTest.java | 3 +-
.../LuceneQueriesPersistenceIntegrationTest.java | 3 +-
...hRegionCreatedBeforeReindexIntegrationTest.java | 3 +-
...eriesWithReindexFlagEnabledIntegrationTest.java | 3 +-
.../NestedObjectSeralizerIntegrationTest.java | 3 +-
.../internal/LuceneServiceImplIntegrationTest.java | 3 +-
.../DumpDirectoryFilesIntegrationTest.java | 3 +-
.../repository/IndexRepositoryImplJUnitTest.java | 3 +-
...uceneIndexXmlGeneratorIntegrationJUnitTest.java | 3 +-
...onCreatedBeforeReindexIntegrationJUnitTest.java | 3 +-
...WithReindexFlagEnabledIntegrationJUnitTest.java | 3 +-
.../LuceneIndexXmlParserIntegrationJUnitTest.java | 3 +-
.../lucene/test/LuceneFunctionSecurityTest.java | 3 +-
.../AnalyzeLuceneSerializablesJUnitTest.java | 3 +-
.../protobuf/v1/AuthenticationIntegrationTest.java | 3 +-
.../protobuf/v1/AuthorizationIntegrationTest.java | 3 +-
.../v1/DisconnectClientIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 3 +-
.../v1/ProtocolVersionIntegrationTest.java | 3 +-
.../v1/ValueSerializerIntegrationTest.java | 3 +-
.../PutIfAbsentRequestIntegrationTest.java | 3 +-
.../controllers/PulseControllerJUnitTest.java | 3 +-
.../util/AutoBalancerIntegrationJUnitTest.java | 3 --
.../geode/cache/util/AutoBalancerJUnitTest.java | 3 --
.../AnalyzeWANSerializablesJUnitTest.java | 3 +-
.../cache/wan/misc/WANConfigurationJUnitTest.java | 3 +-
.../AnalyzeWebApiSerializablesJUnitTest.java | 3 +-
.../internal/cli/commands/CommandOverHttpTest.java | 3 +-
.../commands/ConnectCommandIntegrationTest.java | 3 +-
.../commands/ConnectCommandWithSecurityTest.java | 3 +-
.../ExportLogsOverHttpIntegrationTest.java | 3 +-
.../cli/commands/IndexCommandOverHttpTest.java | 3 +-
.../cli/commands/QueryCommandOverHttpTest.java | 3 +-
.../security/GfshCommandsOverHttpSecurityTest.java | 3 +-
.../internal/security/LogNoPasswordTest.java | 3 --
.../HttpOperationInvokerMBeanOperationTest.java | 3 --
.../shell/HttpOperationInvokerSecurityTest.java | 3 --
gradle/test.gradle | 1 -
644 files changed, 381 insertions(+), 1599 deletions(-)
diff --git a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index a8b4c2f..1b4e23b 100644
--- a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -28,10 +28,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
-@Category({IntegrationTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class InstallerJUnitTest {
@Rule
diff --git a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index 47c439a..0b23b4b 100644
--- a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++ b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -55,14 +55,13 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
import org.apache.geode.modules.session.junit.PerTestClassLoaderRunner;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
/**
* In-container testing using Jetty. This allows us to test context listener events as well as
* dispatching actions.
*/
-@Category({IntegrationTest.class, SessionTest.class})
+@Category({SessionTest.class})
@RunWith(PerTestClassLoaderRunner.class)
@SuppressWarnings("unchecked")
public class SessionReplicationIntegrationJUnitTest {
diff --git a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
index 2fc37fd..1f51ee0 100644
--- a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
+++ b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
@@ -22,13 +22,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
/**
* This runs all tests with a local cache disabled
*/
-@Category({IntegrationTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class SessionReplicationJUnitTest extends CommonTests {
@Before
diff --git a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
index a2dc5c0..3883aaa 100644
--- a/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
+++ b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
@@ -22,13 +22,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.modules.session.filter.SessionCachingFilter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
/**
* This runs all tests with a local cache enabled
*/
-@Category({IntegrationTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class SessionReplicationLocalCacheJUnitTest extends CommonTests {
@Before
diff --git a/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
index 98e0f44..2c048d5 100644
--- a/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
+++ b/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
@@ -26,9 +26,8 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.modules.session.catalina.Tomcat7DeltaSessionManager;
import org.apache.geode.test.junit.categories.HttpSessionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, HttpSessionTest.class})
+@Category({HttpSessionTest.class})
public class Tomcat7SessionsJUnitTest extends TestSessionsBase {
// Set up the session manager we need
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
index bd6d7c8..0cac7cc 100644
--- a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
+++ b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
@@ -18,10 +18,9 @@ import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SessionTest;
-@Category({IntegrationTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class Tomcat6SessionsJUnitTest extends TestSessionsBase {
// Set up the session manager we need
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
index 54c75c4..504b435 100644
--- a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
+++ b/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/util/ModuleFunctionsSecurityTest.java
@@ -28,13 +28,12 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.examples.SimpleSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class ModuleFunctionsSecurityTest {
private static final String RESULT_HEADER = "Message";
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java
index 8e99a7a..5f26144 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -33,11 +33,10 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.util.test.TestUtil;
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class BundledJarsJUnitTest {
private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
index 493051f..4d5b718 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
@@ -22,12 +22,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.GemFireVersion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class AgentUtilJUnitTest {
private AgentUtil agentUtil;
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
index 3546b79..2859174 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
@@ -29,11 +29,8 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class GemfireCoreClasspathTest {
@Test
public void testGemFireCoreClasspath() throws IOException {
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
index d4dc4e8..6488da1 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java
@@ -28,16 +28,13 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(IntegrationTest.class)
public class StartLocatorCommandIntegrationTest {
private static final String FAKE_HOSTNAME = "someFakeHostname";
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
index 1e6b7c2..82a7f80 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java
@@ -28,16 +28,13 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category(IntegrationTest.class)
public class StartServerCommandIntegrationTest {
private static final String FAKE_HOSTNAME = "someFakeHostname";
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
index d0b0d93..d0e0a4e 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java
@@ -75,7 +75,6 @@ import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
@@ -95,7 +94,7 @@ import org.apache.geode.test.junit.rules.RequiresGeodeHome;
* @see org.apache.geode.pdx.ReflectionBasedAutoSerializer
* @since Geode 1.0.0
*/
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class RestInterfaceIntegrationTest {
@Rule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 28a8414..b555991 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -30,14 +30,13 @@ import org.springframework.http.MediaType;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.examples.SimpleSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
+@Category({SecurityTest.class, RestAPITest.class})
public class RestSecurityIntegrationTest {
protected static final String REGION_NAME = "AuthRegion";
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
index 2f69feb..cfdfc3f 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java
@@ -36,14 +36,13 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.rest.internal.web.controllers.Customer;
import org.apache.geode.rest.internal.web.controllers.RedactingPostProcessor;
import org.apache.geode.security.TestSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
+@Category({SecurityTest.class, RestAPITest.class})
public class RestSecurityPostProcessorTest {
@ClassRule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
index d05acf3..f89c5ab 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java
@@ -33,14 +33,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
+@Category({SecurityTest.class, RestAPITest.class})
public class RestSecurityWithSSLTest {
private static final URL KEYSTORE_URL =
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
index b0af99d..66e6f8d 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java
@@ -28,13 +28,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class RestServersIntegrationTest {
private static GeodeDevRestClient restClient;
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
index 4631534..47e9804 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java
@@ -27,14 +27,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeHttpClientRule;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, RestAPITest.class})
+@Category({SecurityTest.class, RestAPITest.class})
public class SwaggerVerificationIntegrationTest {
@ClassRule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
index b4e9c8b..5609a02 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java
@@ -50,11 +50,10 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.management.internal.AgentUtil;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class PdxBasedCrudControllerIntegrationTest {
@Rule
public RequiresGeodeHome requiresGeodeHome = new RequiresGeodeHome();
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
index 6cbb5d6..3700622 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java
@@ -72,11 +72,10 @@ import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.management.internal.AgentUtil;
import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
-@Category({IntegrationTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class RestQueryAndFunctionIntegrationTest {
@Rule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
index b360ac5..16d0880 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.GeodeHttpClientRule;
@@ -39,7 +38,7 @@ import org.apache.geode.test.junit.rules.LocatorStarterRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.tools.pulse.internal.data.Cluster;
-@Category({IntegrationTest.class, PulseTest.class})
+@Category({PulseTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class PulseConnectivityTest {
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
index 972f5a4..a7cd607 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java
@@ -25,12 +25,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.rules.GeodeHttpClientRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, PulseTest.class})
+@Category({PulseTest.class})
public class PulseDataExportTest {
@Rule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
index d29b09d..4e6b091 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java
@@ -27,14 +27,13 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeHttpClientRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, PulseTest.class})
+@Category({SecurityTest.class, PulseTest.class})
public class PulseJmxPasswordFileTest {
@Rule
public LocatorStarterRule locator = new LocatorStarterRule();
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
index 68349c6..c7ccc3c 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java
@@ -25,14 +25,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.ManagementService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
import org.apache.geode.tools.pulse.internal.data.Cluster;
-@Category({IntegrationTest.class, SecurityTest.class, PulseTest.class})
+@Category({SecurityTest.class, PulseTest.class})
public class PulseSecurityIntegrationTest {
@Rule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
index 2159954..57c53dd 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java
@@ -26,7 +26,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
@@ -35,7 +34,7 @@ import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.tools.pulse.internal.data.Cluster;
-@Category({IntegrationTest.class, SecurityTest.class, PulseTest.class})
+@Category({SecurityTest.class, PulseTest.class})
public class PulseSecurityTest {
@ClassRule
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
index a357c2e..6096b49 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java
@@ -37,14 +37,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.security.SecurableCommunicationChannels;
import org.apache.geode.security.SimpleTestSecurityManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PulseTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.geode.test.junit.rules.GeodeHttpClientRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-@Category({IntegrationTest.class, SecurityTest.class, PulseTest.class})
+@Category({SecurityTest.class, PulseTest.class})
public class PulseSecurityWithSSLTest {
private static File jks =
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
index 24d88db..0e30238 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java
@@ -16,10 +16,9 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
index 87318c1..43c75a3 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
@@ -28,10 +28,9 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class AlterConnectionCommandIntegrationTest {
private InternalCache cache;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
index a47a09b..5410781 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
@@ -28,10 +28,9 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class AlterMappingCommandIntegrationTest {
private InternalCache cache;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
index 7f184a4..82fe3f2 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
@@ -30,10 +30,9 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class CreateConnectionCommandIntegrationTest {
private InternalCache cache;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
index 89a9dd1..dd9ce5e 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class CreateMappingCommandIntegrationTest {
private InternalCache cache;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
index 4157977..7fa9686 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
@@ -28,10 +28,9 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DestroyConnectionCommandIntegrationTest {
private String connectionName;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
index 040d9c3..1f71358 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
@@ -28,10 +28,9 @@ import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-@Category({IntegrationTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DestroyMappingCommandIntegrationTest {
private String regionName;
diff --git a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
index 155ec62..5dfe4ce 100644
--- a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
+++ b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.cli.CliFunction;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -48,7 +47,7 @@ class InheritsDefaultPermissionsJDBCFunction extends CliFunction<String> {
}
-@Category({IntegrationTest.class, SecurityException.class})
+@Category({SecurityException.class})
public class JDBCConnectorFunctionsSecurityTest {
@ClassRule
public static ServerStarterRule server = new ServerStarterRule().withJMXManager()
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java
index 2015190..634c244 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/CopyJUnitTest.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.UUID;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.WritablePdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the functionality of the {@link CopyHelper#copy} method and the builtin copy-on-get Cache
@@ -58,7 +56,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 4.0
*
*/
-@Category(IntegrationTest.class)
public class CopyJUnitTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
index 293cc45..2ca0533 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/DiskInstantiatorsJUnitTest.java
@@ -28,7 +28,6 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -39,13 +38,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.InternalInstantiator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class makes sure that instantatiors are persisted to disk and can be recovered.
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
public class DiskInstantiatorsJUnitTest {
private DistributedSystem ds = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
index dd569d4..78c667b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/JtaNoninvolvementJUnitTest.java
@@ -28,7 +28,6 @@ import javax.transaction.UserTransaction;
import org.junit.After;
import org.junit.FixMethodOrder;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.apache.geode.cache.AttributesFactory;
@@ -40,7 +39,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Ensure that the ignoreJTA Region setting works
@@ -49,7 +47,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*/
@SuppressWarnings("deprecation")
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(IntegrationTest.class)
public class JtaNoninvolvementJUnitTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java
index fabc7a8..6f870fe 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/LonerDMJUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.PureJavaMode;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -51,7 +50,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
* functions.
*/
@SuppressWarnings("deprecation")
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class LonerDMJUnitTest {
@After
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java
index 4e67398..e32be89 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/SetOperationTXJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
@@ -45,9 +44,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class SetOperationTXJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java
index aacd6ae..ba887ff 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXExpirationIntegrationTest.java
@@ -37,7 +37,6 @@ import junitparams.naming.TestCaseName;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.AttributesMutator;
@@ -57,14 +56,12 @@ import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxy;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests transaction expiration functionality
*
* @since GemFire 4.0
*/
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class TXExpirationIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
index 1b06668..1917b01 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXJUnitTest.java
@@ -41,7 +41,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.AttributesFactory;
@@ -101,14 +100,12 @@ import org.apache.geode.internal.cache.TXStateProxy;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests basic transaction functionality
*
* @since GemFire 4.0
*/
-@Category(IntegrationTest.class)
@SuppressWarnings("deprecated")
public class TXJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java
index 3abae72..52dc4e4 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterJUnitTest.java
@@ -23,7 +23,6 @@ import javax.transaction.RollbackException;
import javax.transaction.UserTransaction;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.CommitConflictException;
@@ -31,9 +30,7 @@ import org.apache.geode.cache.SynchronizationCommitConflictException;
import org.apache.geode.cache.TransactionEvent;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.cache.TransactionWriterException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class TXWriterJUnitTest extends TXWriterTestCase {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java
index 553d4a3..b56df7f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/TXWriterOOMEJUnitTest.java
@@ -18,21 +18,18 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.TransactionEvent;
import org.apache.geode.cache.TransactionWriter;
import org.apache.geode.cache.TransactionWriterException;
import org.apache.geode.internal.SystemFailureTestHook;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Extracted from TXWriterJUnitTest. The OOME is problematic and causes the test suite to fail due
* to suspect strings from SystemFailure Watchdog sending output to STDERR.
*
*/
-@Category(IntegrationTest.class)
public class TXWriterOOMEJUnitTest extends TXWriterTestCase {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
index d139587..08f9b4c 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/BindDistributedSystemJUnitTest.java
@@ -22,11 +22,9 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests {@link org.apache.geode.admin.internal.AdminDistributedSystemImpl}.
@@ -35,7 +33,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 3.5
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
public class BindDistributedSystemJUnitTest {
private static final int RETRY_ATTEMPTS = 3;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
index 04df388..1090dcc 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/CacheHealthEvaluatorJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.admin.GemFireHealth;
@@ -40,7 +39,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Contains simple tests for the {@link CacheHealthEvaluator}
@@ -49,7 +47,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 3.5
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
public class CacheHealthEvaluatorJUnitTest extends HealthEvaluatorTestCase {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
index 81bfcbc..56e4e47 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/internal/MemberHealthEvaluatorJUnitTest.java
@@ -22,14 +22,12 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.admin.GemFireHealth;
import org.apache.geode.admin.GemFireHealthConfig;
import org.apache.geode.internal.PureJavaMode;
import org.apache.geode.internal.statistics.GemFireStatSampler;
import org.apache.geode.internal.statistics.platform.ProcessStats;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Contains simple tests for the {@link MemberHealthEvaluator}.
@@ -38,7 +36,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 3.5
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
public class MemberHealthEvaluatorJUnitTest extends HealthEvaluatorTestCase {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
index aab2916..ed56333 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/admin/jmx/internal/DeprecatedAgentLauncherIntegrationTest.java
@@ -37,16 +37,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.admin.jmx.internal.AgentLauncher.Status;
import org.apache.geode.internal.lang.SystemUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.process.ProcessWrapper;
-@Category(IntegrationTest.class)
public class DeprecatedAgentLauncherIntegrationTest {
private String classpath;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java
index 12bfa57..912306c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/CacheListenerJUnitTest.java
@@ -28,14 +28,12 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.RegionMembershipListenerAdapter;
import org.apache.geode.cache.util.RegionRoleListenerAdapter;
import org.apache.geode.cache.util.TransactionListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for basic CacheListener feature. NOTE: these tests using a loner DistributedSystem and
@@ -44,7 +42,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 5.0
*/
-@Category(IntegrationTest.class)
public class CacheListenerJUnitTest {
private DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
index a62d33a..1c6442a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
@@ -28,7 +28,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.LocalRegion;
@@ -37,9 +36,7 @@ import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.internal.offheap.MemoryAllocatorImpl;
import org.apache.geode.internal.util.concurrent.ConcurrentMapWithReusableEntries;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ConcurrentRegionOperationIntegrationTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index baa1e97..980ea91 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -37,9 +37,8 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ConnectionPoolFactoryJUnitTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java
index 4d36f0f..71253b5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/PoolManagerJUnitTest.java
@@ -32,14 +32,13 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests PoolManager
*
* @since GemFire 5.7
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class PoolManagerJUnitTest {
private DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java
index f7cbf9b..4aca18a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/ProxyJUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for basic DataPolicy.EMPTY feature. NOTE: these tests using a loner DistributedSystem
@@ -50,7 +49,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 5.0
*/
-@Category(IntegrationTest.class)
public class ProxyJUnitTest {
private DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
index a718b51..6db7b56 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
@@ -34,16 +34,13 @@ import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.mockito.InOrder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Extracted from {@link RegionExpirationDistributedTest}.
*/
-@Category(IntegrationTest.class)
public class RegionExpirationIntegrationTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
index 7494fb1..0b27329 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
@@ -57,7 +57,6 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.CancelException;
@@ -67,14 +66,12 @@ import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for the RegionFactory class
*
* @since GemFire 5.0
*/
-@Category(IntegrationTest.class)
public class RegionFactoryJUnitTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
index e2c5189..21dd7d5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/RemoveAllCacheListenerPeerRegressionTest.java
@@ -28,13 +28,10 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class RemoveAllCacheListenerPeerRegressionTest {
private Cache cache;
private DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
index 76937ea..c29ce28 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/ValueConstraintRegressionTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Data;
@@ -32,7 +31,6 @@ import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Manager;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Verifies that value constraint is used by Region.put
@@ -40,7 +38,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* TRAC #32947: value constraint not enforced on Region.put or Region.create
*/
-@Category(IntegrationTest.class)
public class ValueConstraintRegressionTest {
private DistributedSystem distributedSystem;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
index ef9fde1..ddfa7e5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
@@ -47,9 +47,8 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, AEQTest.class})
+@Category({AEQTest.class})
public class AsyncEventQueueEvictionAndExpirationJUnitTest {
private AsyncEventQueue aeq;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index 666a0e8..d701dc2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -26,9 +26,8 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, AEQTest.class})
+@Category({AEQTest.class})
public class SerialAsyncEventQueueImplJUnitTest {
private InternalCache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index f3e0afd..70c76ab 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -57,7 +57,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for the ClientCacheFactory class
@@ -65,7 +64,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 6.5
*/
@FixMethodOrder(NAME_ASCENDING)
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientCacheFactoryJUnitTest {
private ClientCache clientCache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
index 39b3bb3..d6d9533 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
@@ -61,14 +61,13 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit test for the ClientRegionFactory class
*
* @since GemFire 6.5
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientRegionFactoryJUnitTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index f1cac4b..6176e13 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -75,10 +75,9 @@ import org.apache.geode.internal.cache.tier.sockets.TcpServerFactory;
import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@SuppressWarnings("deprecation")
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class AutoConnectionSourceImplJUnitTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index 0c82c7b..60a56b0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -41,9 +41,8 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.AvailablePort;
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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ConnectionPoolImplJUnitTest {
private static final String expectedRedundantErrorMsg =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
index bc9d942..a0b1ce2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
@@ -32,10 +32,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.net.SSLConfigurationFactory;
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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class LocatorSSLJUnitTest {
private final String SERVER_KEY_STORE =
TestUtil.getResourcePath(LocatorSSLJUnitTest.class, "cacheserver.keystore");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index b6cdb40..835f86c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -57,9 +57,8 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class QueueManagerJUnitTest {
private static final String expectedRedundantErrorMsg =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index cb2ef7c..9fb3d33 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -65,9 +65,8 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ConnectionManagerJUnitTest {
private static final long TIMEOUT = 30 * 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
index 6110dd6..dab4fbe 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/execute/CoreFunctionSecurityTest.java
@@ -24,7 +24,6 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.examples.SimpleSecurityManager;
@@ -80,13 +79,11 @@ import org.apache.geode.management.internal.configuration.functions.DownloadJarF
import org.apache.geode.management.internal.configuration.functions.GetClusterConfigurationFunction;
import org.apache.geode.management.internal.configuration.functions.GetRegionNamesFunction;
import org.apache.geode.management.internal.configuration.functions.RecreateCacheFunction;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ConnectionConfiguration;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class CoreFunctionSecurityTest {
private static final String RESULT_HEADER = "Message";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
index 852332c..07348ec 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/ExceptionHandlingJUnitTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -36,9 +35,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ExceptionHandlingJUnitTest {
private static DistributedSystem distributedSystem = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
index 55c1798..6a5d62d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/MapFunctionalJUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -35,9 +34,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MapFunctionalJUnitTest {
private static DistributedSystem distributedSystem = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index 55e3eff..7e3aa78 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -36,9 +36,8 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.DLockTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, DLockTest.class})
+@Category({DLockTest.class})
public class PutAllGlobalLockJUnitTest { // TODO: reformat
Region testRegion = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
index 93a4538..5d24cb4 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/PutOperationContextJUnitTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
@@ -32,9 +31,7 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class PutOperationContextJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
index dda1b86..10202db 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/operations/internal/GetOperationContextImplJUnitTest.java
@@ -23,16 +23,13 @@ import java.io.IOException;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.operations.PutOperationContextJUnitTest;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class GetOperationContextImplJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
index ed457429..9d75234 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/JoinQueriesIntegrationTest.java
@@ -27,10 +27,9 @@ import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@RunWith(JUnitParamsRunner.class)
public class JoinQueriesIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
index 62a4cf6..8418273 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/LocalQueryServiceJUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class LocalQueryServiceJUnitTest {
private IgnoredException ignoredException;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
index 9c9619c..0a8f4ca 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/PdxStringQueryJUnitTest.java
@@ -50,10 +50,9 @@ import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxString;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxStringQueryJUnitTest {
private static final int NO_INDEX = 0;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java
index 8ff2772..523e1a9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryJUnitTest.java
@@ -52,11 +52,10 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
@FixMethodOrder(NAME_ASCENDING)
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
index e3caea3..fd89796 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
@@ -32,10 +32,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryServiceJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
index 333e748..697d88b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryServiceRegressionTest.java
@@ -47,13 +47,12 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.QueryUtils;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Verifies bug fixes against QueryService
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryServiceRegressionTest {
private Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
index 0bf1d13..e0447d7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtilsJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.data.Numbers;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -39,7 +38,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryTestUtilsJUnitTest {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
index ad5f8ee..64dd0f1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryWithBucketParameterIntegrationTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -47,7 +46,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
* used. Different variation of hashset variables are passed to the function to check for
* errors.
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryWithBucketParameterIntegrationTest {
DefaultQuery queryExecutor;
LocalDataSet lds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java
index c8eb93e..bea5ee9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/RegionJUnitTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.internal.cache.EntrySnapshot;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -45,7 +44,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
* Created on January 31, 2005, 3:54 PM
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class RegionJUnitTest {
static String queries[] = {"status = 'active'", "status <> 'active'", "ID > 2", "ID < 1",
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
index 8446ed9..fa321e8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class TypedIteratorJUnitTest {
Region region;
QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
index fa62a5d..98992c6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/TypedJsonQueryIntegrationTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.management.internal.cli.json.GfJsonException;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
import org.apache.geode.management.internal.cli.json.TypedJson;
import org.apache.geode.management.internal.cli.json.TypedJsonPdxIntegrationTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -38,7 +37,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
* TODO: add real assertions
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class TypedJsonQueryIntegrationTest {
private static final String RESULT = "result";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
index 126c823..b1c49ec 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ComparisonOperatorsJUnitTest {
public ComparisonOperatorsJUnitTest() {}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
index 086b232..7ee67d3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ConstantsJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ConstantsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
index 6b4358c..d35a0ac 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
@@ -39,14 +39,13 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This test runs {Select COUNT(*) from /regionName [where clause]} queries on different types of
* regions with and without multiple indexes.
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CountStarJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
index ed885fb..4031085 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/CustomerOptimizationsJUnitTest.java
@@ -41,10 +41,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CustomerOptimizationsJUnitTest {
public CustomerOptimizationsJUnitTest() {}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
index ccd6f4d..28a6243 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctAndNonDistinctQueryJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class DistinctAndNonDistinctQueryJUnitTest {
static List data =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index b00d040..956f7ea 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class DistinctResultsWithDupValuesInRegionJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
index d6357e8..36e35b3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/FunctionJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.internal.CompiledLiteral;
import org.apache.geode.cache.query.internal.CompiledValue;
import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class FunctionJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
index 14f0d60..d5ca788 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
@@ -20,10 +20,9 @@ import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class GroupByPartitionedJUnitTest extends GroupByTestImpl {
// public static Test suite() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
index 170c24e..297668c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
@@ -18,10 +18,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class GroupByReplicatedJUnitTest extends GroupByTestImpl {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
index ce7e099..e9c8704 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/INOperatorJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class INOperatorJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
index e82ede0..42b79b3 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -48,7 +47,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
*
* Created on May 5, 2005, 10:32 AM
*/
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUM6Bug32345ReJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
index 367b94d..f7cfdf5 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUMJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
index 2062379..1703904 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.cache.query.data.PhoneNo;
import org.apache.geode.cache.query.data.Street;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUMRCompositeIteratorJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
index cfd19ed..51765d9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRMultiIndexesMultiRegionJUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.cache.query.data.Restricted;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUMRMultiIndexesMultiRegionJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
index 945b74f..948f5c0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRShuffleIteratorsJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Street;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUMRShuffleIteratorsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 609cdd3..c087671 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -55,10 +55,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IUMRSingleRegionJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
index 37426c8..529a974 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class IndependentOperandsInWhereClause2JUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
index 64056f6..c1d6fac 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationDeadLockJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexCreationDeadLockJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
index c3b5071..26c115c 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
@@ -80,10 +80,9 @@ import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexCreationJUnitTest {
private ObjectType resType1 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index e806e13..909fb1e 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexMaintenanceAsynchJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
index 65370cb..c3338ba 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOnEntrySetJUnitTest.java
@@ -42,10 +42,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexOnEntrySetJUnitTest {
private static String testRegionName = "regionName";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
index b39ec12..1756957 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
@@ -35,10 +35,9 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexOperatorJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
index f03011c..67b2d20 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexPrimaryKeyUsageJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
index 6406495..329c595 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexUsageInNestedQueryJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
index 9113936..19edb6b 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUsageWithAliasAsProjAtrbtJUnitTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexUsageWithAliasAsProjAtrbtJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
index a776da2..7527d4c 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexUseMultFrmSnglCondJUnitTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexUseMultFrmSnglCondJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
index d30c752..3726f9c 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
@@ -53,10 +53,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexWithSngleFrmAndMultCondQryJUnitTest {
StructType resType1 = null;
StructType resType2 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
index 735c668..6265f24 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
@@ -35,10 +35,9 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Manager;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class IteratorTypeDefEmpJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
index bf51442..856edee 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class IteratorTypeDefJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
index 71039d8..846286b 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Student;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class IteratorTypeDefaultTypesJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
index ff5d271..8edc222 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IumMultConditionJUnitTest {
StructType resType1 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
index a793333..70910b5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LikePredicateJUnitTest.java
@@ -50,10 +50,9 @@ import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class LikePredicateJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index 15d82e1..a54e5ae 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class LimitClauseJUnitTest {
Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
index 6ee3318..d2defd8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class LogicalOperatorsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
index b0b5f3f..aebe178 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MiscJUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Data;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class MiscJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
index b7004da..29fc934 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiIndexCreationJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.HashIndex;
import org.apache.geode.cache.query.internal.index.PrimaryKeyIndex;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class MultiIndexCreationJUnitTest {
private static String regionName = "portfolios";
private String prRegionName = "prPortfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index e5e46a7..ab95bef 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -56,11 +56,10 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
// TODO:TEST clean this up and add assertions
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class MultiRegionIndexUsageJUnitTest {
private static final String indexName = "queryTest";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
index 1ec0283..d9c847f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/MultipleRegionsJUnitTest.java
@@ -29,10 +29,9 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Data;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class MultipleRegionsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index 7265b39..1d2bd14 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -42,11 +42,10 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Numbers;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
// TODO:TEST clean this up and add assertions
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NegativeNumberQueriesJUnitTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
index 4d29584..9ce776f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NestedQueryJUnitTest.java
@@ -50,10 +50,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.StructImpl;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NestedQueryJUnitTest {
private ObjectType resType1 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
index bfa8c0d..32b0238 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NonDistinctOrderByPartitionedJUnitTest extends NonDistinctOrderByTestImplementation {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
index 9ea5492..ebe7b5c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NonDistinctOrderByReplicatedJUnitTest extends NonDistinctOrderByTestImplementation {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
index ec0caed..8e12485 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.cache.query.data.Numbers;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NumericQueryJUnitTest {
private static String testRegionName = "testRegion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index 5a7d779..6e4b1fd 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -42,10 +42,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.dunit.TestObject;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class OrderByPartitionedJUnitTest extends OrderByTestImplementation {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
index b965f9d..55a0eaf 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByReplicatedJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.types.ObjectType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class OrderByReplicatedJUnitTest extends OrderByTestImplementation {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
index 0b45e6f..a5396c2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
@@ -42,10 +42,9 @@ import org.apache.geode.cache.query.MultithreadedTester;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ParameterBindingJUnitTest {
String regionName = "Portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
index 60c1432..a04b13b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByPartitionedJUnitTest.java
@@ -20,10 +20,9 @@ import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxGroupByPartitionedJUnitTest extends PdxGroupByTestImpl {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
index b8733a2..807abc1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxGroupByReplicatedJUnitTest.java
@@ -18,11 +18,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxGroupByReplicatedJUnitTest extends PdxGroupByTestImpl {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
index 394fbf9..7e71bc8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/PdxOrderByJUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.cache.query.internal.index.RangeIndex;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxOrderByJUnitTest {
private final String rootRegionName = "root";
private final String regionName = "PdxTest";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
index a613c48..07dd10b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
@@ -35,10 +35,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QRegionInterfaceJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
index d528a3b..ee1d23c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -50,9 +49,9 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
*
*
*/
-@Category({IntegrationTest.class, FlakyTest.class, OQLIndexTest.class}) // GEODE-1059: uses
- // PRQueryHelper which
- // launches
+@Category({FlakyTest.class, OQLIndexTest.class}) // GEODE-1059: uses
+ // PRQueryHelper which
+ // launches
// dunit vms in IntegrationTest
public class QueryREUpdateInProgressJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
index 8411e35..304d5e9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.pdx.JSONFormatter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryUndefinedJUnitTest implements Serializable {
private static String regionName = "test";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
index f755310..0b71e18 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ReservedKeywordsJUnitTest.java
@@ -27,10 +27,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.data.Keywords;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ReservedKeywordsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
index 9da7ef9..3539bc6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/ResultsDataSerializabilityJUnitTest.java
@@ -55,14 +55,13 @@ import org.apache.geode.cache.query.internal.types.MapTypeImpl;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
import org.apache.geode.internal.DataSerializableFixedID;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test whether query results are DataSerializable
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ResultsDataSerializabilityJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
index bcf8cdb..274ffdd 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
@@ -40,10 +40,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class SelectToDateJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
index ba617e9..6046a16 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.StructSet;
import org.apache.geode.cache.query.types.CollectionType;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class StructMemberAccessJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
index 062aa15..d6e6e40 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/TestNewFunctionSSorRSIntegrationTest.java
@@ -38,13 +38,12 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* TODO: does this test provide any valuable coverage?
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class TestNewFunctionSSorRSIntegrationTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
index 442146d..7caf951 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ArithmeticOperationsIntegrationTest.java
@@ -32,11 +32,10 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ArithmeticOperationsIntegrationTest {
@Rule
public ServerStarterRule serverStarterRule = new ServerStarterRule().withAutoStart();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
index 14afc9f..fd56145 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
@@ -30,10 +30,9 @@ import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CompiledGroupBySelectJUnitTest {
private Region rgn;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
index a578ca0..862cb03 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
@@ -49,10 +49,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CompiledJunctionInternalsJUnitTest {
Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
index 336c2ab..8237130 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/CopyOnReadQueryJUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CopyOnReadQueryJUnitTest {
private static int numObjects = 10;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
index ffd29a4..24ffbe2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ExecutionContextJUnitTest {
boolean failure = false;
String exceptionStr = "";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
index c7f2498..c82f87e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/IndexManagerJUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexData;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.IndexUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexManagerJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
index d03a943..6495a17 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/OrderByComparatorJUnitTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.types.StructTypeImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class OrderByComparatorJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
index c4f3e3e..c140cbc 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Quote;
import org.apache.geode.cache.query.data.Restricted;
import org.apache.geode.cache.query.types.StructType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ProjectionAttributeJUnitTest {
String queries[] = {"select distinct p from /pos p where p.ID > 0 ", // ResultSet
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
index 1c2163c..b056789 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
@@ -35,10 +35,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QCompilerJUnitTest {
QueryExecutionContext context = new QueryExecutionContext(null, null);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
index f5c15e9..fbaff0e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryFromClauseCanonicalizationJUnitTest {
Region region = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
index d0e4399..eaedf64 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryObserverCallbackJUnitTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryObserverCallbackJUnitTest {
private Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
index 3a844f4..dab8649 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
@@ -41,10 +41,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.CompactRangeIndex;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryTraceJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
index c725aa7..e4ce4c0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/QueryUtilsJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.cache.query.data.Address;
import org.apache.geode.cache.query.data.Employee;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryUtilsJUnitTest {
private Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
index 6a5f797..ec1dd7d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AbstractIndexMaintenanceIntegrationTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.pdx.internal.PdxString;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public abstract class AbstractIndexMaintenanceIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index 22581f5..394633b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.index.IndexManager.IndexUpdaterThread;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.logging.LoggingThreadGroup;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -42,7 +41,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
*
*
*/
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class AsyncIndexUpdaterThreadShutdownJUnitTest {
String name = "PR_with_Async_Index";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index 0f15291..dc27151 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class AsynchIndexMaintenanceJUnitTest {
private QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
index 2797851..4422041 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexIndexMapJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CompactRangeIndexIndexMapJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
index bcf8c33..3550f97 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexJUnitTest.java
@@ -42,10 +42,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.cache.query.internal.DefaultQuery.TestHook;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CompactRangeIndexJUnitTest {
private QueryTestUtils utils;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
index d2d49dd..1e21111 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexMaintenanceIntegrationTest.java
@@ -20,10 +20,9 @@ import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CompactRangeIndexMaintenanceIntegrationTest
extends AbstractIndexMaintenanceIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
index a31e41d..14164c7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CompactRangeIndexQueryIntegrationTest.java
@@ -33,11 +33,10 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.PortfolioPdx;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CompactRangeIndexQueryIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index 32f060a..acee51e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CopyOnReadIndexJUnitTest {
static int numObjects = 10;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index 5a11e80..947766d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -38,11 +38,10 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.util.test.TestUtil;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class DeclarativeIndexCreationJUnitTest {
private DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
index e1f61e1..d0b6a9d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/EquiJoinIntegrationTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.TypeMismatchException;
import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class EquiJoinIntegrationTest {
QueryService qs;
Region region1, region2, region3, region4;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
index 9247bcb..9655f44 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexMaintenanceIntegrationTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class HashIndexMaintenanceIntegrationTest extends AbstractIndexMaintenanceIntegrationTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
index 2cc72fb..8f0edeb 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/HashIndexQueryIntegrationTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class HashIndexQueryIntegrationTest {
private QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
index 8546379..f3b5b13 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.query.internal.types.TypeUtils;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexCreationInternalsJUnitTest {
protected String childThreadName1 = "";
protected String childThreadName2 = "";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
index 8b1fefe..62629c5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexHintJUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.TXManagerImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexHintJUnitTest {
private Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
index 3c52c7a..926f0c5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
@@ -33,10 +33,9 @@ import org.apache.geode.cache.query.Index;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexJUnitTest {
private static final String indexName = "testIndex";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
index 6b06aca..01e43d0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
@@ -49,11 +49,10 @@ import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexMaintainceJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
index d6d0fed..88c3c7d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexMaintenanceJUnitTest.java
@@ -57,10 +57,9 @@ import org.apache.geode.cache.query.internal.index.MemoryIndexStore.MemoryIndexS
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexMaintenanceJUnitTest {
private QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
index e9fdfd7..d8c6552 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.cache.query.data.Position;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexStatisticsJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index 0aa9071..ac6f17c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -40,10 +40,9 @@ import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInf
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexTrackingQueryObserverJUnitTest {
static QueryService qs;
static Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
index 7c10aad..69c5811 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexUseJUnitTest.java
@@ -51,10 +51,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexUseJUnitTest {
private Region region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
index d1b1532..a7da920 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.cache.query.data.Village;
import org.apache.geode.cache.query.functional.StructSetOrResultsSet;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexedMergeEquiJoinScenariosJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
index 82297f1..f27b356 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapIndexStoreJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionEntryContext;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeap;
import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -47,7 +46,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
* IndexStorage
*
*/
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class MapIndexStoreJUnitTest {
IndexStore indexDataStructure;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index 6d11fbf..6295207 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.cache.query.data.Instrument;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class MapRangeIndexMaintenanceJUnitTest {
private static final String INDEX_NAME = "keyIndex1";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index ca4ffac..363ffd6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -38,13 +38,12 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* @since GemFire 6.6.1
*/
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class NewDeclarativeIndexCreationJUnitTest {
private static final String CACHE_XML_FILE_NAME = "cachequeryindex.xml";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
index fcd075d..d131092 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
@@ -26,10 +26,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PartitionedIndexJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
index 001ab97..a737c29 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PartitionedRegionEquiJoinIntegrationTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PartitionedRegionEquiJoinIntegrationTest extends EquiJoinIntegrationTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index e28d530..ac86d08 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PdxCopyOnReadQueryJUnitTest {
private Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 2f0b7ef..dacc66c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class ProgRegionCreationIndexUpdateTypeJUnitTest {
private Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
index e529bd9..0da2b1b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexAPIJUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.cache.query.internal.QueryExecutionContext;
import org.apache.geode.cache.query.internal.RuntimeIterator;
import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class RangeIndexAPIJUnitTest {
private Region region = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
index 0e82ff7..8653b20 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/RangeIndexMaintenanceIntegrationTest.java
@@ -20,10 +20,9 @@ import org.apache.geode.cache.query.IndexExistsException;
import org.apache.geode.cache.query.IndexNameConflictException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class RangeIndexMaintenanceIntegrationTest extends AbstractIndexMaintenanceIntegrationTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
index 95fc104..9deb88e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache.query.internal.index.IndexProtocol;
import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({IntegrationTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PRIndexStatisticsJUnitTest {
static QueryService qs;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
index d68eca0..a168764 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
@@ -21,7 +21,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -31,7 +30,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRInvalidQueryJUnitTest {
String regionName = "Portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
index 5c30328..a84d284 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -42,7 +41,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryCacheClosedJUnitTest {
// PR Region name
static final String regionName = "portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
index bfb03fa..d99db09 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -42,7 +41,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryJUnitTest {
String regionName = "portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
index a7fe67c..ddba865 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.PRQueryProcessor;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -38,7 +37,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryNumThreadsJUnitTest {
String regionName = "portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
index bf90e5b..ba60227 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -41,7 +40,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryRegionClosedJUnitTest {
static final String regionName = "portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index 1305d0b..a386d91 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -42,7 +41,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryRegionDestroyedJUnitTest {
// PR Region name
static final String regionName = "portfolios";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
index 9a34095..1b73372 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
@@ -52,10 +52,9 @@ import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.jta.CacheUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({IntegrationTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryAndJtaJUnitTest {
private Region currRegion;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
index a2c4048..d6db851 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/CacheSnapshotJUnitTest.java
@@ -27,10 +27,9 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.snapshot.RegionGenerator.RegionType;
import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
-@Category({IntegrationTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class CacheSnapshotJUnitTest extends SnapshotTestCase {
@Test
public void testExportAndImport() throws Exception {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
index 51f554d..e9dd9bb 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
-@Category({IntegrationTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class RegionSnapshotJUnitTest extends SnapshotTestCase {
private File snapshotFile;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
index 17950fa..3d1cdf7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/snapshot/WanSnapshotJUnitTest.java
@@ -32,10 +32,9 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
-@Category({IntegrationTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class WanSnapshotJUnitTest extends SnapshotTestCase {
private Region<Integer, MyObject> region;
private WanListener wan;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
index 1b1993e..2657380 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlNotFoundRegressionTest.java
@@ -22,14 +22,11 @@ import java.util.Properties;
import java.util.Scanner;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class CacheXmlNotFoundRegressionTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
index 1c9ab62..fbb1043 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest.java
@@ -26,19 +26,16 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TRAC #40255: Parameterization of XML configuration file
*/
-@Category(IntegrationTest.class)
@Ignore("Test is broken and was named *JUnitDisabledTest")
public class CacheXmlParameterizationRegressionTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
index e04584e..6550cf7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DefaultEvictionActionRegressionTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -33,7 +32,6 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for Bug no. 40662. To verify the default action being set in eviction attributes by
@@ -45,7 +43,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 6.6
*/
-@Category(IntegrationTest.class)
public class DefaultEvictionActionRegressionTest {
private static final String BUG_40662_XML = DefaultEvictionActionRegressionTest.class
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
index 2c93521..24df0d6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache30/DiskRegionIntegrationTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.Cache;
@@ -56,7 +55,6 @@ import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.CountLRUEviction;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the functionality of cache regions whose contents may be written to disk.
@@ -64,7 +62,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 3.2
*/
-@Category(IntegrationTest.class)
public class DiskRegionIntegrationTest {
private static final String REGION_NAME = "testRegion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
index 0702a82..6be212f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.Cache;
@@ -39,7 +38,6 @@ import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* If a new expiration time is specified that is shorter than an existing one, ensure the new
@@ -50,7 +48,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 7.0
*/
-@Category(IntegrationTest.class)
public class ShorteningExpirationTimeRegressionTest {
private static final int LONG_WAIT_MS = 2 * 60 * 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index e8bc11a..80dc813 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -73,10 +73,9 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class AnalyzeSerializablesJUnitTest {
private static final String NEW_LINE = System.getProperty("line.separator");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
index 9b0bedf..47661cc 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/AbstractLauncherIntegrationTest.java
@@ -27,16 +27,13 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for {@link AbstractLauncher} that require file system I/O.
*/
-@Category(IntegrationTest.class)
public class AbstractLauncherIntegrationTest {
private File propertiesFile;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
index badd4df..5c27045 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
@@ -28,13 +28,12 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Integration tests for DistributedSystem class. These tests require file system I/O.
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributedSystemIntegrationJUnitTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
index 7cda2cb..2b06c46 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherMemberMXBeanIntegrationTest.java
@@ -32,13 +32,11 @@ import javax.management.QueryExp;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.process.ControllableProcess;
import org.apache.geode.internal.process.ProcessType;
import org.apache.geode.management.MemberMXBean;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for querying of {@link MemberMXBean} as used in MBeanProcessController to
@@ -49,7 +47,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class LauncherMemberMXBeanIntegrationTest extends LauncherIntegrationTestCase {
private ObjectName pattern;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java
index 1baa266..9f0c4ce 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -58,11 +58,10 @@ import org.apache.geode.internal.OSProcess;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusRequest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class LocatorJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
index a5c20f4..20c157c 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java
@@ -35,19 +35,16 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link LocatorLauncher} as an in-process API within an existing JVM.
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherIntegrationTest {
private static final String CURRENT_DIRECTORY = System.getProperty("user.dir");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
index a465070..4f6cd62 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerLocalRegressionTest.java
@@ -28,10 +28,8 @@ import java.util.Set;
import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Regression tests for stopping a JMX Manager process launched with {@link LocatorLauncher}.
@@ -42,7 +40,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* Refactored from LocatorLauncherAssemblyIntegrationTest which used to be in geode-assembly.
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherJmxManagerLocalRegressionTest
extends LocatorLauncherIntegrationTestCase {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
index ded6a72..4367a40 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherJmxManagerRemoteRegressionTest.java
@@ -21,9 +21,7 @@ import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTC
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Regression tests for stopping a JMX Manager process launched with {@link LocatorLauncher}.
@@ -34,7 +32,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* Refactored from LocatorLauncherAssemblyIntegrationTest which used to be in geode-assembly.
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherJmxManagerRemoteRegressionTest
extends LocatorLauncherRemoteIntegrationTestCase {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
index 3ae64c1..d009e2a 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalFileIntegrationTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.distributed;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessControllerFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link LocatorLauncher} as an in-process API within an existing JVM
@@ -31,7 +29,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherLocalFileIntegrationTest extends LocatorLauncherLocalIntegrationTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
index 4beffd8..8fb139e 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -32,7 +32,6 @@ import java.net.InetAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.distributed.LocatorLauncher.LocatorState;
@@ -40,14 +39,12 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessControllerFactory;
import org.apache.geode.internal.process.ProcessType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link LocatorLauncher} as an in-process API within an existing JVM.
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherLocalIntegrationTest extends LocatorLauncherIntegrationTestCase {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
index 6bfba2d..cee83d1 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteFileIntegrationTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.LocatorLauncher.Builder;
import org.apache.geode.internal.process.ProcessControllerFactory;
import org.apache.geode.lang.AttachAPINotFoundException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@code LocatorLauncher} as an application main in a forked JVM
@@ -35,7 +33,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherRemoteFileIntegrationTest extends LocatorLauncherRemoteIntegrationTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
index 6b75eca..435c06b 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -33,14 +33,12 @@ import org.apache.geode.distributed.LocatorLauncher.LocatorState;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessControllerFactory;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@code LocatorLauncher} as an application main in a forked JVM.
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherRemoteIntegrationTest extends LocatorLauncherRemoteIntegrationTestCase {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
index eb4c17a..136211c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteWithCustomLoggingIntegrationTest.java
@@ -27,17 +27,14 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.LocatorLauncher.Command;
import org.apache.geode.internal.process.ProcessStreamReader.InputListener;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@code LocatorLauncher} as an application main in a forked JVM with
* custom logging configuration.
*/
-@Category(IntegrationTest.class)
public class LocatorLauncherRemoteWithCustomLoggingIntegrationTest
extends LocatorLauncherRemoteIntegrationTestCase {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
index 6ce9be6..7302cda 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
@@ -42,12 +41,10 @@ import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link ServerLauncher} as an in-process API within an existing JVM.
*/
-@Category(IntegrationTest.class)
public class ServerLauncherIntegrationTest {
private static final String CURRENT_DIRECTORY = System.getProperty("user.dir");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
index 84545f4..7d64203 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalFileIntegrationTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.distributed;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessControllerFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link ServerLauncher} as an in-process API within an existing JVM.
@@ -30,7 +28,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class ServerLauncherLocalFileIntegrationTest extends ServerLauncherLocalIntegrationTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
index d49e469..ec0352d 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTest.java
@@ -32,7 +32,6 @@ import java.net.InetAddress;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.ServerLauncher.Builder;
@@ -40,14 +39,12 @@ import org.apache.geode.distributed.ServerLauncher.ServerState;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessControllerFactory;
import org.apache.geode.internal.process.ProcessType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@link ServerLauncher} as an in-process API within an existing JVM.
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class ServerLauncherLocalIntegrationTest extends ServerLauncherLocalIntegrationTestCase {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
index 5a25244..5b03cee 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteFileIntegrationTest.java
@@ -19,12 +19,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.internal.process.ProcessControllerFactory;
import org.apache.geode.lang.AttachAPINotFoundException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Subclass of {@link ServerLauncherLocalIntegrationTest} which forces the code to not find the
@@ -33,7 +31,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class ServerLauncherRemoteFileIntegrationTest extends ServerLauncherRemoteIntegrationTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
index 025ad5d..070e762 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTest.java
@@ -28,20 +28,17 @@ import java.net.InetAddress;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ServerLauncher.Builder;
import org.apache.geode.distributed.ServerLauncher.ServerState;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.process.ProcessControllerFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for using {@code ServerLauncher} as an application main in a forked JVM.
*
* @since GemFire 8.0
*/
-@Category(IntegrationTest.class)
public class ServerLauncherRemoteIntegrationTest extends ServerLauncherRemoteIntegrationTestCase {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
index 99112db..2794304 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteWithCustomLoggingIntegrationTest.java
@@ -27,16 +27,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.ServerLauncher.Command;
import org.apache.geode.internal.process.ProcessStreamReader.InputListener;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for launching a Server in a forked process with custom logging configuration
*/
-@Category(IntegrationTest.class)
public class ServerLauncherRemoteWithCustomLoggingIntegrationTest
extends ServerLauncherRemoteIntegrationTestCase {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
index 30dd081..45c244a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherWithProviderRegressionTest.java
@@ -21,10 +21,8 @@ import static org.mockito.Mockito.mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Extracted from {@link ServerLauncherLocalIntegrationTest}. This tests the same mechanism used by
@@ -33,7 +31,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* TRAC #51201: ServerLauncher.start fails to configure server with Spring
*/
-@Category(IntegrationTest.class)
public class ServerLauncherWithProviderRegressionTest extends ServerLauncherIntegrationTestCase {
private Cache providerCache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
index 2193442..d4d7e88 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java
@@ -22,15 +22,12 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.configuration.CacheConfig;
import org.apache.geode.internal.config.JAXBService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class CacheConfigIntegrationTest {
@Rule
public ServerStarterRule server = new ServerStarterRule();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
index cbc2910..5d27f6c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/DefaultPropertiesGeneratorIntegrationTest.java
@@ -29,15 +29,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DefaultPropertiesGeneratorIntegrationTest {
private Process process;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index 6ab7d49..c12f3e6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -69,7 +69,6 @@ import org.apache.geode.internal.Config;
import org.apache.geode.internal.ConfigSource;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -78,7 +77,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @since GemFire 2.1
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class InternalDistributedSystemJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
index 08a9272..9d0917b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java
@@ -23,16 +23,13 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.logging.log4j.LogWriterAppender;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class InternalLocatorIntegrationTest {
private Locator locator;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
index 3df8c79..03f243f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
@@ -27,13 +27,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Integration tests extracted from LocatorLoadSnapshotJUnitTest
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class LocatorLoadSnapshotIntegrationTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
index 8f4211b..65fbe74 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java
@@ -32,14 +32,11 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TODO: can we get rid of the Thread.sleep calls?
*/
-@Category(IntegrationTest.class)
public class DeadlockDetectorIntegrationTest {
private volatile Set<Thread> stuckThreads;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
index 65f9dcb..789eeec 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
@@ -32,9 +32,8 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.Scope;
import org.apache.geode.test.junit.categories.DLockTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, DLockTest.class})
+@Category({DLockTest.class})
public class DLockReentrantLockJUnitTest {
final long id = 1213L;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
index ec13256..f95f8e7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/locks/DLockServiceLeakTest.java
@@ -42,10 +42,9 @@ 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, DLockTest.class})
+@Category({DLockTest.class})
public class DLockServiceLeakTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
index 39fc94f..e6eb9ba 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
@@ -65,9 +65,8 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, MembershipJUnitTest.class})
+@Category({MembershipJUnitTest.class})
public class MembershipJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 4bcc2b9..c2b3e97 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -90,10 +90,9 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSHealthMonitorJUnitTest {
private Services services;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index f13cbca..e7154c1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -53,10 +53,9 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSLocatorRecoveryJUnitTest {
private File tempStateFile;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 89e6208..2697051 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -79,10 +79,9 @@ import org.apache.geode.distributed.internal.membership.gms.messages.RemoveMembe
import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
import org.apache.geode.internal.Version;
import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSJoinLeaveJUnitTest {
private Services services;
private ServiceConfig mockConfig;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
index db9fbdf..53fa083 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
@@ -36,11 +36,10 @@ import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSEncryptJUnitTest {
private static final int THREAD_COUNT = 20;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
index 63119be..c1f5178 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
@@ -43,10 +43,9 @@ import org.mockito.stubbing.Answer;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSQuorumCheckerJUnitTest {
private InternalDistributedMember[] mockMembers;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 60684f9..ce7990d 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -102,10 +102,9 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.cache.DistributedCacheOperation;
import org.apache.geode.internal.logging.log4j.AlertAppender;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class JGroupsMessengerJUnitTest {
private static final String AES_128 = "AES:128";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index 2e97e67..5aa4b46 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -83,10 +83,9 @@ import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipMan
import org.apache.geode.internal.admin.remote.AlertListenerMessage;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.tcp.ConnectExceptions;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class GMSMembershipManagerJUnitTest {
private static final long WAIT_FOR_REPLIES_MILLIS = 2000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
index 36d86b7..06e30da 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TCPServerSSLJUnitTest.java
@@ -48,11 +48,10 @@ import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class TCPServerSSLJUnitTest {
private InetAddress localhost;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
index 80cef7e..71a1eba 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.distributed.internal.PoolStatHelper;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.tier.sockets.TcpServerFactory;
import org.apache.geode.internal.net.SocketCreatorFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class TcpServerJUnitTest {
private/* GemStoneAddition */ InetAddress localhost;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java
index b2d3e25..127e1e8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXJUnitTest.java
@@ -30,13 +30,12 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Run the basic transaction functionality tests in TXJUnitTest after setting
* "distributed-transactions" property to true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistTXJUnitTest extends TXJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
index 344f68b..5ba27cc 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java
@@ -29,13 +29,12 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXManagerImplJUnitTest;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Same tests as that of {@link TXManagerImplJUnitTest} after setting "distributed-transactions"
* property to true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistTXManagerImplJUnitTest extends TXManagerImplJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
index 0436ee1..3105aa5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
@@ -26,14 +26,13 @@ import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.offheap.TxReleasesOffHeapOnCloseJUnitTest;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Same tests as that of {@link TxReleasesOffHeapOnCloseJUnitTest} after setting
* "distributed-transactions" property to true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistTXReleasesOffHeapOnCloseJUnitTest extends TxReleasesOffHeapOnCloseJUnitTest {
public DistTXReleasesOffHeapOnCloseJUnitTest() {}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
index d47c9e1..7250e2d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java
@@ -30,13 +30,12 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Same tests as that of {@link TXWriterJUnitTest} after setting "distributed-transactions" property
* to true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistTXWriterJUnitTest extends TXWriterJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
index 4559632..7a2b233 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java
@@ -30,13 +30,12 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Same tests as that of {@link TXWriterOOMEJUnitTest} after setting "distributed-transactions"
* property to true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistTXWriterOOMEJUnitTest extends TXWriterOOMEJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
index 67c3ee6..2904ca1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/DistributedTXExpirationIntegrationTest.java
@@ -22,12 +22,11 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.TXExpirationIntegrationTest;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Extends {@link TXExpirationIntegrationTest} with "distributed-transactions" enabled.
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class DistributedTXExpirationIntegrationTest extends TXExpirationIntegrationTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
index 1046fbf..9d2b30b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/disttx/PRDistTXJUnitTest.java
@@ -30,13 +30,12 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PRTXJUnitTest;
import org.apache.geode.test.junit.categories.DistributedTransactionsTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Same tests as that of {@link PRTXJUnitTest} after setting "distributed-transactions" property to
* true
*/
-@Category({IntegrationTest.class, DistributedTransactionsTest.class})
+@Category({DistributedTransactionsTest.class})
public class PRDistTXJUnitTest extends PRTXJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
index 5f9a80a..7529f38 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortHelperIntegrationTest.java
@@ -35,13 +35,10 @@ import junitparams.Parameters;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.internal.AvailablePort.Keeper;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class AvailablePortHelperIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
index d2afb83..ab8849b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/AvailablePortJUnitTest.java
@@ -24,16 +24,13 @@ import java.net.ServerSocket;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.admin.internal.InetAddressUtil;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* multicast availability is tested in JGroupsMessengerJUnitTest
*/
-@Category(IntegrationTest.class)
public class AvailablePortJUnitTest {
private ServerSocket socket;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
index d0a319b..2bea5e5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderIntegrationTest.java
@@ -44,7 +44,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.execute.Execution;
@@ -57,7 +56,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.execute.FunctionContextImpl;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.RestoreTCCLRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
@@ -66,7 +64,6 @@ import org.apache.geode.test.junit.rules.ServerStarterRule;
*
* Extracted from ClassPathLoaderTest.
*/
-@Category(IntegrationTest.class)
public class ClassPathLoaderIntegrationTest {
private static final int TEMP_FILE_BYTES_COUNT = 256;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
index 3861439..f175d46 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/CreateRegionFactoryNewInstanceRegressionTest.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThatCode;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -31,7 +30,6 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Cache.createRegionFactory should return a new instance with default values.
@@ -57,7 +55,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* at PartitionAttributesTest.main(PartitionAttributesTest.java:47)
* </pre>
*/
-@Category(IntegrationTest.class)
public class CreateRegionFactoryNewInstanceRegressionTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java
index 4b62b5a..82d502e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/DeployedJarJUnitTest.java
@@ -24,13 +24,10 @@ import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DeployedJarJUnitTest {
private static final String JAR_NAME = "test.jar";
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java
index 57e0b29..a708117 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/InlineKeyJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.UUID;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -37,9 +36,7 @@ import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapObjectKey;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapStringKey1;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapStringKey2;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryHeapUUIDKey;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class InlineKeyJUnitTest {
private GemFireCacheImpl createCache() {
Properties props = new Properties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
index e20ca62..eb2f80c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerDeadlockTest.java
@@ -34,14 +34,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class JarDeployerDeadlockTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
index 90402c1..43671cd 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
@@ -32,13 +32,10 @@ import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.test.compiler.ClassBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class JarDeployerIntegrationTest {
private ClassBuilder classBuilder;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
index 543651b..7f3502f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PdxUnreadData;
import org.apache.geode.pdx.internal.TypeRegistry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class PdxDeleteFieldJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java
index 154c378..68a90a8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/PdxRenameJUnitTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({IntegrationTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class PdxRenameJUnitTest {
@Test
public void testGetPdxTypes() throws Exception {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
index 6055e83..9a59707 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
@@ -21,18 +21,15 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* See bug 52093. Make sure that the contents of arrays are used to test equality on regions ops.
*/
-@Category(IntegrationTest.class)
public class RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest {
private GemFireCacheImpl createCache() {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
index d9da8fa..5558d76 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
@@ -28,14 +28,13 @@ import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.management.GemFireProperties;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.MemberMXBean;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Test that DistributionConfigImpl handles SSL options correctly.
*
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SSLConfigIntegrationJUnitTest {
@After
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java
index 1a95c5e..9d43322 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/SSLConfigJUnitTest.java
@@ -65,13 +65,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.net.SSLConfigurationFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
/**
* Test that DistributionConfigImpl handles SSL options correctly.
*/
-@Category({IntegrationTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class SSLConfigJUnitTest {
private static final Properties SSL_PROPS_MAP = new Properties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
index 18f553c..1a33d47 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/ScheduledThreadPoolExecutorWithKeepAliveJUnitTest.java
@@ -33,9 +33,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ScheduledThreadPoolExecutorWithKeepAliveJUnitTest {
ScheduledThreadPoolExecutorWithKeepAlive ex;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
index bbcfb06..e366d6f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/SystemFailureThreadCleanupRegressionTest.java
@@ -24,13 +24,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* TRAC #49856: Some GemFire Threads not cleaned up in cache close.
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SystemFailureThreadCleanupRegressionTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
index 985f42f..cbad6e9 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/AfterRegionCreateNotBeforeRegionInitRegressionTest.java
@@ -27,7 +27,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ErrorCollector;
import org.apache.geode.cache.AttributesFactory;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.util.CacheListenerAdapter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* AFTER_REGION_CREATE was being sent before region initialization (bug 33726). Test to verify that
@@ -45,7 +43,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* TRAC #33726: afterRegionCreate event delivered before region initialization occurs
*/
-@Category(IntegrationTest.class)
public class AfterRegionCreateNotBeforeRegionInitRegressionTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
index 7bfc7b0..b90f806 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheLifecycleListenerJUnitTest.java
@@ -25,15 +25,12 @@ import java.util.List;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests notifications of CacheLifecycleListener from GemFireCacheImpl.
*/
-@Category(IntegrationTest.class)
public class CacheLifecycleListenerJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
index d31cfee..5c3d417 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheServiceJUnitTest.java
@@ -20,12 +20,9 @@ import static org.junit.Assert.assertEquals;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class CacheServiceJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
index cae0147..eeeec4c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheWriterGetOldValueIntegrationTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
@@ -45,9 +44,7 @@ import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.util.CacheWriterAdapter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class CacheWriterGetOldValueIntegrationTest {
private final Map<String, String> expectedValues = new HashMap<>();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index 6897425..8b8ab54 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -37,7 +36,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.ha.HAContainerWrapper;
import org.apache.geode.internal.cache.ha.HARegionQueue;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test to verify that each bridge sever creates its own client_messages_region at its start and
@@ -45,7 +43,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 5.7
*/
-@Category(IntegrationTest.class)
public class ClientMessagesRegionCreationAndDestroyJUnitTest {
/** The cache instance */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
index 25322ca..e77af4d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ClusterConfigurationLoaderIntegrationTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -34,11 +33,9 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.config.ClusterConfigurationNotAvailableException;
import org.apache.geode.management.internal.configuration.domain.Configuration;
import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
-@Category(IntegrationTest.class)
public class ClusterConfigurationLoaderIntegrationTest {
private ClusterConfigurationLoader loader;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
index 5138e98..fe82500 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ColocatedPRJUnitTest.java
@@ -21,13 +21,10 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ColocatedPRJUnitTest {
@SuppressWarnings("rawtypes")
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
index 1bc8d56..e90d41a 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ComplexDiskRegionJUnitTest.java
@@ -18,16 +18,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Unit testing for ComplexDiskRegion API's
*/
-@Category(IntegrationTest.class)
public class ComplexDiskRegionJUnitTest extends DiskRegionTestingBase {
private DiskRegionProperties diskProps = new DiskRegionProperties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
index a0fd562..f230f9f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
@@ -19,12 +19,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This JUnit tests concurrent rolling and normal region operations put,get,clear,destroy in both
@@ -33,7 +31,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* A region operation is done on the same key that is about to be rolled or has just been rolled and
* the region operation is verified to have been correctly executed.
*/
-@Category(IntegrationTest.class)
public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTestingBase {
protected boolean alreadyComeHere = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
index ecbd78d..6de5174 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentMapLocalJUnitTest.java
@@ -22,16 +22,13 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ConcurrentMapLocalJUnitTest { // TODO: reformat
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
index 6176569..7a53d3f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRegionOperationsJUnitTest.java
@@ -30,13 +30,11 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a multi threaded tests. This test creates two regions. Region1 which is persistent and
@@ -54,7 +52,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* regions are checked for equality. * This test is run for all modes persist, persist+overflow,
* overflow only in syn and async mode.
*/
-@Category(IntegrationTest.class)
public class ConcurrentRegionOperationsJUnitTest extends DiskRegionTestingBase {
private int numberOfPutsThreads = 5;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
index 8d8d5b1..014ec96 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java
@@ -24,14 +24,12 @@ import java.util.List;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This JUnit test tests concurrent rolling and normal region operations put,get,clear,destroy in
@@ -40,7 +38,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* A region operation is done on the same key that is about to be rolled or has just been rolled and
* the region operation is verified to have been correctly executed.
*/
-@Category(IntegrationTest.class)
public class ConcurrentRollingAndRegionOperationsJUnitTest extends DiskRegionTestingBase {
protected volatile boolean hasBeenNotified;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
index b33411e..670aba5 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ConflationJUnitTest.java
@@ -26,10 +26,8 @@ import static org.junit.Assert.fail;
import java.util.Collection;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test does a check that conflation in the buffer happen correctly
@@ -45,7 +43,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* </ul>
* The test is done for persist only, overflow only and persist + overflow only (async modes).
*/
-@Category(IntegrationTest.class)
public class ConflationJUnitTest extends DiskRegionTestingBase {
private DiskRegionProperties diskProps = new DiskRegionProperties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
index c88f8bf..86fdbda 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CreatePRWithLocalExpirationRegressionTest.java
@@ -23,21 +23,18 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* PRWithLocalExpirationRegressionTest
*
* TRAC #40632: PR expiration with localDestroy fails with InternalGemFireError
*/
-@Category(IntegrationTest.class)
public class CreatePRWithLocalExpirationRegressionTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
index 232d2b3..3236f89 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
@@ -71,7 +71,6 @@ import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceO
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.process.ProcessWrapper;
/**
@@ -79,7 +78,6 @@ import org.apache.geode.test.process.ProcessWrapper;
*
* @since GemFire 6.0
*/
-@Category(IntegrationTest.class)
public class DeprecatedCacheServerLauncherIntegrationTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
index 6104204..0311d21 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskAccessExceptionDisablesServerRegressionTest.java
@@ -23,7 +23,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
@@ -34,7 +33,6 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a bugtest for bug 37500.
@@ -79,7 +77,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* at java.lang.Thread.run(Thread.java:595)
* </pre>
*/
-@Category(IntegrationTest.class)
public class DiskAccessExceptionDisablesServerRegressionTest {
private static final int MAX_OPLOG_SIZE = 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
index 9318400..68ca047 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskIFJUnitTest.java
@@ -24,19 +24,16 @@ import java.util.Collections;
import java.util.HashSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.persistence.PRPersistentConfig;
import org.apache.geode.internal.cache.persistence.PersistentMemberID;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests DiskRegion's IF file.
*
*/
-@Category(IntegrationTest.class)
public class DiskIFJUnitTest extends DiskRegionTestingBase {
DiskRegionProperties diskProps = new DiskRegionProperties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
index f1e1082..0eeca0c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskInitFileJUnitTest.java
@@ -28,14 +28,11 @@ import org.jmock.lib.legacy.ClassImposteriser;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.internal.cache.persistence.DiskRegionView;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DiskInitFileJUnitTest {
private File testDirectory;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
index 343a187..526e316 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskLruRegRecoveryJUnitTest.java
@@ -20,17 +20,14 @@ import static org.junit.Assert.fail;
import java.util.concurrent.CountDownLatch;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk LRU region recovery tests.
*/
-@Category(IntegrationTest.class)
public class DiskLruRegRecoveryJUnitTest extends DiskRegionTestingBase {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
index d878bcb..10a4d26 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOfflineCompactionJUnitTest.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -43,12 +42,10 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.versions.RegionVersionHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests offline compaction
*/
-@Category(IntegrationTest.class)
public class DiskOfflineCompactionJUnitTest {
// In this test, entry version, region version, member id, each will be 1 byte
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
index e5d6f01..1f06b14 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskOldAPIsJUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -41,13 +40,11 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the old disk apis to make sure they do the correct thing. Once we drop these old deprecated
* disk apis then this unit test can be removed.
*/
-@Category(IntegrationTest.class)
public class DiskOldAPIsJUnitTest {
protected static Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
index 712c01c..b7f8cf7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRandomOperationsAndRecoveryJUnitTest.java
@@ -22,16 +22,13 @@ import java.util.Iterator;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryDestroyedException;
import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DiskRandomOperationsAndRecoveryJUnitTest extends DiskRegionTestingBase {
private static final int ENTRY_SIZE = 1024;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
index a48372c..5afb158 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
@@ -37,7 +36,6 @@ import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/**
@@ -48,7 +46,6 @@ import org.apache.geode.util.test.TestUtil;
*
* @since GemFire 5.1
*/
-@Category(IntegrationTest.class)
public class DiskRegCacheXmlJUnitTest {
private Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
index 32bd555..7aca049 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
@@ -25,20 +25,17 @@ import java.io.PrintWriter;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test is for testing Disk attributes set programmatically The generated cacheXml is used to
* create a cache and the region properties retested.
*/
-@Category(IntegrationTest.class)
public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase {
private DiskRegionProperties[] diskRegionProperties = new DiskRegionProperties[12];
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
index 8a92eab..833e980 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegCbkChkJUnitTest.java
@@ -17,19 +17,16 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.cache.util.CacheWriterAdapter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests if callbacks are getting invoked correctly for 'create', 'update' and 'destroy' of disk
* region entries with concurrent 'clear'
*/
-@Category(IntegrationTest.class)
public class DiskRegCbkChkJUnitTest extends DiskRegionTestingBase {
private static volatile boolean intoCreateAfterCbk = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
index e3731a0..612d94e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegOplogSwtchingAndRollerJUnitTest.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.DiskStore;
@@ -31,12 +30,10 @@ import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Miscellaneous disk tests
*/
-@Category(IntegrationTest.class)
public class DiskRegOplogSwtchingAndRollerJUnitTest extends DiskRegionTestingBase {
private static File[] dirs1 = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
index ffb689b..5eb8bce 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegRecoveryJUnitTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.EntryNotFoundException;
@@ -40,14 +39,12 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.entries.DiskEntry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region recovery tests
*
* @since GemFire 5.1
*/
-@Category(IntegrationTest.class)
public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase {
private static int EMPTY_RVV_SIZE = 6;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
index 8829740..fad8d14 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
@@ -33,9 +33,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DiskRegionAsyncRecoveryJUnitTest extends DiskRegionTestingBase {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
index 47fcf65..b1fa503 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionChangingRegionAttributesJUnitTest.java
@@ -18,10 +18,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test will test that there are no unexpected behaviours if the the region attributes are
@@ -29,7 +27,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* The behaviour should be predictable
*/
-@Category(IntegrationTest.class)
public class DiskRegionChangingRegionAttributesJUnitTest extends DiskRegionTestingBase {
private DiskRegionProperties props;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
index be72dcd..c2739e8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionClearJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -40,7 +39,6 @@ import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test methods to ensure that disk Clear is apparently atomic to region clear.
@@ -51,7 +49,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* TODO: use DiskRegionTestingBase and DiskRegionHelperFactory
*/
-@Category(IntegrationTest.class)
public class DiskRegionClearJUnitTest {
private static Region testRegion = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
index 94eabf1..856de89 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
@@ -29,19 +29,16 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test tests Illegal arguments being passed to create disk regions. The creation of the DWA
* object should throw a relevant exception if the arguments specified are incorrect.
*/
-@Category(IntegrationTest.class)
public class DiskRegionIllegalArguementsJUnitTest {
protected static Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
index d2c1a23..ea2005e 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
@@ -23,19 +23,16 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/**
* This test tests Illegal arguements being passed to create disk regions. The creation of the DWA
* object should throw a relevant exception if the arguements specified are incorrect.
*/
-@Category(IntegrationTest.class)
public class DiskRegionIllegalCacheXMLvaluesJUnitTest {
public void createRegion(String path) {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
index 26dc0ac..6fec15b 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskRegionJUnitTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.DiskAccessException;
@@ -50,7 +49,6 @@ import org.apache.geode.internal.cache.persistence.UninterruptibleFileChannel;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* JUnit tests covering some miscellaneous functionality of Disk Region.
@@ -59,7 +57,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* TODO: fails when running integrationTest from gradle command-line on Windows 7<br>
* TODO: overhaul error handling and disk usage
*/
-@Category(IntegrationTest.class)
public class DiskRegionJUnitTest extends DiskRegionTestingBase {
private static volatile boolean hasNotified = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
index ca9ac2b..2f15690 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreFactoryJUnitTest.java
@@ -37,7 +37,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -48,12 +47,10 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests DiskStoreFactory
*/
-@Category(IntegrationTest.class)
public class DiskStoreFactoryJUnitTest {
private static Cache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
index 0830485..7303449 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DiskStoreImplIntegrationTest.java
@@ -28,7 +28,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.Cache;
@@ -40,10 +39,8 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.backup.BackupService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class DiskStoreImplIntegrationTest {
private static final String DISK_STORE_NAME = "testDiskStore";
private static final String REGION_NAME = "testRegion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
index 96df982..96fcc69 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EnforceUniqueHostForLonerIntegrationTest.java
@@ -22,11 +22,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Added specifically to test scenario of defect TRAC #47181.
@@ -39,7 +37,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* Extracted from {@link PartitionedRegionBucketCreationDistributionDUnitTest}.
*/
-@Category(IntegrationTest.class)
public class EnforceUniqueHostForLonerIntegrationTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
index e48b512..d26396f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.AttributesMutator;
@@ -30,9 +29,7 @@ import org.apache.geode.cache.EvictionAttributesMutator;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class EvictionAttributesMutatorImplRegressionTest {
private Region<String, String> region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
index 32ed0b7..9d71f75 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FaultingInJUnitTest.java
@@ -19,15 +19,12 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests faulting in from current oplog, old oplog and htree for different modes (overflow only,
* persist+overflow : Sync/Async)
*/
-@Category(IntegrationTest.class)
public class FaultingInJUnitTest extends DiskRegionTestingBase {
private volatile boolean hasBeenNotified;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
index 11c91ff..4dd73a7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/FilterProfileConcurrencyTest.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.concurrent.Future;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.distributed.DistributedMember;
@@ -34,10 +33,8 @@ import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.test.concurrency.ConcurrentTestRunner;
import org.apache.geode.test.concurrency.ParallelExecutor;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@RunWith(ConcurrentTestRunner.class)
-@Category(IntegrationTest.class)
public class FilterProfileConcurrencyTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
index 18a9076..f68e615 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/InterruptDiskJUnitTest.java
@@ -35,21 +35,18 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
* Test of interrupting threads doing disk writes to see the effect.
*
*/
-@Category(IntegrationTest.class)
public class InterruptDiskJUnitTest {
private static volatile Thread puttingThread;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 5eba7f0..b4a804d 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -30,7 +30,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -45,7 +44,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.internal.cache.eviction.EvictionList;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test verifies region is LIFO enabled by ENTRY COUNT verifies correct stats updating and
@@ -53,7 +51,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 5.7
*/
-@Category(IntegrationTest.class)
public class LIFOEvictionAlgoEnabledRegionJUnitTest {
/** The cache instance */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index ed850b6..ffc927b 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -31,7 +31,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.apache.geode.cache.AttributesFactory;
@@ -64,7 +63,6 @@ import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test verifies region is LIFO enabled by MEMORY verifies correct stats updating and
@@ -73,7 +71,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 5.7
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(IntegrationTest.class)
public class LIFOEvictionAlgoMemoryEnabledRegionJUnitTest {
/** The cache instance */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
index 4df83a2..e051d1e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/LRUClearWithDiskRegionOpRegressionTest.java
@@ -22,7 +22,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Regression test to confirm fix for TRAC #37244.
@@ -46,7 +44,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @see org.apache.geode.internal.cache.eviction.TestLRUListWithAsyncSorting
*/
-@Category(IntegrationTest.class)
public class LRUClearWithDiskRegionOpRegressionTest {
private InternalCache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
index 484a7d9..e2d81e2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.CacheTransactionManager;
@@ -40,9 +39,7 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MapInterface2JUnitTest {
protected boolean afterClearCallbackOccurred = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
index 5d9516d..b5bd967 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MapInterfaceJUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -37,9 +36,7 @@ import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MapInterfaceJUnitTest {
protected boolean hasBeenNotified = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
index ec307b5..3bb2950 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/MultipleOplogsRollingFeatureJUnitTest.java
@@ -23,18 +23,15 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* The test will verify <br>
* 1. Multiple oplogs are being rolled at once <br>
* 2. The Number of entries getting logged to the HTree are taking care of creation
*/
-@Category(IntegrationTest.class)
public class MultipleOplogsRollingFeatureJUnitTest extends DiskRegionTestingBase {
private volatile boolean FLAG = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
index 3ef63f0..9e5987c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OfflineSnapshotJUnitTest.java
@@ -27,7 +27,6 @@ import com.examples.snapshot.MyPdxSerializer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -36,9 +35,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.snapshot.RegionGenerator;
import org.apache.geode.cache.snapshot.RegionGenerator.RegionType;
import org.apache.geode.cache.snapshot.RegionGenerator.SerializationType;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class OfflineSnapshotJUnitTest {
private RegionGenerator rgen;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java
index a7f1e27..6833589 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogFlushTest.java
@@ -27,7 +27,6 @@ import java.nio.ByteBuffer;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.rules.TestName;
import org.mockito.invocation.InvocationOnMock;
@@ -36,12 +35,10 @@ import org.mockito.stubbing.Answer;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.persistence.UninterruptibleFileChannel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing recovery from failures writing Oplog entries
*/
-@Category(IntegrationTest.class)
public class OplogFlushTest extends DiskRegionTestingBase {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java
index 63a73e0..3dad586 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogJUnitTest.java
@@ -40,7 +40,6 @@ import org.awaitility.Awaitility;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.cache.CacheWriterException;
@@ -58,12 +57,10 @@ import org.apache.geode.internal.cache.Oplog.OPLOG_TYPE;
import org.apache.geode.internal.cache.entries.AbstractDiskLRURegionEntry;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing Oplog API's
*/
-@Category(IntegrationTest.class)
public class OplogJUnitTest extends DiskRegionTestingBase {
private boolean proceed = false;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
index f115c52..c3f3cd3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
@@ -33,7 +33,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.StatisticsFactory;
@@ -43,9 +42,7 @@ import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class OplogRVVJUnitTest {
private File testDirectory;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
index 33b91fc..0ec9c7c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OplogTooManyFilesOpenRegressionTest.java
@@ -25,7 +25,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.Cache;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
@@ -68,7 +66,6 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
* at com.gemstone.gemfire.internal.cache.AbstractRegion.put(AbstractRegion.java:122)
* </pre>
*/
-@Category(IntegrationTest.class)
public class OplogTooManyFilesOpenRegressionTest {
private static final int VALUE_SIZE = 1024;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
index 7f4ebea..c100054 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/OverflowOplogFlushTest.java
@@ -27,18 +27,15 @@ import java.nio.channels.FileChannel;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
import org.junit.rules.TestName;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing recovery from failures writing OverflowOplog entries
*/
-@Category(IntegrationTest.class)
public class OverflowOplogFlushTest extends DiskRegionTestingBase {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
index 8e7a81c..79c0333 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRConcurrentMapOpsJUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -35,14 +34,12 @@ import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests ConcurrentMap operations on a PartitionedRegion on a single node.
*
*/
-@Category(IntegrationTest.class)
public class PRConcurrentMapOpsJUnitTest {
static DistributedSystem sys;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
index 195022e..abf6f52 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryJUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -30,12 +29,10 @@ import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests memory allocation operations on a PartitionedRegion on a single node.
*/
-@Category(IntegrationTest.class)
public class PRDataStoreMemoryJUnitTest {
private static DistributedSystem sys;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index 89181e6..47e10b7 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -18,17 +18,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMO
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests PartitionedRegion DataStore currentAllocatedMemory operation.
*
* @since Geode 1.0
*/
-@Category(IntegrationTest.class)
public class PRDataStoreMemoryOffHeapJUnitTest extends PRDataStoreMemoryJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
index 1caffbd..9699ffd 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PRTXJUnitTest.java
@@ -16,7 +16,6 @@ package org.apache.geode.internal.cache;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.TXJUnitTest;
import org.apache.geode.cache.AttributesFactory;
@@ -27,9 +26,7 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.query.QueryException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class PRTXJUnitTest extends TXJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
index e6cb4ee..d707cfa 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionAttributesMutatorTest.java
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeoutException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
@@ -40,10 +39,8 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.internal.cache.partitioned.PartitionedRegionObserverAdapter;
import org.apache.geode.internal.cache.partitioned.PartitionedRegionObserverHolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class PartitionedRegionAttributesMutatorTest {
private static final String TEST_REGION_NAME = "testRegion";
private static final int DEFAULT_WAIT_DURATION = 5;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index 423e7cc..72e0a8d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.apache.geode.LogWriter;
@@ -38,7 +37,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test for creation of Partition region(PR).
@@ -61,7 +59,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(IntegrationTest.class)
public class PartitionedRegionCreationJUnitTest {
static volatile int PRNumber = 0;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
index dd0fb78..330004f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionDataStoreJUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -34,7 +33,6 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test checks functionality of the PartitionedRegionDatastore on a sinle node.
@@ -43,7 +41,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
public class PartitionedRegionDataStoreJUnitTest {
static DistributedSystem sys;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
index a9c64f9..1c9fcc2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
@@ -29,7 +29,6 @@ import java.util.Random;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.ExpirationAttributes;
@@ -40,12 +39,10 @@ import org.apache.geode.internal.cache.BucketAdvisor.BucketProfile;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor.PartitionProfile;
import org.apache.geode.internal.util.VersionedArrayList;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class is an integration test for {@link PartitionedRegionQueryEvaluator} class.
*/
-@Category(IntegrationTest.class)
public class PartitionedRegionQueryEvaluatorIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
index 33dbd8c..c6aa941 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSerializableObjectJUnitTest.java
@@ -30,13 +30,10 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class PartitionedRegionSerializableObjectJUnitTest {
private String regionName = "SerizableRegion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
index 23db6e1..87e83b2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleNodeOperationsJUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.apache.geode.LogWriter;
@@ -49,7 +48,6 @@ import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache30.RegionTestCase;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for Partitioned Region operations on a single node. Following tests are included:
@@ -60,7 +58,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category(IntegrationTest.class)
public class PartitionedRegionSingleNodeOperationsJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
index 61e6221..d0d59b8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.Statistics;
@@ -44,9 +43,7 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.PartitionedRegionStorageException;
import org.apache.geode.cache.RegionExistsException;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class PartitionedRegionStatsJUnitTest {
private static final File DISK_DIR = new File("PRStatsTest");
LogWriter logger = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
index 78886ae..1148a7c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -41,9 +40,7 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class PersistentPartitionedRegionJUnitTest {
private File dir;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
index 861caa1..37ae376 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
@@ -23,20 +23,17 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.Region.Entry;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.query.CacheUtils;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test verifies the flag's on-off switching for boolean flags in AbstractRegionEntry.
* Currently a byte array is used to maintain two flags.
*/
-@Category(IntegrationTest.class)
public class RegionEntryFlagsJUnitTest {
@Before
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
index 9a8af2c..698f017 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheFactory;
@@ -29,9 +28,7 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class RegionListenerJUnitTest {
@Test
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
index 7ee9f81..559b50a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionValuesIteratorAfterLocalInvalidateRegressionTest.java
@@ -25,7 +25,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.Cache;
@@ -33,7 +32,6 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Confirm that bug 34583 is fixed. Cause of bug is recursion is entries iterator that causes stack
@@ -42,7 +40,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* TRAC #34583: StackOverflowError while performing region.put() at bridge client.
*/
-@Category(IntegrationTest.class)
public class RegionValuesIteratorAfterLocalInvalidateRegressionTest {
private static final int PUT_COUNT = 25000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
index 93aaa47..4e484bc 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ReplaceWithOverflowJUnitTest.java
@@ -23,7 +23,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -32,12 +31,10 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test the replace method with an entry that has overflowed to disk.
*/
-@Category(IntegrationTest.class)
public class ReplaceWithOverflowJUnitTest {
private static Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
index 97df4a6..7a1b326 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -29,18 +29,15 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Testing methods for SimpleDiskRegion.java api's
*
* @since GemFire 5.1
*/
-@Category(IntegrationTest.class)
public class SimpleDiskRegionJUnitTest extends DiskRegionTestingBase {
private Set keyIds = Collections.synchronizedSet(new HashSet());
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
index ce916bc..9f321f0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -46,12 +45,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.TransactionId;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* junit test for suspend and resume methods
*/
-@Category(IntegrationTest.class)
public class TXManagerImplJUnitTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
index 1843eb7..b3fba1b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TXReservationMgrJUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -32,9 +31,7 @@ import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class TXReservationMgrJUnitTest {
DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
index 604685e..ddbe5de 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.CacheFactory;
@@ -37,9 +36,7 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.entries.VersionedThinRegionEntryHeap;
import org.apache.geode.internal.cache.entries.VersionedThinRegionEntryHeapObjectKey;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class TombstoneCreationJUnitTest {
@Rule
public TestName nameRule = new TestName();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
index a2bd148..48fc87e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -32,7 +31,6 @@ import org.apache.geode.internal.cache.Token.Tombstone;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionStamp;
import org.apache.geode.internal.cache.versions.VersionTag;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This test creates an entry and verifies if {@link UpdateOperation} applies correctly on it after
@@ -42,7 +40,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* @since GemFire 7.0.1
*
*/
-@Category(IntegrationTest.class)
public class UpdateVersionJUnitTest {
private static final String regionName = "versionedregion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
index 8a97aa6..2679dcf 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupFileCopierIntegrationTest.java
@@ -37,7 +37,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
@@ -54,12 +53,10 @@ import org.apache.geode.internal.cache.DiskInitFile;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.Oplog;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@PowerMockIgnore("*.IntegrationTest")
@PrepareForTest({BackupFileCopier.class, URL.class})
@RunWith(PowerMockRunner.class)
-@Category(IntegrationTest.class)
public class BackupFileCopierIntegrationTest {
private static final String CONFIG_DIRECTORY = "config";
private static final String USER_FILES = "user";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
index 1a2be04..313567a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java
@@ -26,15 +26,12 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests for the BackupInspector.
*/
-@Category(IntegrationTest.class)
public class BackupInspectorIntegrationTest {
private static final String IF_FILE_SUFFIX = ".if";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
index 82b6de5..8c8b064 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupIntegrationTest.java
@@ -45,7 +45,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.CacheFactory;
@@ -58,9 +57,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class BackupIntegrationTest {
private static final String DISK_STORE_NAME = "diskStore";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
index 7523007..2ce74a4 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/FileSystemBackupWriterTest.java
@@ -38,7 +38,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
@@ -47,9 +46,7 @@ import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.Oplog;
import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class FileSystemBackupWriterTest {
private static final Path RELATIVE_TARGET_DIR = Paths.get("backupTest");
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
index 1b13cbf..3907cd2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java
@@ -25,12 +25,9 @@ import java.util.List;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class UnixScriptGeneratorTest {
private ScriptGenerator scriptGenerator;
private File outputFile;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
index 59abacf..6284ff6 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/WindowsScriptGeneratorTest.java
@@ -25,12 +25,9 @@ import java.util.List;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class WindowsScriptGeneratorTest {
private ScriptGenerator scriptGenerator;
private File outputFile;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
index a91b9df..21d8a34 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheFactory;
@@ -46,9 +45,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MemoryMonitorJUnitTest {
private static Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index 8d6536e..c0f6330 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.EvictionAlgorithm;
@@ -40,9 +39,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MemoryMonitorOffHeapJUnitTest {
private static final Logger logger = LogService.getLogger();
private static final int SYSTEM_LISTENERS = 1;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
index 5a2b33f..73e5af9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncGetInMemPerfJUnitTest.java
@@ -17,19 +17,16 @@ package org.apache.geode.internal.cache.diskPerf;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.internal.cache.DiskRegionHelperFactory;
import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region Perf test for Overflow only with ASync writes. 1) Performance of get operation for
* entry in memory.
*/
-@Category(IntegrationTest.class)
public class DiskRegOverflowAsyncGetInMemPerfJUnitTest extends DiskRegionTestingBase {
private static int counter = 0;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
index d4456b5..1241100 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowAsyncJUnitPerformanceTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
@@ -28,13 +27,11 @@ import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region Perf test for Overflow only with ASync writes. 1) Performance of Put operation
* causing an eviction. 2) Performance of Get operation for entry which will fault in.
*/
-@Category(IntegrationTest.class)
public class DiskRegOverflowAsyncJUnitPerformanceTest extends DiskRegionTestingBase {
private static int ENTRY_SIZE = 1024 * 5;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
index bacbd80..7c47012 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest.java
@@ -17,19 +17,16 @@ package org.apache.geode.internal.cache.diskPerf;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.internal.cache.DiskRegionHelperFactory;
import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region Perf test for Overflow only with Sync writes. 1) Performance of get operation for
* entry in memory.
*/
-@Category(IntegrationTest.class)
public class DiskRegOverflowSyncGetInMemPerfJUnitPerformanceTest extends DiskRegionTestingBase {
private static int ENTRY_SIZE = 1024;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
index b1d74e0..b906256 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegOverflowSyncJUnitPerformanceTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
@@ -28,13 +27,11 @@ import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region Perf test for Overflow only with Sync writes. 1) Performance of Put operation causing
* an eviction. 2) Performance of Get operation for entry which will fault in.
*/
-@Category(IntegrationTest.class)
public class DiskRegOverflowSyncJUnitPerformanceTest extends DiskRegionTestingBase {
private static int ENTRY_SIZE = 1024 * 5;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
index a3d634b..96e2286 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.diskPerf;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
@@ -30,14 +29,12 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* 1) Performance of Get Operation for Entry faulting in from current Op Log 2) Performance of Get
* operation for Entry faulting in from previous Op Log 3) Performance of Get operation for Entry
* faulting in from H Tree
*/
-@Category(IntegrationTest.class)
public class DiskRegionOverflowAsyncRollingOpLogJUnitTest extends DiskRegionTestingBase {
private static int counter = 0;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
index b04508e..e146917 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.diskPerf;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Region;
@@ -30,7 +29,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.eviction.EvictionCounters;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* 1) Performance of Get Operation for Entry faulting in from current Op Log 2) Performance of Get
@@ -38,7 +36,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* faulting in from H Tree
*
*/
-@Category(IntegrationTest.class)
public class DiskRegionOverflowSyncRollingOpLogJUnitTest extends DiskRegionTestingBase {
LogWriter log = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
index 09041c4..f792a07 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPersistOnlySyncJUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.fail;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.RegionAttributes;
@@ -30,12 +29,10 @@ import org.apache.geode.internal.cache.DiskRegionHelperFactory;
import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Disk region perf test for Persist only with sync writes.
*/
-@Category(IntegrationTest.class)
public class DiskRegionPersistOnlySyncJUnitTest extends DiskRegionTestingBase {
private LogWriter log = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
index 0428c83..342fd3f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionRollOpLogJUnitPerformanceTest.java
@@ -20,21 +20,18 @@ import java.io.File;
import java.util.Arrays;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.DiskRegionHelperFactory;
import org.apache.geode.internal.cache.DiskRegionProperties;
import org.apache.geode.internal.cache.DiskRegionTestingBase;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Consolidated Disk Region Perftest. Overflow, Persist, OverflowWithPersist modes are tested for
* Sync, AsyncWithBuffer and AsyncWithoutBufer writes. Roling oplog is set to true with maxOplogSize
* = 20 mb
*/
-@Category(IntegrationTest.class)
public class DiskRegionRollOpLogJUnitPerformanceTest extends DiskRegionTestingBase {
private DiskRegionProperties diskProps = new DiskRegionProperties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
index 9396e62..9ee5201 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.AttributesFactory;
@@ -37,9 +36,7 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MultiThreadedOplogPerJUnitPerformanceTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
index 084979c..23a8d0a 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithAsyncSortingIntegrationTest.java
@@ -34,12 +34,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.test.junit.categories.EvictionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class tests the LRUCapacityController's core clock algorithm.
*/
-@Category({IntegrationTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class LRUListWithAsyncSortingIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
index 6320934..00312d7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/LRUListWithSyncSortingIntegrationTest.java
@@ -35,12 +35,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.lang.SystemPropertyHelper;
import org.apache.geode.test.junit.categories.EvictionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class tests the LRUCapacityController's core clock algorithm.
*/
-@Category({IntegrationTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class LRUListWithSyncSortingIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
index e6ff2f8..476fd39 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/RegionEntryEvictionIntegrationTest.java
@@ -28,9 +28,8 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.junit.categories.EvictionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class RegionEntryEvictionIntegrationTest {
private Region<String, String> region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
index 3063197..b0869df 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/eviction/TransactionsWithOverflowTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.apache.geode.cache.Cache;
@@ -45,12 +44,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.internal.cache.InternalRegion;
import org.apache.geode.internal.cache.VMLRURegionMap;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test for transactional operations on overflowed data
*/
-@Category(IntegrationTest.class)
public class TransactionsWithOverflowTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
index 28add64..fc6efc9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionOnLonerRegressionTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.LonerDistributionManager;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This tests make sure that, in case of LonerDistributedSystem we don't get ClassCast Exception.
@@ -59,7 +58,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category({IntegrationTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionExecutionOnLonerRegressionTest {
private Region<String, String> region;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
index 9c3c1e5..bc5a67a 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARQAddOperationJUnitTest using BlockingHARegionQueue instead of
@@ -40,7 +39,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
index 75361e5..b4b37d5 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
@@ -20,7 +20,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARegionQueueStatsJUnitTest using BlockingHARegionQueue instead of
@@ -28,7 +27,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index ef75f61..84b91ca 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -34,9 +34,8 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class BlockingHARegionJUnitTest {
private static InternalCache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index eab3cb4..03713b7 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -27,13 +27,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test runs all tests of HARegionQueueJUnitTest using BlockingHARegionQueue instead of
* HARegionQueue.
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
index e2c0890..cffd3e7 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -52,12 +52,11 @@ import org.apache.geode.internal.cache.ha.HARegionQueue.MapWrapper;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test to verify Add operation to HARegion Queue with and without conflation.
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARQAddOperationJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
index 822636a..8f0ac94 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
@@ -47,13 +47,12 @@ import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.HARegion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test verifies the properties of a HARegion which allows localPuts and localDestroys on a
* MirroredRegion
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
index f908d49..8a496d1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueIntegrationTest.java
@@ -33,7 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
@@ -73,13 +72,11 @@ import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl;
import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
-import org.apache.geode.test.junit.categories.IntegrationTest;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({"javax.script.*", "javax.management.*", "org.springframework.shell.event.*",
"org.springframework.shell.core.*", "*.IntegrationTest"})
@PrepareForTest({CacheClientNotifier.class})
-@Category(IntegrationTest.class)
public class HARegionQueueIntegrationTest {
private Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 9723d93..350a91e 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -62,7 +62,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a test for the APIs of a HARegionQueue and verifies that the head, tail and size counters
@@ -71,7 +70,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* TODO: use ExecutorServiceRule instead of raw threads (move CyclicBarrier into rule if needed)
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueJUnitTest {
/** total number of threads doing put operations */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index 8f8675a..7a5990f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -33,9 +33,8 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueStartStopJUnitTest {
private InternalCache createCache() throws CacheExistsException, RegionExistsException {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index 145df33..7196afe 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -34,14 +34,13 @@ import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* JUnit test for verifying the proper functioning of HARegionQueue related statistics.
*
*
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueStatsJUnitTest {
/** The cache instance */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
index b8d228d..67007cf 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/map/DestroyEntryDuringCloseIntegrationTest.java
@@ -26,7 +26,6 @@ import junitparams.Parameters;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
@@ -35,13 +34,11 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* TestCase that emulates the conditions that entry destroy with concurrent destroy region or cache
* close event will get expected Exception.
*/
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class DestroyEntryDuringCloseIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
index 3e4a531..c5201d8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
@@ -27,10 +27,9 @@ import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.PersistenceTest;
-@Category({IntegrationTest.class, PersistenceTest.class})
+@Category({PersistenceTest.class})
public class DefaultDiskDirsIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index f3c2157..815725b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -39,9 +39,8 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class AcceptorImplJUnitTest {
DistributedSystem system;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index bf77c8a..bff62c5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -44,12 +44,11 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Make sure max-connections on cache server is enforced
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class CacheServerMaxConnectionsJUnitTest {
private static final int MAX_CNXS = 100;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
index 93ef5b8..b3cd118 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
@@ -17,14 +17,13 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Just like its parent but enables the server thread pool (aka selector).
*
*
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class CacheServerSelectorMaxConnectionsJUnitTest extends CacheServerMaxConnectionsJUnitTest {
protected int getMaxThreads() {
return 2;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
index 6ae910c..8df649d 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorIntegrationTest.java
@@ -48,12 +48,11 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This is a functional-test for <code>ClientHealthMonitor</code>.
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientHealthMonitorIntegrationTest {
public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
index b60ac4f..7249171 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorIntegrationTest.java
@@ -17,14 +17,13 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Just like its parent but enables the server thread pool (aka selector).
*
*
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientHealthMonitorSelectorIntegrationTest extends ClientHealthMonitorIntegrationTest {
protected int getMaxThreads() {
return 2;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index 1f061c4..26c87c9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -57,13 +57,12 @@ import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
*
* Tests the functionality of operations of AbstractConnectionProxy & its derived classes.
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ConnectionProxyJUnitTest {
private static final String expectedRedundantErrorMsg =
"Could not find any server to create redundant client queue on.";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
index 56d06e9..a176ec8 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
@@ -30,9 +30,8 @@ import org.apache.geode.internal.cache.FilterProfile;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.InterestType;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class FilterProfileIntegrationJUnitTest {
private static String regionName = "test";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index 923f4dc..f40ae51 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -33,14 +33,13 @@ import org.apache.geode.cache.client.Pool;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/**
* Tests the proper intialization of redundancyLevel property.
*
*/
-@Category({IntegrationTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class RedundancyLevelJUnitTest {
private static final String expectedRedundantErrorMsg =
"Could not find any server to create redundant client queue on.";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
index a14fdda..7a9e63f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionIntegrationTest.java
@@ -46,10 +46,9 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ServerConnectionIntegrationTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
index 442b455..95c7a79 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorIntegrationTest.java
@@ -25,7 +25,6 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -35,9 +34,7 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class RegionVersionVectorIntegrationTest {
private Properties props = new Properties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
index 1e89afb..9461abd 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
@@ -44,14 +44,13 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
@RunWith(PowerMockRunner.class)
-@Category({IntegrationTest.class, WanTest.class})
+@Category({WanTest.class})
@PrepareForTest(WANServiceProvider.class)
@PowerMockRunnerDelegate(Parameterized.class)
@PowerMockIgnore({"javax.management.*", "javax.security.*", "*.IntegrationTest"})
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 639cf44..5e5e756 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -41,10 +41,9 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.internal.cache.wan.AsyncEventQueueConfigurationException;
import org.apache.geode.internal.cache.wan.MyGatewayEventFilter;
import org.apache.geode.test.junit.categories.AEQTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category({IntegrationTest.class, AEQTest.class})
+@Category({AEQTest.class})
@RunWith(JUnitParamsRunner.class)
public class AsyncEventQueueValidationsJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
index 74a1018..c840d81 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/parallel/WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.WaitUntilGatewaySenderFlushedCoordinatorJUnitTest;
import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator.WaitUntilBucketRegionQueueFlushedCallable;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.WanTest;
-@Category({IntegrationTest.class, WanTest.class})
+@Category({WanTest.class})
public class WaitUntilParallelGatewaySenderFlushedCoordinatorJUnitTest
extends WaitUntilGatewaySenderFlushedCoordinatorJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
index 6e82ec1..f0f4814 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -32,21 +32,18 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test cases for {@link CacheXmlParser}.
*
* @since GemFire 8.1
*/
-@Category(IntegrationTest.class)
public class CacheXmlParserJUnitTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
index 59fd699..03bf8ac 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/compression/SnappyCompressorJUnitTest.java
@@ -17,16 +17,13 @@ package org.apache.geode.internal.compression;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.compression.Compressor;
import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests the Snappy {@link Compressor}.
*/
-@Category(IntegrationTest.class)
public class SnappyCompressorJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
index ce41b9e..d82d119 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/AbstractPoolCacheJUnitTest.java
@@ -42,15 +42,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
public class AbstractPoolCacheJUnitTest {
private static Properties props = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
index e080d43..7b86d4d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/CleanUpJUnitTest.java
@@ -29,12 +29,10 @@ import javax.naming.Context;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
@@ -43,7 +41,6 @@ import org.apache.geode.util.test.TestUtil;
* To change the template for this generated type comment go to Window - Preferences - Java - Code
* Generation - Code and Comments
*/
-@Category(IntegrationTest.class)
public class CleanUpJUnitTest {
private static Properties props = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
index dd94b88..2846ae9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
@@ -34,18 +34,15 @@ import javax.sql.PooledConnection;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/*
* this is a Multithreaded test for datasource connection pool.
*/
-@Category(IntegrationTest.class)
public class ConnectionPoolCacheImplJUnitTest {
protected static ConnectionPoolCacheImpl poolCache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
index dad1ff7..16cf6c2 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -36,16 +36,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
public class ConnectionPoolingJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
index e471428..a42619f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/DataSourceFactoryJUnitTest.java
@@ -26,15 +26,12 @@ import javax.naming.Context;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
public class DataSourceFactoryJUnitTest {
private static Properties props = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
index fd92c96..3dc1810 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/datasource/RestartJUnitTest.java
@@ -27,13 +27,11 @@ import java.util.Properties;
import javax.transaction.TransactionManager;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.jndi.JNDIInvoker;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
@@ -42,7 +40,6 @@ import org.apache.geode.util.test.TestUtil;
* This test check the graceful removal of all the resource (DataSources , TransactionManager and
* UserTransaction and its associated thread) before we reconnect to the distributed syatem.
*/
-@Category(IntegrationTest.class)
public class RestartJUnitTest {
private static Properties props = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
index c9bd05f..0464d0f 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/i18n/BasicI18nJUnitTest.java
@@ -28,15 +28,12 @@ import java.util.Set;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This class tests all basic i18n functionality.
*/
-@Category(IntegrationTest.class)
public class BasicI18nJUnitTest {
private static final Locale DEFAULT_LOCALE = Locale.getDefault();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
index 0b90f46..08f7114 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerIntegrationTest.java
@@ -23,13 +23,10 @@ import java.util.regex.Pattern;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class MainWithChildrenRollingFileHandlerIntegrationTest {
private String name;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
index 6f0a936..230ab34 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/BlockingTimeOutJUnitTest.java
@@ -39,17 +39,14 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
public class BlockingTimeOutJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
index 39a4209..d60f623 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/DataSourceJTAJUnitTest.java
@@ -31,13 +31,11 @@ import javax.transaction.UserTransaction;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/**
@@ -49,7 +47,6 @@ import org.apache.geode.util.test.TestUtil;
* after inserts abd before commit or rollback.
*
*/
-@Category(IntegrationTest.class)
public class DataSourceJTAJUnitTest {
@AfterClass
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
index 38ed2c0..7f2371e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/ExceptionJUnitTest.java
@@ -29,15 +29,12 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Check if the correct expectations are being thrown when they are supposed to.
*/
-@Category(IntegrationTest.class)
public class ExceptionJUnitTest {
private static DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
index 5e4b1a9..6d8e6bc 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/GlobalTransactionJUnitTest.java
@@ -33,17 +33,14 @@ import javax.transaction.UserTransaction;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.datasource.GemFireBasicDataSource;
import org.apache.geode.internal.datasource.GemFireTransactionDataSource;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
public class GlobalTransactionJUnitTest {
private static Properties props = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
index 65745e3..67f6089 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/JtaIntegrationJUnitTest.java
@@ -26,7 +26,6 @@ import javax.transaction.TransactionManager;
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -35,13 +34,11 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Moved some non-DUnit tests over from org/apache/geode/internal/jta/dunit/JTADUnitTest
*
*/
-@Category(IntegrationTest.class)
public class JtaIntegrationJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
index 4a295b2..64a5fa2 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/SetOperationJTAJUnitTest.java
@@ -36,7 +36,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
@@ -53,9 +52,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TXStateProxyImpl;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
@RunWith(JUnitParamsRunner.class)
public class SetOperationJTAJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
index 93ba65c..075d1be 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
@@ -31,12 +31,9 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class TransactionImplJUnitTest {
private static DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
index 73cafd8..7885a38 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionManagerImplJUnitTest.java
@@ -36,16 +36,13 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test TransactionManagerImpl methods not tested by UserTransactionImplTest
*
*/
-@Category(IntegrationTest.class)
public class TransactionManagerImplJUnitTest {
private static DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
index 1c0d1f9..c02e804 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/TransactionTimeOutJUnitTest.java
@@ -40,7 +40,6 @@ import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.runners.MethodSorters;
@@ -48,13 +47,11 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.datasource.GemFireTransactionDataSource;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
/**
* TODO: this test has no assertions or validations of any sort
*/
-@Category(IntegrationTest.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TransactionTimeOutJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
index 08a97f3..5be2591 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
@@ -30,12 +30,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class UserTransactionImplJUnitTest {
private static DistributedSystem ds;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
index a4f0d8b..a865f41 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/jta/functional/CacheJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -54,7 +53,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.jta.CacheUtils;
import org.apache.geode.internal.jta.JTAUtils;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* This JUnit version is created from class org.apache.geode.internal.jta.functional.CacheTest1.
@@ -64,7 +62,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* variations in DDL.
*
*/
-@Category(IntegrationTest.class)
public class CacheJUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
index acf16c1..f0b8898 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/CacheLogRollingIntegrationTest.java
@@ -39,7 +39,6 @@ import org.junit.rules.TestName;
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LoggingTest;
/**
@@ -47,7 +46,7 @@ import org.apache.geode.test.junit.categories.LoggingTest;
*
* @since GemFire 6.5
*/
-@Category({IntegrationTest.class, LoggingTest.class})
+@Category({LoggingTest.class})
public class CacheLogRollingIntegrationTest {
private static final int MAX_LOG_STATEMENTS = 100000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
index 36daaac..a1dbe41 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -53,14 +53,13 @@ import org.apache.geode.internal.logging.log4j.FastLogger;
import org.apache.geode.internal.logging.log4j.LogWriterLogger;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LoggingTest;
/**
* Connects DistributedSystem and tests logging behavior at a high level.
*
*/
-@Category({IntegrationTest.class, LoggingTest.class})
+@Category({LoggingTest.class})
public class DistributedSystemLogFileJUnitTest {
@Rule
public TestName name = new TestName();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
index 089a4d3..557740f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileJUnitTest.java
@@ -43,13 +43,12 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.logging.log4j.LogWriterLogger;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LoggingTest;
/**
* Creates Locator and tests logging behavior at a high level.
*/
-@Category({IntegrationTest.class, LoggingTest.class})
+@Category({LoggingTest.class})
public class LocatorLogFileJUnitTest {
protected static final int TIMEOUT_MILLISECONDS = 180 * 1000; // 2 minutes
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
index 89fc6a3..b3326d3 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationJUnitTest.java
@@ -36,14 +36,13 @@ import org.junit.rules.ExternalResource;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LoggingTest;
/**
* Integration tests for LogService and how it configures and uses log4j2
*
*/
-@Category({IntegrationTest.class, LoggingTest.class})
+@Category({LoggingTest.class})
public class LogServiceIntegrationJUnitTest {
private static final String DEFAULT_CONFIG_FILE_NAME = "log4j2.xml";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
index bf23a7d..0228ef3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/MergeLogFilesJUnitTest.java
@@ -40,7 +40,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
import org.apache.geode.test.dunit.ThreadUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LoggingTest;
/**
@@ -48,7 +47,7 @@ import org.apache.geode.test.junit.categories.LoggingTest;
*
*
*/
-@Category({IntegrationTest.class, LoggingTest.class})
+@Category({LoggingTest.class})
public class MergeLogFilesJUnitTest {
//////// Test Methods
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
index 49db8a2..184d8a3 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigLocatorJUnitTest.java
@@ -31,17 +31,14 @@ import java.util.Set;
import org.junit.AfterClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* UnitTest for ConfigLocator which is used to find the Log4J 2 configuration file.
*
* @since GemFire 8.2
*/
-@Category(IntegrationTest.class)
public class ConfigLocatorJUnitTest {
private static Set<String> suffixesNotFoundTested = new HashSet<String>();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
index f5e51f3..44782b8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerIntegrationJUnitTest.java
@@ -34,11 +34,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Tests FastLogger isDebugEnabled and isTraceEnabled with various configurations.
@@ -46,7 +44,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* For filters see https://logging.apache.org/log4j/2.0/manual/filters.html
*
*/
-@Category(IntegrationTest.class)
public class FastLoggerIntegrationJUnitTest {
private static final String TEST_LOGGER_NAME = FastLogger.class.getPackage().getName();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
index a65e44c..47ceebe 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/FastLoggerWithDefaultConfigJUnitTest.java
@@ -25,16 +25,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for FastLogger when using the default log4j2 config for GemFire.
*
*/
-@Category(IntegrationTest.class)
public class FastLoggerWithDefaultConfigJUnitTest {
private static final String TEST_LOGGER_NAME = FastLogger.class.getPackage().getName();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
index d9b7ac2..9d1f17b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeVerboseLogMarkerIntegrationTest.java
@@ -30,18 +30,15 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.custom.BasicAppender;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests with accept and deny of GEODE_VERBOSE and GEMFIRE_VERBOSE.
*/
-@Category(IntegrationTest.class)
public class GeodeVerboseLogMarkerIntegrationTest {
private static final String RESOURCE_PACKAGE = "/org/apache/geode/internal/logging/log4j/marker/";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 84d5947..f00df4a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -35,7 +35,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
@@ -44,12 +43,10 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests with custom log4j2 configuration.
*/
-@Category(IntegrationTest.class)
public class CustomConfigWithCacheIntegrationTest {
private String beforeConfigFileProp;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
index ee996d3..efc122b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/custom/CustomConfigWithLogServiceIntegrationTest.java
@@ -32,17 +32,14 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.SystemErrRule;
import org.junit.contrib.java.lang.system.SystemOutRule;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests with custom log4j2 configuration.
*/
-@Category(IntegrationTest.class)
public class CustomConfigWithLogServiceIntegrationTest {
private String beforeConfigFileProp;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
index e38c676..b6f9a2f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
@@ -36,7 +36,6 @@ import org.apache.geode.distributed.ClientSocketFactory;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for ClientSocketFactory.
@@ -44,7 +43,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* <p>
* Extracted from {@code JSSESocketJUnitTest}.
*/
-@Category({IntegrationTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientSocketFactoryIntegrationTest {
private static final String EXCEPTION_MESSAGE =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 182c77f..20b6c38 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -60,7 +60,6 @@ import org.junit.rules.TestName;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionConfigImpl;
import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -71,7 +70,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @see ClientSocketFactoryIntegrationTest
*/
-@Category({IntegrationTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SSLSocketIntegrationTest {
private static final String MESSAGE = SSLSocketIntegrationTest.class.getName() + " Message";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
index 6855a0e..cfd109a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/FreeListOffHeapRegionJUnitTest.java
@@ -17,10 +17,9 @@ package org.apache.geode.internal.offheap;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class FreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
index 6f39287..7c63af3 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/InlineKeyJUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapObjectKey
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapStringKey1;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapStringKey2;
import org.apache.geode.internal.cache.entries.VMThinRegionEntryOffHeapUUIDKey;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class InlineKeyJUnitTest {
private GemFireCacheImpl createCache() {
Properties props = new Properties();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
index dd93e83..0f8f22d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
@@ -31,13 +31,12 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
* Tests fill pattern validation for the {@link MemoryAllocatorImpl}.
*/
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class MemoryAllocatorFillPatternIntegrationTest {
private static Random random = ThreadLocalRandom.current();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
index 843382c..30d17de 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapIndexJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.RegionNotFoundException;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -43,7 +42,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
*
*/
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class OffHeapIndexJUnitTest {
private GemFireCacheImpl gfc;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
index 04dddcf..1f5a946 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java
@@ -33,13 +33,12 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
* Test to reproduce GEODE-2097.
*/
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class OffHeapLRURecoveryRegressionTest {
static final String DS_NAME = "OffHeapLRURecoveryRegressionTestDS";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
index b5aafbf..6468a11 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapValidationJUnitTest.java
@@ -61,14 +61,13 @@ import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
* Basic integration tests for validating the off-heap implementation.
*
*/
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class OffHeapValidationJUnitTest {
private GemFireCacheImpl cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
index 525286f..77da7d1 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OldFreeListOffHeapRegionJUnitTest.java
@@ -17,10 +17,9 @@ package org.apache.geode.internal.offheap;
import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class OldFreeListOffHeapRegionJUnitTest extends OffHeapRegionBase {
@Override
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
index b2214ae..e74e1bf 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
@@ -29,10 +29,9 @@ import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({IntegrationTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class TxReleasesOffHeapOnCloseJUnitTest {
protected Cache cache;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
index d22d92a..c3e10c0 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderIntegrationTest.java
@@ -20,10 +20,8 @@ import static org.junit.Assume.assumeFalse;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessStreamReader.ReadingMode;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for BlockingProcessStreamReader. All tests are skipped on Windows
@@ -34,7 +32,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.2
*/
-@Category(IntegrationTest.class)
public class BlockingProcessStreamReaderIntegrationTest
extends BaseProcessStreamReaderIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
index 30e6df4..984cbea 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BlockingProcessStreamReaderWindowsTest.java
@@ -26,10 +26,8 @@ import java.util.concurrent.TimeoutException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessStreamReader.ReadingMode;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
@@ -43,7 +41,6 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
*
* @since GemFire 8.2
*/
-@Category(IntegrationTest.class)
public class BlockingProcessStreamReaderWindowsTest
extends AbstractProcessStreamReaderIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
index 0f80deb6..f73ef41 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
@@ -28,17 +28,14 @@ import java.io.File;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.process.ControlFileWatchdog.ControlRequestHandler;
import org.apache.geode.internal.process.io.EmptyFileWriter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link ControlFileWatchdog}.
*/
-@Category(IntegrationTest.class)
public class ControlFileWatchdogIntegrationTest {
private static final int TEN_MINUTES_MILLIS = 10 * 60 * 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
index 903f08f..ad7567c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControllableProcessIntegrationTest.java
@@ -28,15 +28,12 @@ import java.io.File;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.distributed.AbstractLauncher.ServiceState;
import org.apache.geode.internal.process.ControlFileWatchdog.ControlRequestHandler;
import org.apache.geode.internal.process.io.EmptyFileWriter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class ControllableProcessIntegrationTest {
private LocalProcessLauncher localProcessLauncher;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
index 045c53a..43b8cd7 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/FileProcessControllerIntegrationTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.internal.process.io.EmptyFileWriter;
import org.apache.geode.internal.process.io.IntegerFileWriter;
import org.apache.geode.internal.process.io.StringFileWriter;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
@@ -56,7 +55,6 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
* This test shows one of the more appropriate uses of ErrorCollector Rule -- catching any failed
* assertions in another thread that isn't the main JUnit thread.
*/
-@Category(IntegrationTest.class)
public class FileProcessControllerIntegrationTest {
private static final String STATUS_JSON = generateStatusJson();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
index 2bcdeb3..f0b37f5 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/LocalProcessLauncherIntegrationTest.java
@@ -25,14 +25,12 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.process.io.EmptyFileWriter;
import org.apache.geode.internal.process.io.IntegerFileWriter;
import org.apache.geode.internal.process.lang.AvailablePid;
import org.apache.geode.test.junit.Retry;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.RetryRule;
/**
@@ -42,7 +40,6 @@ import org.apache.geode.test.junit.rules.RetryRule;
* Tests involving fakePid use {@link RetryRule} because the fakePid may become used by a real
* process before the test executes.
*/
-@Category(IntegrationTest.class)
public class LocalProcessLauncherIntegrationTest {
private static final int PREFERRED_FAKE_PID = 42;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
index 000318c..f0928f8 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NativeProcessUtilsIntegrationTest.java
@@ -26,16 +26,13 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.util.StopWatch;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link NativeProcessUtils}.
*/
-@Category(IntegrationTest.class)
public class NativeProcessUtilsIntegrationTest {
/** Max sleep timeout for {@link ProcessSleeps} */
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
index 05b7cbc..5ab90e7 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/NonBlockingProcessStreamReaderIntegrationTest.java
@@ -17,10 +17,8 @@ package org.apache.geode.internal.process;
import static org.apache.geode.internal.process.ProcessStreamReader.ReadingMode.NON_BLOCKING;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.process.ProcessStreamReader.ReadingMode;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for NonBlockingProcessStreamReader which was introduced to fix TRAC
@@ -31,7 +29,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.2
*/
-@Category(IntegrationTest.class)
public class NonBlockingProcessStreamReaderIntegrationTest
extends BaseProcessStreamReaderIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
index c3992dc..eed0376 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java
@@ -24,19 +24,16 @@ import java.io.FileNotFoundException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.process.io.IntegerFileWriter;
import org.apache.geode.internal.process.lang.AvailablePid;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link PidFile}.
*
* @since GemFire 8.2
*/
-@Category(IntegrationTest.class)
public class PidFileIntegrationTest {
private File directory;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
index a52c266..5055bd7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java
@@ -27,16 +27,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.internal.process.io.IntegerFileWriter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link ProcessControllerFactory}.
*/
-@Category(IntegrationTest.class)
public class ProcessControllerFactoryIntegrationTest {
private ProcessControllerFactory factory;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
index 0470c36..318b945 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/security/SecurityServiceFactoryShiroIntegrationTest.java
@@ -24,10 +24,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-@Category({IntegrationTest.class, SecurityTest.class})
+@Category({SecurityTest.class})
public class SecurityServiceFactoryShiroIntegrationTest {
private static final String SHIRO_INI_FILE = "SecurityServiceFactoryShiroIntegrationTest.ini";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
index 81f2233..23c8e16 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
@@ -45,13 +45,12 @@ import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.io.RollingFileHandler;
import org.apache.geode.internal.util.ArrayUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
* Flaky: GEODE-2790, GEODE-3205
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
@SuppressWarnings("unused")
public class DiskSpaceLimitIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
index 2b2bfaa..6747722 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsIntegrationTest.java
@@ -35,13 +35,12 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
* Integration tests for {@link Statistics} as implemented by {@link DistributedSystem}.
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class DistributedSystemStatisticsIntegrationTest {
private DistributedSystem system;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
index 288c226..a3a324f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DistributedSystemStatisticsTypeIntegrationTest.java
@@ -33,13 +33,12 @@ import org.apache.geode.StatisticDescriptor;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.StatisticsType;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
* Integration tests for {@link StatisticsType} as implemented by {@link DistributedSystem}.
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class DistributedSystemStatisticsTypeIntegrationTest {
private DistributedSystem system;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
index 21208ec..be13360 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class FileSizeLimitIntegrationTest {
private static final long FILE_SIZE_LIMIT = 1;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
index cb73983..033611e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/GemFireStatSamplerIntegrationTest.java
@@ -62,7 +62,6 @@ import org.apache.geode.internal.statistics.platform.ProcessStats;
import org.apache.geode.internal.stats50.VMStats50;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -70,7 +69,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since GemFire 7.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class GemFireStatSamplerIntegrationTest extends StatSamplerTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
index 08659c8..21b29ca 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
@@ -45,14 +45,13 @@ import org.apache.geode.CancelCriterion;
import org.apache.geode.Statistics;
import org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics;
import org.apache.geode.internal.statistics.platform.LinuxSystemStats;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
* Technically a linux only test - the file handling is all mocked up so the test can run on any
* host os.
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("*.IntegrationTest")
@PrepareForTest(LinuxProcFsStatistics.class)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
index 4d153d6..b61b1ec 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/SimpleStatSamplerIntegrationTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.stats50.VMStats50;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -46,7 +45,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since GemFire 7.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class SimpleStatSamplerIntegrationTest extends StatSamplerTestCase {
private LocalStatisticsFactory statisticsFactory;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
index ebe74af..88e99df 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveHandlerIntegrationTest.java
@@ -33,13 +33,12 @@ import org.junit.runner.RunWith;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.io.RollingFileHandler;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
* Tests behavior that interacts with file system.
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
@RunWith(JUnitParamsRunner.class)
public class StatArchiveHandlerIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
index a766487..e4eb66a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstGeneratorTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -34,7 +33,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since Geode 1.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class StatArchiveWithConsecutiveResourceInstGeneratorTest
extends StatArchiveWithConsecutiveResourceInstGenerator {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
index 77ea0a4..5ea7f4a 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithConsecutiveResourceInstIntegrationTest.java
@@ -37,7 +37,6 @@ import org.junit.rules.TestName;
import org.apache.geode.internal.SystemAdmin.StatSpec;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
import org.apache.geode.internal.statistics.StatArchiveReader.StatValue;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -49,7 +48,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since Geode 1.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class StatArchiveWithConsecutiveResourceInstIntegrationTest {
private static final Logger logger = LogManager.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
index 9be3408..ac1e2e7 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -43,7 +42,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
* <p>
* GEODE-2013: StatArchiveReader throws NullPointerException due to missing ResourceType
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class StatArchiveWithMissingResourceTypeRegressionTest {
private static final String ARCHIVE_FILE_NAME =
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
index 613d7ba..a320f2a 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatArchiveWriterReaderIntegrationTest.java
@@ -53,7 +53,6 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.statistics.StatArchiveReader.StatValue;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
import org.apache.geode.util.test.TestUtil;
@@ -62,7 +61,7 @@ import org.apache.geode.util.test.TestUtil;
*
* @since GemFire 7.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
@SuppressWarnings({"rawtypes", "unused"})
public class StatArchiveWriterReaderIntegrationTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
index 8eaefc9..59af828 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatSamplerIntegrationTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.Statistics;
import org.apache.geode.StatisticsType;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.statistics.StatArchiveReader.StatValue;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -51,7 +50,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since GemFire 7.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class StatSamplerIntegrationTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
index eb3b40b..520cdca 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.StatisticsType;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class StatTypesAreRolledOverRegressionTest {
private static final long FILE_SIZE_LIMIT = 512;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
index 665f5d1..43392b5 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/ValueMonitorIntegrationTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.io.MainWithChildrenRollingFileHandler;
import org.apache.geode.internal.statistics.StatisticsNotification.Type;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.StatisticsTest;
/**
@@ -52,7 +51,7 @@ import org.apache.geode.test.junit.categories.StatisticsTest;
*
* @since GemFire 7.0
*/
-@Category({IntegrationTest.class, StatisticsTest.class})
+@Category({StatisticsTest.class})
public class ValueMonitorIntegrationTest {
private Mockery mockContext;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
index 4282df6..46753c9 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.atomic.AtomicReference;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.Statistics;
@@ -32,9 +31,7 @@ import org.apache.geode.StatisticsType;
import org.apache.geode.StatisticsTypeFactory;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
public class AtomicStatsJUnitTest {
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
index 59918e3..2ab3370 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
@@ -26,12 +26,9 @@ import java.util.Random;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
@SuppressWarnings({"rawtypes", "unchecked"})
public class ConcurrentHashMapIteratorJUnitTest {
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
index 6c4b80c..d43c39c 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/CopyOnWriteHashMapJUnitTest.java
@@ -40,16 +40,13 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.concurrent.cm.ConcurrentHashMapJUnitTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
/**
* Adopted from the JSR166 test cases. {@link ConcurrentHashMapJUnitTest}
*/
-@Category(IntegrationTest.class)
public class CopyOnWriteHashMapJUnitTest extends JSR166TestCase { // TODO: reformat
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
index d93dc26..1412203 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/ConcurrentHashMapJUnitTest.java
@@ -41,13 +41,10 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class ConcurrentHashMapJUnitTest extends JSR166TestCase { // TODO: reformat
/**
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
index c41d305..1939110 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/CountedMapLoopsJUnitTest.java
@@ -34,12 +34,9 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class CountedMapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
static int nkeys = 100000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
index b3a712f..6be6665 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/IntMapCheckJUnitTest.java
@@ -38,12 +38,9 @@ import java.util.Random;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class IntMapCheckJUnitTest extends JSR166TestCase { // TODO: reformat
static int absentSize;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
index 59138b8..5a3de33 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapCheckJUnitTest.java
@@ -38,12 +38,9 @@ import java.util.Random;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class MapCheckJUnitTest extends JSR166TestCase { // TODO: reformat
static final int absentSize = 1 << 17;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
index dfba6f1..1d2ba0d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/MapLoopsJUnitTest.java
@@ -34,12 +34,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class MapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
static int nkeys = 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
index c0ff926..e794c87 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/RLJBarJUnitTest.java
@@ -22,12 +22,9 @@ import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class RLJBarJUnitTest extends JSR166TestCase { // TODO: reformat
public static final int ITERS = 10;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
index bdd38ec..0365d15 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/util/concurrent/cm/StringMapLoopsJUnitTest.java
@@ -34,12 +34,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.JSR166TestCase;
-@Category(IntegrationTest.class)
public class StringMapLoopsJUnitTest extends JSR166TestCase { // TODO: reformat
static int nkeys = 1000;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
index 2d773a1..32781aa 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/FederatingManagerIntegrationTest.java
@@ -31,11 +31,10 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.management.internal.FederatingManager;
import org.apache.geode.management.internal.MemberMessenger;
import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class FederatingManagerIntegrationTest {
@Rule
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
index e65f7d7..9803700 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/QueryDataFunctionIntegrationTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.test.junit.categories.GfshTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Functional integration tests for {@link QueryDataFunction}.
@@ -64,7 +63,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 8.1
*/
-@Category({IntegrationTest.class, GfshTest.class})
+@Category({GfshTest.class})
public class QueryDataFunctionIntegrationTest {
private static final String REPLICATED_REGION = "exampleRegion";
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
index 1445ecd..b777ac0 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
@@ -22,10 +22,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.StatisticDescriptor;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueStats;
import org.apache.geode.management.internal.beans.AsyncEventQueueMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class AsyncEventQueueStatsJUnitTest extends MBeanStatsTestCase {
private AsyncEventQueueMBeanBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
index 14465c4..ded4e91 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
@@ -23,10 +23,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.management.internal.beans.CacheServerBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class CacheServerStatsJUnitTest extends MBeanStatsTestCase {
private CacheServerBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
index ee61f37..39cc270 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
@@ -24,10 +24,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.cache.DiskStoreStats;
import org.apache.geode.management.internal.beans.DiskStoreMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class DiskStatsJUnitTest extends MBeanStatsTestCase {
private DiskStoreMBeanBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
index 6f80e7c..d44402d 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -42,14 +42,13 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
/**
*
* @since GemFire 1.4
*/
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class DistributedSystemStatsJUnitTest {
protected static final long SLEEP = 100;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
index b76b5c4..53f1e4b 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
@@ -25,10 +25,9 @@ import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderStats;
import org.apache.geode.management.internal.beans.GatewaySenderMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class GatewayMBeanBridgeJUnitTest extends MBeanStatsTestCase {
private GatewaySenderMBeanBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
index 3b82149..a9c568f 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
@@ -23,10 +23,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.ServerLoad;
import org.apache.geode.internal.cache.wan.GatewayReceiverStats;
import org.apache.geode.management.internal.beans.GatewayReceiverMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class GatewayReceiverStatsJUnitTest extends MBeanStatsTestCase {
private GatewayReceiverMBeanBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
index 76f8d6e..ff27c75 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.internal.statistics.VMStatsContract;
import org.apache.geode.internal.stats50.VMStats50;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.internal.beans.MemberMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class MemberLevelStatsJUnitTest extends MBeanStatsTestCase {
@Rule
public TestName name = new TestName();
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
index 8bc6a2e..fea30be 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/bean/stats/RegionStatsJUnitTest.java
@@ -26,14 +26,13 @@ import org.apache.geode.internal.cache.PartitionedRegionStats;
import org.apache.geode.management.internal.beans.DiskRegionBridge;
import org.apache.geode.management.internal.beans.PartitionedRegionBridge;
import org.apache.geode.management.internal.beans.RegionMBeanBridge;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.JMXTest;
/**
* Implementing RegionMXBean to ensure test coverage
*
*/
-@Category({IntegrationTest.class, JMXTest.class})
+@Category({JMXTest.class})
public class RegionStatsJUnitTest extends MBeanStatsTestCase {
private RegionMBeanBridge bridge;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
index c44473c..80f5c83 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/ManagementAdapterTest.java
@@ -33,16 +33,13 @@ import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.DiskStoreStats;
import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class ManagementAdapterTest {
private InternalCache cache = null;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
index 2a2fed0..5a2c10e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/beans/RegionMBeanAttributesTest.java
@@ -23,16 +23,13 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.management.RegionMXBean;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.MBeanServerConnectionRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
-@Category(IntegrationTest.class)
public class RegionMBeanAttributesTest {
private RegionMXBean bean;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
index d36d15b..b653bb1 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java
@@ -25,10 +25,9 @@ import org.springframework.shell.core.Completion;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.GfshTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.GfshParserRule;
-@Category({IntegrationTest.class, GfshTest.class})
+@Category({GfshTest.class})
... 3258 lines suppressed ...
[geode] 26/46: GEODE-5363: Cleanup dependencies and format.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3ab17cbee478d282ca7444d5eae3f0477f05bb59
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 10:05:27 2018 -0700
GEODE-5363: Cleanup dependencies and format.
---
extensions/geode-modules-session/build.gradle | 2 ++
extensions/geode-modules-tomcat7/build.gradle | 2 ++
extensions/geode-modules-tomcat8/build.gradle | 1 +
extensions/geode-modules/build.gradle | 2 ++
geode-assembly/build.gradle | 3 +++
geode-connectors/build.gradle | 2 ++
.../index/IndexTrackingQueryObserverDUnitTest.java | 3 ++-
.../org/apache/geode/cache/query/dunit/TestObject.java | 15 +++++++++++++++
.../cache/query/internal/index/IndexTrackingTestHook.java | 15 +++++++++++++++
.../apache/geode/internal/DataSerializableJUnitTest.java | 8 +++++++-
10 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
index 81adfea..5d455ef 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':extensions/geode-modules-session-internal')
compile project(':geode-core')
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index 63ebdd9..7e5b411 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile(project(':extensions/geode-modules')) {
// Remove everything related to Tomcat 6.x
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index f837fc0..0b82b5b 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
dependencies {
compile(project(':extensions/geode-modules')) {
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 0986f85..ed007a4 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
dependencies {
compile project(':geode-core')
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 3d3f469..8319b09 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -14,8 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact;
+evaluationDependsOn(":geode-core")
+
apply plugin: 'distribution'
// disable artifact generation for this project
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index f9e4c88..22a265f 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+evaluationDependsOn(":geode-core")
+
repositories {
maven {
url 'https://dl.bintray.com/palantir/releases'
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 7992b54..0c2c92f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -186,7 +186,8 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
Index keyIndex1 = null;
try {
if (create) {
- keyIndex1 = (IndexProtocol) qs.createIndex(IndexTrackingTestHook.INDEX_NAME, IndexType.FUNCTIONAL, "ID",
+ keyIndex1 = (IndexProtocol) qs.createIndex(IndexTrackingTestHook.INDEX_NAME,
+ IndexType.FUNCTIONAL, "ID",
"/portfolio ");
assertNotNull(keyIndex1);
assertTrue(keyIndex1 instanceof PartitionedIndex);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
index 91b7353..52e0c78 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
@@ -1,3 +1,18 @@
+/*
+ * 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.cache.query.dunit;
import java.io.DataInput;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
index 612e8c1..c228f07 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
@@ -1,3 +1,18 @@
+/*
+ * 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.cache.query.internal.index;
import static org.junit.Assert.assertEquals;
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 5ffd100..5b7cfb5 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,6 +14,13 @@
*/
package org.apache.geode.internal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -49,7 +56,6 @@ import java.util.UUID;
import java.util.Vector;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
[geode] 19/46: GEODE-5363: Moves geode-modules-session tests into
new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3fd9c3fc4bdf92cfc654936e7a9304b2a79162a6
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:07:44 2018 -0700
GEODE-5363: Moves geode-modules-session tests into new source sets.
---
extensions/geode-modules-session/build.gradle | 21 +++++++++++++++++++++
.../session/installer/InstallerJUnitTest.java | 0
.../session/internal/filter/AbstractListener.java | 0
.../session/internal/filter/BasicServlet.java | 0
.../modules/session/internal/filter/Callback.java | 0
.../session/internal/filter/CallbackServlet.java | 0
.../session/internal/filter/CommonTests.java | 0
.../filter/HttpSessionAttributeListenerImpl.java | 0
.../filter/HttpSessionBindingListenerImpl.java | 0
.../session/internal/filter/MyServletTester.java | 0
.../session/internal/filter/RendezvousManager.java | 0
.../filter/ServletRequestAttributeListenerImpl.java | 0
.../internal/filter/ServletRequestListenerImpl.java | 0
.../SessionReplicationIntegrationJUnitTest.java | 0
.../filter/SessionReplicationJUnitTest.java | 0
.../SessionReplicationLocalCacheJUnitTest.java | 0
.../session/junit/ChildFirstClassLoader.java | 0
.../geode/modules/session/junit/NamedRunner.java | 0
.../session/junit/PerTestClassLoaderRunner.java | 0
.../resources/log4j.properties | 0
.../session/installer/InstallerJUnitTest.web.xml | 0
.../installer/InstallerJUnitTest.web.xml.expected | 0
22 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
index 0469070..81adfea 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -42,3 +42,24 @@ jar {
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/NamedRunner.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/NamedRunner.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
diff --git a/extensions/geode-modules-session/src/test/resources/log4j.properties b/extensions/geode-modules-session/src/integrationTest/resources/log4j.properties
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/log4j.properties
rename to extensions/geode-modules-session/src/integrationTest/resources/log4j.properties
diff --git a/extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml b/extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
rename to extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
diff --git a/extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected b/extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected
rename to extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected
[geode] 17/46: GEODE-5363: Moves geode-modules-tomcat7 tests into
new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c391aa6cd71a88d74b313aaa31aa6e4f28e46909
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 06:59:53 2018 -0700
GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets.
---
extensions/geode-modules-tomcat7/build.gradle | 21 +++++++++++++++++++++
.../modules/session/Tomcat7SessionsJUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep | 0
.../resources/tomcat/temp}/.gitkeep | 0
5 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index 21096f9..63ebdd9 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -49,3 +49,24 @@ dependencies {
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
rename to extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep
[geode] 40/46: GEODE-5363: Removes DistributedTest category.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 042d7ac1d85df2565bcec3d4be247f818068836b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 10 12:41:59 2018 -0700
GEODE-5363: Removes DistributedTest category.
---
.../Tomcat8SessionsClientServerDUnitTest.java | 3 +--
.../modules/session/Tomcat8SessionsDUnitTest.java | 3 +--
.../LauncherLifecycleCommandsDUnitTest.java | 3 +--
.../internal/web/RestFunctionExecuteDUnitTest.java | 3 +--
.../RestAPIOnRegionFunctionExecutionDUnitTest.java | 3 +--
.../internal/web/controllers/RestAPITestBase.java | 3 +--
.../controllers/RestAPIsAndInterOpsDUnitTest.java | 3 +--
.../RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 3 +--
...RestAPIsOnMembersFunctionExecutionDUnitTest.java | 3 +--
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 3 +--
.../apache/geode/session/tests/CargoTestBase.java | 3 +--
.../TomcatSessionBackwardsCompatibilityTest.java | 3 +--
.../cli/AlterConnectionCommandDUnitTest.java | 3 +--
.../internal/cli/AlterMappingCommandDUnitTest.java | 3 +--
.../cli/CreateConnectionCommandDUnitTest.java | 3 +--
.../internal/cli/CreateMappingCommandDUnitTest.java | 3 +--
.../cli/DescribeConnectionCommandDUnitTest.java | 3 +--
.../cli/DescribeMappingCommandDUnitTest.java | 3 +--
.../cli/DestroyConnectionCommandDUnitTest.java | 3 +--
.../cli/DestroyMappingCommandDunitTest.java | 3 +--
.../cli/JdbcClusterConfigDistributedTest.java | 3 +--
.../cli/ListConnectionCommandDUnitTest.java | 3 +--
.../internal/cli/ListMappingCommandDUnitTest.java | 4 +---
.../geode/cache/ClientServerTimeSyncDUnitTest.java | 3 +--
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 3 +--
.../geode/cache/ConnectionPoolAutoDUnitTest.java | 3 +--
.../apache/geode/cache/ConnectionPoolDUnitTest.java | 3 +--
.../CreateAndLocalDestroyInTXRegressionTest.java | 4 +---
.../geode/cache/PRCacheListenerDistributedTest.java | 4 +---
...istenerWithInterestPolicyAllDistributedTest.java | 4 +---
.../PRCreationTotalNumBucketsDistributedTest.java | 4 +---
.../cache/RegionClearStatsDistributedTest.java | 4 +---
.../cache/RegionExpirationDistributedTest.java | 4 +---
.../ReplicateCacheListenerDistributedTest.java | 4 +---
.../ClientServerRegisterInterestsDUnitTest.java | 3 +--
...eAllCacheListenerClientServerRegressionTest.java | 3 +--
.../internal/AutoConnectionSourceDUnitTest.java | 3 +--
.../internal/CacheServerSSLConnectionDUnitTest.java | 3 +--
.../internal/LocatorLoadBalancingDUnitTest.java | 3 +--
.../client/internal/SSLNoClientAuthDUnitTest.java | 3 +--
.../cache/management/MemoryThresholdsDUnitTest.java | 3 +--
.../MemoryThresholdsOffHeapDUnitTest.java | 3 +--
.../cache/management/ResourceManagerDUnitTest.java | 3 +--
.../partition/PartitionRegionHelperDUnitTest.java | 4 +---
.../query/dunit/CompactRangeIndexDUnitTest.java | 3 +--
.../cache/query/dunit/CompiledInDUnitTest.java | 3 +--
.../query/dunit/CorruptedIndexIntegrationTest.java | 3 +--
.../dunit/GroupByPartitionedQueryDUnitTest.java | 3 +--
.../cache/query/dunit/GroupByQueryDUnitTest.java | 3 +--
.../geode/cache/query/dunit/HashIndexDUnitTest.java | 3 +--
.../geode/cache/query/dunit/HelperTestCase.java | 3 +--
.../NonDistinctOrderByPartitionedDUnitTest.java | 3 +--
.../query/dunit/OrderByPartitionedDUnitTest.java | 3 +--
...PartitionedRegionCompactRangeIndexDUnitTest.java | 3 +--
.../dunit/PdxGroupByPartitionedQueryDUnitTest.java | 3 +--
.../cache/query/dunit/PdxLocalQueryDUnitTest.java | 3 +--
.../dunit/PdxLocalQueryVersionedClassDUnitTest.java | 3 +--
.../geode/cache/query/dunit/PdxQueryDUnitTest.java | 3 +--
.../cache/query/dunit/PdxStringQueryDUnitTest.java | 3 +--
.../dunit/QueryDataInconsistencyDUnitTest.java | 3 +--
.../cache/query/dunit/QueryIndexDUnitTest.java | 3 +--
.../query/dunit/QueryIndexUsingXMLDUnitTest.java | 3 +--
.../dunit/QueryParamsAuthorizationDUnitTest.java | 3 +--
.../dunit/QueryUsingFunctionContextDUnitTest.java | 3 +--
.../cache/query/dunit/QueryUsingPoolDUnitTest.java | 3 +--
.../cache/query/dunit/RemoteQueryDUnitTest.java | 3 +--
.../ResourceManagerWithQueryMonitorDUnitTest.java | 3 +--
.../cache/query/dunit/SelectStarQueryDUnitTest.java | 3 +--
...oncurrentIndexInitOnOverflowRegionDUnitTest.java | 3 +--
...entIndexOperationsOnOverflowRegionDUnitTest.java | 3 +--
...dexUpdateWithInplaceObjectModFalseDUnitTest.java | 3 +--
.../ConcurrentIndexUpdateWithoutWLDUnitTest.java | 3 +--
.../internal/index/CopyOnReadIndexDUnitTest.java | 3 +--
.../index/IndexTrackingQueryObserverDUnitTest.java | 3 +--
.../InitializeIndexEntryDestroyQueryDUnitTest.java | 3 +--
.../internal/index/MultiIndexCreationDUnitTest.java | 3 +--
.../index/PutAllWithIndexPerfDUnitTest.java | 3 +--
.../partitioned/PRBasicIndexCreationDUnitTest.java | 3 +--
.../PRBasicMultiIndexCreationDUnitTest.java | 3 +--
.../query/partitioned/PRBasicQueryDUnitTest.java | 3 +--
.../partitioned/PRBasicRemoveIndexDUnitTest.java | 3 +--
.../partitioned/PRColocatedEquiJoinDUnitTest.java | 3 +--
.../query/partitioned/PRInvalidQueryDUnitTest.java | 3 +--
.../cache/query/partitioned/PRQueryDUnitTest.java | 3 +--
.../partitioned/PRQueryPortfolioDUnitTest.java | 3 +--
.../partitioned/PRQueryRegionCloseDUnitTest.java | 3 +--
.../PRQueryRegionDestroyedDUnitTest.java | 3 +--
.../PRQueryRemoteNodeExceptionDUnitTest.java | 3 +--
.../cache/snapshot/ParallelSnapshotDUnitTest.java | 3 +--
.../cache/snapshot/SnapshotByteArrayDUnitTest.java | 3 +--
.../geode/cache/snapshot/SnapshotDUnitTest.java | 3 +--
.../snapshot/SnapshotPerformanceDUnitTest.java | 3 +--
.../apache/geode/cache30/CacheCloseDUnitTest.java | 4 +---
.../apache/geode/cache30/CacheMapTxnDUnitTest.java | 4 +---
.../CacheRegionsReliablityStatsCheckDUnitTest.java | 4 +---
.../geode/cache30/CacheStatisticsDUnitTest.java | 4 +---
.../apache/geode/cache30/CacheXml70DUnitTest.java | 4 +---
.../apache/geode/cache30/CacheXml80DUnitTest.java | 4 +---
.../apache/geode/cache30/CacheXml81DUnitTest.java | 4 +---
.../geode/cache30/CacheXmlGeode10DUnitTest.java | 4 +---
.../geode/cache30/CachedAllEventsDUnitTest.java | 4 +---
.../apache/geode/cache30/CallbackArgDUnitTest.java | 4 +---
.../geode/cache30/ClearMultiVmCallBkDUnitTest.java | 4 +---
.../apache/geode/cache30/ClearMultiVmDUnitTest.java | 4 +---
.../geode/cache30/ClientMembershipDUnitTest.java | 3 +--
.../cache30/ClientMembershipSelectorDUnitTest.java | 3 +--
.../cache30/ClientRegisterInterestDUnitTest.java | 3 +--
.../ClientRegisterInterestSelectorDUnitTest.java | 3 +--
.../geode/cache30/ClientServerCCEDUnitTest.java | 3 +--
.../cache30/ConcurrentLeaveDuringGIIDUnitTest.java | 4 +---
...istributedNoAckAsyncOverflowRegionDUnitTest.java | 4 +---
.../DiskDistributedNoAckAsyncRegionDUnitTest.java | 5 +----
...DistributedNoAckSyncOverflowRegionDUnitTest.java | 4 +---
.../geode/cache30/DiskRegionDistributedTest.java | 4 +---
.../geode/cache30/DistAckMapMethodsDUnitTest.java | 4 +---
.../DistributedAckOverflowRegionCCEDUnitTest.java | 4 +---
...ributedAckOverflowRegionCCEOffHeapDUnitTest.java | 3 +--
.../DistributedAckPersistentRegionCCEDUnitTest.java | 4 +---
...butedAckPersistentRegionCCEOffHeapDUnitTest.java | 3 +--
.../cache30/DistributedAckRegionCCEDUnitTest.java | 3 +--
.../DistributedAckRegionCCEOffHeapDUnitTest.java | 5 +----
.../DistributedAckRegionCompressionDUnitTest.java | 4 +---
.../cache30/DistributedAckRegionDUnitTest.java | 4 +---
.../DistributedAckRegionOffHeapDUnitTest.java | 5 +----
.../DistributedMulticastRegionDUnitTest.java | 4 +---
.../cache30/DistributedNoAckRegionCCEDUnitTest.java | 3 +--
.../DistributedNoAckRegionCCEOffHeapDUnitTest.java | 5 +----
.../cache30/DistributedNoAckRegionDUnitTest.java | 4 +---
.../DistributedNoAckRegionOffHeapDUnitTest.java | 3 +--
.../geode/cache30/DynamicRegionDUnitTest.java | 4 +---
.../geode/cache30/GlobalLockingDUnitTest.java | 3 +--
.../geode/cache30/GlobalRegionCCEDUnitTest.java | 4 +---
.../cache30/GlobalRegionCCEOffHeapDUnitTest.java | 3 +--
.../apache/geode/cache30/GlobalRegionDUnitTest.java | 4 +---
.../geode/cache30/GlobalRegionOffHeapDUnitTest.java | 3 +--
.../cache30/LRUEvictionControllerDUnitTest.java | 4 +---
.../apache/geode/cache30/LocalRegionDUnitTest.java | 4 +---
.../cache30/MemLRUEvictionControllerDUnitTest.java | 4 +---
.../OffHeapLRUEvictionControllerDUnitTest.java | 3 +--
.../cache30/PRBucketSynchronizationDUnitTest.java | 4 +---
.../PartitionedRegionCompressionDUnitTest.java | 4 +---
.../geode/cache30/PartitionedRegionDUnitTest.java | 3 +--
...artitionedRegionMembershipListenerDUnitTest.java | 5 +----
.../cache30/PartitionedRegionOffHeapDUnitTest.java | 3 +--
.../org/apache/geode/cache30/ProxyDUnitTest.java | 4 +---
.../cache30/PutAllCallBkRemoteVMDUnitTest.java | 4 +---
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 4 +---
.../geode/cache30/PutAllMultiVmDUnitTest.java | 4 +---
.../org/apache/geode/cache30/QueueMsgDUnitTest.java | 4 +---
.../geode/cache30/RRSynchronizationDUnitTest.java | 4 +---
.../apache/geode/cache30/ReconnectDUnitTest.java | 3 +--
.../cache30/ReconnectWithCacheXMLDUnitTest.java | 3 +--
.../cache30/ReconnectWithUDPSecurityDUnitTest.java | 3 +--
.../cache30/ReconnectedCacheServerDUnitTest.java | 3 +--
.../cache30/RegionMembershipListenerDUnitTest.java | 3 +--
.../cache30/RegionReliabilityDistAckDUnitTest.java | 4 +---
.../RegionReliabilityDistNoAckDUnitTest.java | 4 +---
.../cache30/RegionReliabilityGlobalDUnitTest.java | 4 +---
.../cache30/RegionReliabilityListenerDUnitTest.java | 4 +---
...otePRValuesAreNotDeserializedRegressionTest.java | 4 +---
.../geode/cache30/RemoveAllMultiVmDUnitTest.java | 4 +---
.../geode/cache30/RequiredRolesDUnitTest.java | 3 +--
.../geode/cache30/SearchAndLoadDUnitTest.java | 4 +---
.../org/apache/geode/cache30/SlowRecDUnitTest.java | 3 +--
.../geode/cache30/TXDistributedDUnitTest.java | 3 +--
.../org/apache/geode/cache30/TXOrderDUnitTest.java | 4 +---
.../geode/cache30/TXRestrictionsDUnitTest.java | 4 +---
.../ValuesAreLazilyDeserializedRegressionTest.java | 4 +---
.../DistributedLockServiceDUnitTest.java | 3 +--
.../distributed/DistributedMemberDUnitTest.java | 3 +--
.../distributed/DistributedSystemDUnitTest.java | 3 +--
.../geode/distributed/HostedLocatorsDUnitTest.java | 3 +--
.../apache/geode/distributed/LocatorDUnitTest.java | 3 +--
.../distributed/LocatorUDPSecurityDUnitTest.java | 3 +--
.../org/apache/geode/distributed/RoleDUnitTest.java | 3 +--
.../geode/distributed/ServerLauncherDUnitTest.java | 4 +---
.../geode/distributed/SystemAdminDUnitTest.java | 3 +--
.../internal/CacheConfigDAODUnitTest.java | 4 +---
.../ClusterDistributionManagerDUnitTest.java | 3 +--
...ClusterDistributionManagerForAdminDUnitTest.java | 3 +--
.../internal/DistributionAdvisorDUnitTest.java | 3 +--
.../internal/DlockAndTxlockRegressionTest.java | 3 +--
.../internal/ProductUseLogDUnitTest.java | 3 +--
...eToDataThrowsRuntimeExceptionRegressionTest.java | 3 +--
.../deadlock/GemFireDeadlockDetectorDUnitTest.java | 4 +---
.../streaming/StreamingOperationManyDUnitTest.java | 4 +---
.../streaming/StreamingOperationOneDUnitTest.java | 4 +---
.../tcpserver/TcpServerBackwardCompatDUnitTest.java | 3 +--
.../geode/disttx/CacheMapDistTXDUnitTest.java | 4 +---
.../apache/geode/disttx/DistTXDebugDUnitTest.java | 4 +---
.../apache/geode/disttx/DistTXOrderDUnitTest.java | 4 +---
.../disttx/DistTXPersistentDebugDUnitTest.java | 4 +---
.../geode/disttx/DistTXRestrictionsDUnitTest.java | 5 +----
.../geode/disttx/DistTXWithDeltaDUnitTest.java | 5 +----
.../disttx/DistributedTransactionDUnitTest.java | 4 +---
.../org/apache/geode/disttx/PRDistTXDUnitTest.java | 4 +---
.../geode/disttx/PRDistTXWithVersionsDUnitTest.java | 4 +---
...sistentPartitionedRegionWithDistTXDUnitTest.java | 5 +----
...BackwardCompatibilitySerializationDUnitTest.java | 3 +--
.../internal/ClassNotFoundExceptionDUnitTest.java | 3 +--
.../geode/internal/PdxDeleteFieldDUnitTest.java | 3 +--
.../apache/geode/internal/PdxRenameDUnitTest.java | 3 +--
...ionCreateBeforeInitializationRegressionTest.java | 4 +---
...rokenSerializationConsistencyRegressionTest.java | 4 +---
.../cache/BucketCreationCrashRegressionTest.java | 4 +---
.../cache/BucketCreationGIIHARegressionTest.java | 4 +---
.../geode/internal/cache/CacheAdvisorDUnitTest.java | 4 +---
...leanupFailedInitWithDiskFilesRegressionTest.java | 4 +---
.../geode/internal/cache/ClearDAckDUnitTest.java | 4 +---
...ringGiiOplogWithMissingCreateRegressionTest.java | 4 +---
.../ClearDuringNetSearchOplogRegressionTest.java | 4 +---
.../geode/internal/cache/ClearGlobalDUnitTest.java | 4 +---
.../ClearRegionMessageAssertionRegressionTest.java | 4 +---
.../internal/cache/ClearRvvLockingDUnitTest.java | 4 +---
.../internal/cache/ClearTXLockingDUnitTest.java | 4 +---
...ientDeserializationCopyOnReadRegressionTest.java | 3 +--
.../internal/cache/ClientServerGetAllDUnitTest.java | 3 +--
...ientServerInvalidAndDestroyedEntryDUnitTest.java | 3 +--
.../cache/ClientServerTransactionCCEDUnitTest.java | 5 +----
.../cache/ClientServerTransactionDUnitTest.java | 3 +--
.../ClientTxCommitShouldNotHangRegressionTest.java | 4 +---
.../cache/ConcurrentDestroySubRegionDUnitTest.java | 4 +---
.../internal/cache/ConcurrentMapOpsDUnitTest.java | 4 +---
.../internal/cache/ConnectDisconnectDUnitTest.java | 4 +---
.../geode/internal/cache/DeltaFaultInDUnitTest.java | 4 +---
.../internal/cache/DeltaPropagationDUnitTest.java | 4 +---
.../cache/DeltaPropagationStatsDUnitTest.java | 4 +---
.../geode/internal/cache/DeltaSizingDUnitTest.java | 4 +---
...DiskRecoveryWithVersioningGiiRegressionTest.java | 4 +---
.../internal/cache/DiskRegByteArrayDUnitTest.java | 4 +---
.../DistrbutedRegionProfileOffHeapDUnitTest.java | 3 +--
.../EntriesDoNotExpireDuringGiiRegressionTest.java | 4 +---
.../FireAndForgetFunctionOnAllServersDUnitTest.java | 4 +---
.../internal/cache/FixedPRSinglehopDUnitTest.java | 4 +---
.../geode/internal/cache/GIIDeltaDUnitTest.java | 3 +--
.../internal/cache/GIIFlowControlDUnitTest.java | 4 +---
.../cache/GiiDiskAccessExceptionRegressionTest.java | 4 +---
.../geode/internal/cache/GridAdvisorDUnitTest.java | 4 +---
.../cache/HAOverflowMemObjectSizerDUnitTest.java | 4 +---
...izedDiskRegionWithIoExceptionRegressionTest.java | 4 +---
.../cache/InterruptClientServerDUnitTest.java | 4 +---
.../InterruptsConserveSocketsFalseDUnitTest.java | 3 ---
.../geode/internal/cache/InterruptsDUnitTest.java | 4 +---
.../geode/internal/cache/IteratorDUnitTest.java | 4 +---
.../geode/internal/cache/MapClearGIIDUnitTest.java | 4 +---
.../internal/cache/NetSearchMessagingDUnitTest.java | 4 +---
.../cache/P2PDeltaPropagationDUnitTest.java | 3 +--
.../cache/PRAccessorWithOverflowRegressionTest.java | 4 +---
.../geode/internal/cache/PRBadToDataDUnitTest.java | 4 +---
.../cache/PRCustomPartitioningDistributedTest.java | 4 +---
.../cache/PREntryIdleExpirationDistributedTest.java | 4 +---
.../cache/PREntrySetIteratorRegressionTest.java | 4 +---
.../internal/cache/PRQueryDistributedTest.java | 4 +---
.../PRQueryWithIndexAndPdxDistributedTest.java | 3 +--
.../cache/PRQueryWithIndexDistributedTest.java | 3 +--
.../cache/PRQueryWithOrderByDistributedTest.java | 3 +--
...PRQueryWithPdxDuringRebalanceRegressionTest.java | 3 +--
.../PRWithIndexAfterRebalanceRegressionTest.java | 3 +--
.../internal/cache/PartitionListenerDUnitTest.java | 4 +---
...ionedRegionAPIConserveSocketsFalseDUnitTest.java | 4 +---
.../cache/PartitionedRegionAPIDUnitTest.java | 4 +---
.../PartitionedRegionAsSubregionDUnitTest.java | 4 +---
...edRegionBucketCreationDistributionDUnitTest.java | 4 +---
.../cache/PartitionedRegionCacheCloseDUnitTest.java | 4 +---
.../PartitionedRegionCacheXMLExampleDUnitTest.java | 4 +---
.../PartitionedRegionCloseDistributedTest.java | 4 +---
.../cache/PartitionedRegionCreationDUnitTest.java | 4 +---
.../PartitionedRegionDelayedRecoveryDUnitTest.java | 3 +--
.../cache/PartitionedRegionDestroyDUnitTest.java | 4 +---
.../cache/PartitionedRegionEntryCountDUnitTest.java | 4 +---
.../cache/PartitionedRegionEvictionDUnitTest.java | 4 +---
.../cache/PartitionedRegionHADUnitTest.java | 4 +---
...titionedRegionHAFailureAndRecoveryDUnitTest.java | 4 +---
.../cache/PartitionedRegionInvalidateDUnitTest.java | 4 +---
.../PartitionedRegionLocalMaxMemoryDUnitTest.java | 4 +---
...itionedRegionLocalMaxMemoryOffHeapDUnitTest.java | 3 +--
.../cache/PartitionedRegionMultipleDUnitTest.java | 4 +---
.../PartitionedRegionOffHeapEvictionDUnitTest.java | 3 +--
.../cache/PartitionedRegionPRIDDUnitTest.java | 4 +---
.../PartitionedRegionRedundancyZoneDUnitTest.java | 4 +---
.../cache/PartitionedRegionSingleHopDUnitTest.java | 3 +--
...onedRegionSingleHopWithServerGroupDUnitTest.java | 3 +--
.../cache/PartitionedRegionSizeDUnitTest.java | 4 +---
.../cache/PartitionedRegionStatsDUnitTest.java | 4 +---
.../cache/PartitionedRegionTestUtilsDUnitTest.java | 4 +---
.../PartitionedRegionWithSameNameDUnitTest.java | 4 +---
.../cache/PersistentRegionTransactionDUnitTest.java | 4 +---
.../geode/internal/cache/PutAllDAckDUnitTest.java | 4 +---
.../geode/internal/cache/PutAllGlobalDUnitTest.java | 4 +---
.../cache/RegionListenerDistributedTest.java | 4 +---
.../RegisterInterestWithEvictionRegressionTest.java | 3 +--
.../cache/RemoteTransactionCCEDUnitTest.java | 5 +----
.../internal/cache/RemoteTransactionDUnitTest.java | 4 +---
.../internal/cache/RemoveAllDAckDUnitTest.java | 4 +---
.../geode/internal/cache/RemoveDAckDUnitTest.java | 4 +---
.../geode/internal/cache/RemoveGlobalDUnitTest.java | 4 +---
...ReplicateEntryIdleExpirationDistributedTest.java | 4 +---
.../internal/cache/SingleHopStatsDUnitTest.java | 3 +--
.../geode/internal/cache/SizingFlagDUnitTest.java | 4 +---
.../internal/cache/StartServerWithXmlDUnitTest.java | 4 +---
.../internal/cache/SystemFailureDUnitTest.java | 3 +--
.../cache/TransactionsWithDeltaDUnitTest.java | 4 +---
...CommitMessageBackwardCompatibilityDUnitTest.java | 3 +--
.../cache/backup/BackupDistributedTest.java | 4 +---
.../backup/BackupPrepareAndFinishMsgDUnitTest.java | 4 +---
.../backup/IncrementalBackupDistributedTest.java | 4 +---
.../cache/control/RebalanceOperationDUnitTest.java | 4 +---
.../internal/cache/event/EventTrackerDUnitTest.java | 4 +---
.../internal/cache/eviction/EvictionDUnitTest.java | 3 +--
.../eviction/EvictionObjectSizerDUnitTest.java | 3 +--
.../cache/eviction/EvictionStatsDUnitTest.java | 3 +--
.../internal/cache/eviction/EvictionTestBase.java | 5 +----
.../cache/eviction/OffHeapEvictionDUnitTest.java | 3 +--
.../eviction/OffHeapEvictionStatsDUnitTest.java | 3 +--
.../ClientFunctionTimeoutRegressionTest.java | 3 +--
.../ClientServerFunctionExecutionDUnitTest.java | 3 +--
.../cache/execute/ColocationFailoverDUnitTest.java | 4 +---
...DistributedRegionFunctionExecutionDUnitTest.java | 3 +--
.../ExecuteFunctionInstanceRegressionTest.java | 3 +--
...nExceptionsIncludeLocalMemberRegressionTest.java | 3 +--
...nctionExecutionWithExceptionDistributedTest.java | 3 +--
.../FunctionServiceClientAccessorPRDUnitTest.java | 3 +--
...iceClientAccessorPRMultipleMembersDUnitTest.java | 3 +--
...tAccessorPRMultipleMembersMultihopDUnitTest.java | 3 +--
...ctionServiceClientMultipleOnServerDUnitTest.java | 3 +--
.../FunctionServiceClientOnServerDUnitTest.java | 3 +--
.../execute/FunctionServiceLocalPRDUnitTest.java | 3 +--
.../execute/FunctionServiceLocalRRDUnitTest.java | 3 +--
.../FunctionServiceMultipleOnMemberDUnitTest.java | 3 +--
.../FunctionServicePeerAccessorPRDUnitTest.java | 3 +--
...rvicePeerAccessorPRMultipleMembersDUnitTest.java | 3 +--
.../FunctionServicePeerAccessorRRDUnitTest.java | 3 +--
.../FunctionServiceSingleOnMemberDUnitTest.java | 3 +--
.../execute/FunctionServiceStatsDUnitTest.java | 3 +--
.../cache/execute/LocalDataSetDUnitTest.java | 3 +--
.../execute/LocalDataSetIndexingDUnitTest.java | 3 +--
.../execute/LocalFunctionExecutionDUnitTest.java | 3 +--
.../execute/MemberFunctionExecutionDUnitTest.java | 3 +--
.../MultiRegionFunctionExecutionDUnitTest.java | 3 +--
.../execute/OnGroupsFunctionExecutionDUnitTest.java | 3 +--
...ClientServerFunctionExecutionNoAckDUnitTest.java | 3 +--
...lientServerRegionFunctionExecutionDUnitTest.java | 3 +--
...verRegionFunctionExecutionFailoverDUnitTest.java | 3 +--
...RegionFunctionExecutionNoSingleHopDUnitTest.java | 3 +--
...nctionExecutionSelectorNoSingleHopDUnitTest.java | 3 +--
...erRegionFunctionExecutionSingleHopDUnitTest.java | 3 +--
.../cache/execute/PRColocationDUnitTest.java | 4 +---
.../cache/execute/PRFunctionExecutionDUnitTest.java | 3 +--
...RFunctionExecutionWithResultSenderDUnitTest.java | 3 +--
.../cache/execute/PRSetOperationJTADUnitTest.java | 4 +---
.../cache/execute/PRSetOperationTXDUnitTest.java | 4 +---
.../cache/execute/PRTransactionDUnitTest.java | 4 +---
.../PRTransactionWithSizeOperationDUnitTest.java | 4 +---
.../execute/PRTransactionWithVersionsDUnitTest.java | 3 ---
.../execute/SingleHopGetAllPutAllDUnitTest.java | 4 +---
.../ExtensionClusterConfigurationDUnitTest.java | 4 +---
.../cache/ha/EventIdOptimizationDUnitTest.java | 3 +--
.../geode/internal/cache/ha/FailoverDUnitTest.java | 3 +--
.../internal/cache/ha/HABugInPutDUnitTest.java | 3 +--
.../geode/internal/cache/ha/HAClearDUnitTest.java | 3 +--
.../internal/cache/ha/HAConflationDUnitTest.java | 3 +--
.../internal/cache/ha/HADuplicateDUnitTest.java | 3 +--
.../cache/ha/HAEventIdPropagationDUnitTest.java | 3 +--
.../geode/internal/cache/ha/HAExpiryDUnitTest.java | 3 +--
.../geode/internal/cache/ha/HAGIIBugDUnitTest.java | 3 +--
.../geode/internal/cache/ha/HAGIIDUnitTest.java | 3 +--
.../internal/cache/ha/HARQueueNewImplDUnitTest.java | 3 +--
.../geode/internal/cache/ha/HARegionDUnitTest.java | 3 +--
.../internal/cache/ha/HARegionQueueDUnitTest.java | 3 +--
.../cache/ha/HARegionQueueExpiryRegressionTest.java | 3 +--
.../cache/ha/HARegionQueueSizeRegressionTest.java | 3 +--
.../HARegionQueueThreadIdExpiryRegressionTest.java | 3 +--
.../internal/cache/ha/HASlowReceiverDUnitTest.java | 3 +--
.../cache/ha/OperationsPropagationDUnitTest.java | 3 +--
.../cache/ha/PreferSerializedHARegionQueueTest.java | 4 +---
.../geode/internal/cache/ha/PutAllDUnitTest.java | 3 +--
.../geode/internal/cache/ha/StatsBugDUnitTest.java | 3 +--
.../cache/locks/TXLockServiceDUnitTest.java | 3 +--
.../BucketCreationCrashCompletesRegressionTest.java | 3 +--
.../BucketRebalanceStatRegressionTest.java | 4 +---
.../cache/partitioned/ElidedPutAllDUnitTest.java | 3 +--
...PRDiskConflictWithColocationDistributedTest.java | 4 +---
.../partitioned/PartitionResolverDUnitTest.java | 3 +--
.../PartitionedRegionLoaderWriterDUnitTest.java | 3 +--
.../PartitionedRegionMetaDataCleanupDUnitTest.java | 3 +--
.../partitioned/PersistPRKRFIntegrationTest.java | 3 +--
...rsistentColocatedPartitionedRegionDUnitTest.java | 3 +--
.../PersistentPartitionedRegionDistributedTest.java | 3 +--
.../PersistentPartitionedRegionRegressionTest.java | 4 +---
...ntPartitionedRegionWithTransactionDUnitTest.java | 3 +--
...ueueRemovalMessageProcessingDistributedTest.java | 3 +--
.../RegisterInterestKeysValuesDistributedTest.java | 3 +--
.../cache/partitioned/ShutdownAllDUnitTest.java | 3 +--
.../StreamingPartitionOperationManyDUnitTest.java | 3 +--
.../StreamingPartitionOperationOneDUnitTest.java | 3 +--
.../fixed/FixedPartitioningDUnitTest.java | 3 +--
.../fixed/FixedPartitioningTestBase.java | 4 +---
...ioningWithColocationAndPersistenceDUnitTest.java | 3 +--
.../persistence/PersistentRVVRecoveryDUnitTest.java | 3 +--
.../PersistentRecoveryOrderDUnitTest.java | 3 +--
.../PersistentRecoveryOrderOldConfigDUnitTest.java | 3 +--
.../rollingupgrade/RollingUpgrade2DUnitTest.java | 3 +--
.../rollingupgrade/RollingUpgradeDUnitTest.java | 3 +--
.../cache/snapshot/GFSnapshotDUnitTest.java | 4 +---
.../tier/DeltaPropagationFailureRegressionTest.java | 3 +--
.../AcceptorImplClientQueueDistributedTest.java | 3 +--
.../cache/tier/sockets/AcceptorImplDUnitTest.java | 3 +--
...rdCompatibilityHigherVersionClientDUnitTest.java | 3 +--
.../sockets/CacheServerTransactionsDUnitTest.java | 3 +--
.../CacheServerTransactionsSelectorDUnitTest.java | 3 +--
.../tier/sockets/ClearPropagationDUnitTest.java | 3 +--
.../tier/sockets/ClientConflationDUnitTest.java | 3 +--
...ientDestroyRegionNotificationRegressionTest.java | 3 +--
...stroyRegionUnregisterInterestRegressionTest.java | 3 +--
.../tier/sockets/ClientInterestNotifyDUnitTest.java | 3 +--
.../ClientProxyWithDeltaDistributedTest.java | 3 +--
.../ClientServerForceInvalidateDUnitTest.java | 3 +--
.../tier/sockets/ClientServerMiscDUnitTest.java | 3 +--
.../sockets/ClientServerMiscSelectorDUnitTest.java | 3 +--
.../ClientWithInterestFailoverDistributedTest.java | 3 +--
.../cache/tier/sockets/ConflationDUnitTest.java | 3 +--
.../sockets/DataSerializerPropagationDUnitTest.java | 3 +--
.../sockets/DestroyEntryPropagationDUnitTest.java | 3 +--
.../sockets/DurableClientBug39997DUnitTest.java | 3 +--
.../sockets/DurableClientQueueSizeDUnitTest.java | 3 +--
.../DurableClientReconnectAutoDUnitTest.java | 3 +--
.../sockets/DurableClientReconnectDUnitTest.java | 3 +--
.../tier/sockets/DurableClientStatsDUnitTest.java | 3 +--
.../tier/sockets/DurableRegistrationDUnitTest.java | 3 +--
.../sockets/DurableResponseMatrixDUnitTest.java | 3 +--
.../tier/sockets/EventIDVerificationDUnitTest.java | 3 +--
.../sockets/EventIDVerificationInP2PDUnitTest.java | 3 +--
.../sockets/ForceInvalidateEvictionDUnitTest.java | 3 +--
.../ForceInvalidateOffHeapEvictionDUnitTest.java | 3 +--
.../GetConnectedServerCountRegressionTest.java | 3 +--
.../cache/tier/sockets/HABug36738DUnitTest.java | 3 +--
.../tier/sockets/HAInterestPart1DUnitTest.java | 3 +--
.../tier/sockets/HAInterestPart2DUnitTest.java | 3 +--
.../cache/tier/sockets/HAInterestTestCase.java | 3 +--
.../HARegionQueueStatsCloseRegressionTest.java | 3 +--
.../tier/sockets/HAStartupAndFailoverDUnitTest.java | 3 +--
.../sockets/InstantiatorPropagationDUnitTest.java | 3 +--
.../cache/tier/sockets/InterestListDUnitTest.java | 3 +--
.../tier/sockets/InterestListEndpointDUnitTest.java | 3 +--
.../sockets/InterestListEndpointPRDUnitTest.java | 3 +--
.../InterestListEndpointSelectorDUnitTest.java | 3 +--
.../tier/sockets/InterestListFailoverDUnitTest.java | 3 +--
.../tier/sockets/InterestListRecoveryDUnitTest.java | 3 +--
.../tier/sockets/InterestRegrListenerDUnitTest.java | 3 +--
.../tier/sockets/InterestResultPolicyDUnitTest.java | 3 +--
.../MessageTrackingTimeoutRegressionTest.java | 3 +--
.../tier/sockets/NewRegionAttributesDUnitTest.java | 3 +--
.../tier/sockets/RedundancyLevelPart1DUnitTest.java | 3 +--
.../tier/sockets/RedundancyLevelPart2DUnitTest.java | 3 +--
.../tier/sockets/RedundancyLevelPart3DUnitTest.java | 3 +--
.../cache/tier/sockets/RedundancyLevelTestBase.java | 3 +--
.../cache/tier/sockets/RegionCloseDUnitTest.java | 3 +--
...gisterInterestBeforeRegionCreationDUnitTest.java | 3 +--
.../sockets/RegisterInterestDistributedTest.java | 3 +--
.../tier/sockets/RegisterInterestKeysDUnitTest.java | 3 +--
.../sockets/RegisterInterestKeysPRDUnitTest.java | 3 +--
...InterestOnServerWithoutRegionRegressionTest.java | 3 +--
...gisterInterestServerMetaDataDistributedTest.java | 3 +--
.../tier/sockets/ReliableMessagingDUnitTest.java | 3 +--
.../RootRegionsExcludesHARegionsRegressionTest.java | 3 +--
.../tier/sockets/UnregisterInterestDUnitTest.java | 3 +--
.../tier/sockets/UpdatePropagationDUnitTest.java | 3 +--
.../VerifyEventIDGenerationInP2PDUnitTest.java | 3 +--
...rifyUpdatesFromNonInterestEndPointDUnitTest.java | 3 +--
.../cache/tx/SetOperationJTADistributedTest.java | 4 +---
.../internal/cache/versions/TombstoneDUnitTest.java | 4 +---
...syncEventQueueEntrySynchronizationDUnitTest.java | 3 +--
.../internal/cache/wan/AsyncEventQueueTestBase.java | 4 +---
.../wan/asyncqueue/AsyncEventListenerDUnitTest.java | 3 +--
.../AsyncEventListenerOffHeapDUnitTest.java | 3 +--
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 3 +--
.../ConcurrentAsyncEventQueueDUnitTest.java | 3 +--
.../ConcurrentAsyncEventQueueOffHeapDUnitTest.java | 3 +--
.../CommonParallelAsyncEventQueueDUnitTest.java | 3 +--
...mmonParallelAsyncEventQueueOffHeapDUnitTest.java | 3 +--
.../CompressionCacheConfigDUnitTest.java | 4 +---
.../CompressionCacheListenerDUnitTest.java | 4 +---
.../CompressionCacheListenerOffHeapDUnitTest.java | 3 +--
.../CompressionRegionConfigDUnitTest.java | 4 +---
.../CompressionRegionFactoryDUnitTest.java | 4 +---
.../CompressionRegionOperationsDUnitTest.java | 4 +---
...CompressionRegionOperationsOffHeapDUnitTest.java | 3 +--
.../compression/CompressionStatsDUnitTest.java | 4 +---
...MainWithChildrenRollingFileHandlerDUnitTest.java | 4 +---
.../internal/jta/ClientServerJTADUnitTest.java | 4 +---
.../internal/jta/dunit/ExceptionsDUnitTest.java | 5 +----
.../internal/jta/dunit/IdleTimeOutDUnitTest.java | 4 +---
.../internal/jta/dunit/LoginTimeOutDUnitTest.java | 4 +---
.../internal/jta/dunit/MaxPoolSizeDUnitTest.java | 4 +---
.../jta/dunit/TransactionTimeOutDUnitTest.java | 4 +---
.../jta/dunit/TxnManagerMultiThreadDUnitTest.java | 4 +---
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 4 +---
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 3 +--
.../LocalProcessLauncherDistributedTest.java | 4 +---
.../statistics/StatisticsDistributedTest.java | 3 +--
.../geode/internal/tcp/TCPConduitDUnitTest.java | 4 +---
.../geode/internal/util/PluckStacksDUnitTest.java | 4 +---
.../geode/management/CacheManagementDUnitTest.java | 4 +---
.../management/ClientHealthStatsDUnitTest.java | 4 +---
.../management/CompositeTypeTestDUnitTest.java | 4 +---
.../geode/management/DLockManagementDUnitTest.java | 4 +---
.../geode/management/DiskManagementDUnitTest.java | 4 +---
.../management/DistributedSystemDUnitTest.java | 4 +---
.../apache/geode/management/JMXMBeanDUnitTest.java | 3 +--
.../management/JMXMBeanReconnectDUnitTest.java | 3 +--
.../management/LocatorManagementDUnitTest.java | 4 +---
.../management/MemberMBeanAttributesDUnitTest.java | 3 +--
.../management/OffHeapManagementDUnitTest.java | 3 +--
.../apache/geode/management/QueryDataDUnitTest.java | 4 +---
.../management/RegionCreateDestroyDUnitTest.java | 3 +--
.../geode/management/RegionManagementDUnitTest.java | 4 +---
...UniversalMembershipListenerAdapterDUnitTest.java | 4 +---
.../bean/stats/DistributedSystemStatsDUnitTest.java | 3 +--
.../internal/JMXMBeanFederationDUnitTest.java | 3 +--
.../internal/MBeanFederationErrorPathDUnitTest.java | 3 +--
.../management/internal/cli/CliUtilDUnitTest.java | 4 +---
.../management/internal/cli/NetstatDUnitTest.java | 4 +---
.../AlterAsyncEventQueueCommandDUnitTest.java | 3 +--
.../cli/commands/AlterCompressorDUnitTest.java | 3 +--
.../cli/commands/AlterDiskStoreDUnitTest.java | 3 +--
.../cli/commands/AlterRegionCommandDUnitTest.java | 3 +--
.../commands/ChangeLogLevelCommandDUnitTest.java | 3 +--
.../cli/commands/ConcurrentDeployDUnitTest.java | 4 +---
.../CreateAlterDestroyRegionCommandsDUnitTest.java | 3 +--
.../CreateAsyncEventQueueCommandDUnitTest.java | 3 +--
.../CreateDefinedIndexesCommandDUnitTest.java | 3 +--
.../cli/commands/CreateIndexCommandDUnitTest.java | 3 +--
.../commands/CreateJndiBindingCommandDUnitTest.java | 3 ---
.../cli/commands/CreateRegionCommandDUnitTest.java | 3 +--
.../cli/commands/CreateRegionSecurityDUnitTest.java | 3 +--
.../DeployCommandFunctionRegistrationDUnitTest.java | 3 +--
.../commands/DeployCommandRedeployDUnitTest.java | 3 +--
.../cli/commands/DeployWithGroupsDUnitTest.java | 4 +---
.../DescribeJndiBindingCommandDUnitTest.java | 4 +---
.../commands/DescribeMembersCommandDUnitTest.java | 3 +--
.../cli/commands/DescribeRegionDUnitTest.java | 3 +--
.../DestroyAsyncEventQueueCommandDUnitTest.java | 3 +--
.../cli/commands/DestroyIndexCommandsDUnitTest.java | 3 +--
.../DestroyJndiBindingCommandDUnitTest.java | 3 +--
.../cli/commands/DestroyRegionCommandDUnitTest.java | 3 +--
.../cli/commands/DiskStoreCommandsDUnitTest.java | 3 +--
.../commands/ExecuteFunctionCommandDUnitTest.java | 3 +--
.../ExecuteFunctionCommandSecurityTest.java | 3 +--
.../internal/cli/commands/ExportLogsDUnitTest.java | 3 +--
.../commands/ExportLogsOnServerManagerDUnit.java | 3 +--
.../cli/commands/ExportLogsStatsDUnitTest.java | 3 +--
.../ExportLogsWithMemberGroupDUnitTest.java | 4 +---
.../commands/ExportStackTraceCommandDUnitTest.java | 4 +---
.../cli/commands/FunctionCommandsDUnitTest.java | 4 +---
.../internal/cli/commands/GcCommandDUnitTest.java | 4 +---
.../cli/commands/GemfireDataCommandsDUnitTest.java | 11 +++++------
.../IndexCommandsShareConfigurationDUnitTest.java | 3 +--
.../ListAsyncEventQueuesCommandDUnitTest.java | 3 +--
.../cli/commands/ListIndexCommandDUnitTest.java | 3 +--
.../commands/ListJndiBindingCommandDUnitTest.java | 4 +---
.../cli/commands/ListMembersCommandDUnitTest.java | 4 +---
.../internal/cli/commands/ListRegionDUnitTest.java | 3 +--
.../internal/cli/commands/LocateEntryDUnitTest.java | 4 +---
.../commands/RebalanceCommandDistributedTest.java | 3 +--
.../cli/commands/RemoveCommandDUnitTest.java | 4 +---
.../cli/commands/RemoveCommandJsonDUnitTest.java | 4 +---
.../cli/commands/ShellCommandsDUnitTest.java | 3 +--
.../cli/commands/ShowDeadlockDUnitTest.java | 4 +---
.../cli/commands/ShowLogCommandDUnitTest.java | 3 +--
.../internal/cli/commands/ShowMetricsDUnitTest.java | 4 +---
.../commands/ShowMissingDiskStoresDUnitTest.java | 3 +--
.../cli/commands/ShutdownCommandDUnitTest.java | 4 +---
.../internal/cli/util/MergeLogsDUnitTest.java | 4 +---
.../ClusterConfigDeployJarDUnitTest.java | 4 +---
.../ClusterConfigDistributionDUnitTest.java | 4 +---
.../configuration/ClusterConfigImportDUnitTest.java | 4 +---
.../ClusterConfigLocatorRestartDUnitTest.java | 4 +---
.../ClusterConfigStartMemberDUnitTest.java | 4 +---
.../ClusterConfigWithCallbacksDUnitTest.java | 4 +---
.../ClusterConfigWithSecurityDUnitTest.java | 3 +--
...gurationPersistenceServiceUsingDirDUnitTest.java | 3 +--
.../configuration/DeployJarWithSSLDUnitTest.java | 4 +---
.../ImportClusterConfigDistributedTest.java | 4 +---
.../ImportOldClusterConfigDUnitTest.java | 4 +---
.../internal/pulse/TestClientIdsDUnitTest.java | 4 +---
.../internal/pulse/TestFunctionsDUnitTest.java | 3 +--
.../internal/pulse/TestHeapDUnitTest.java | 4 +---
.../internal/pulse/TestLocatorsDUnitTest.java | 4 +---
.../internal/pulse/TestSubscriptionsDUnitTest.java | 4 +---
.../DistributedSystemMXBeanSecurityTest.java | 3 +--
.../internal/security/MultiClientDUnitTest.java | 3 +--
.../internal/security/MultiGfshDUnitTest.java | 3 +--
.../security/MultiUserAuthenticationDUnitTest.java | 3 +--
.../pdx/ClientsWithVersioningRetryDUnitTest.java | 3 +--
.../geode/pdx/DistributedSystemIdDUnitTest.java | 3 +--
.../geode/pdx/JSONPdxClientServerDUnitTest.java | 3 +--
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 3 +--
.../apache/geode/pdx/PdxClientServerDUnitTest.java | 3 +--
.../geode/pdx/PdxDeserializationDUnitTest.java | 3 +--
.../apache/geode/pdx/PdxSerializableDUnitTest.java | 3 +--
.../apache/geode/pdx/PdxTypeExportDUnitTest.java | 3 +--
.../org/apache/geode/redis/RedisDistDUnitTest.java | 3 +--
.../apache/geode/security/ClientAuthDUnitTest.java | 3 +--
.../security/ClientAuthenticationDUnitTest.java | 3 +--
.../ClientAuthenticationPart2DUnitTest.java | 3 +--
...ntAuthorizationLegacyConfigurationDUnitTest.java | 3 +--
.../security/ClientContainsKeyAuthDUnitTest.java | 3 +--
...taAuthorizationUsingLegacySecurityDUnitTest.java | 3 +--
...ionUsingLegacySecurityWithFailoverDUnitTest.java | 3 +--
.../ClientDestroyInvalidateAuthDUnitTest.java | 3 +--
.../security/ClientDestroyRegionAuthDUnitTest.java | 3 +--
.../ClientExecuteFunctionAuthDUnitTest.java | 3 +--
.../ClientExecuteRegionFunctionAuthDUnitTest.java | 3 +--
.../geode/security/ClientGetAllAuthDUnitTest.java | 3 +--
.../geode/security/ClientGetEntryAuthDUnitTest.java | 3 +--
.../geode/security/ClientGetPutAuthDUnitTest.java | 3 +--
.../security/ClientMultiUserAuthzDUnitTest.java | 3 +--
.../security/ClientRegionClearAuthDUnitTest.java | 3 +--
.../ClientRegisterInterestAuthDUnitTest.java | 3 +--
.../security/ClientRemoveAllAuthDUnitTest.java | 3 +--
.../ClientUnregisterInterestAuthDUnitTest.java | 3 +--
.../security/ClusterConfigNotEnabledDUnitTest.java | 3 +--
.../ClusterConfigWithEmbededLocatorDUnitTest.java | 3 +--
.../ClusterConfigWithoutSecurityDUnitTest.java | 3 +--
.../ClusterConfigurationSecurityDUnitTest.java | 3 +--
.../security/DeltaClientAuthorizationDUnitTest.java | 3 +--
.../DeltaClientPostAuthorizationDUnitTest.java | 3 +--
.../IntegratedSecurityPeerAuthDUnitTest.java | 3 +--
.../IntegratedSecurityPeerAuthDistributedTest.java | 3 +--
.../NoShowValue1PostProcessorDUnitTest.java | 3 +--
.../geode/security/P2PAuthenticationDUnitTest.java | 3 +--
.../PDXGfshPostProcessorOnRemoteServerTest.java | 3 +--
.../geode/security/PDXPostProcessorDUnitTest.java | 3 +--
.../geode/security/PeerAuthenticatorDUnitTest.java | 3 +--
...rAuthenticatorWithCachelessLocatorDUnitTest.java | 3 +--
.../PeerSecurityWithEmbeddedLocatorDUnitTest.java | 3 +--
.../geode/security/PostProcessorDUnitTest.java | 3 +--
.../security/SecurityClusterConfigDUnitTest.java | 3 +--
.../SecurityManagerLifecycleDistributedTest.java | 3 +--
.../SecurityWithoutClusterConfigDUnitTest.java | 3 +--
.../security/StartServerAuthorizationTest.java | 3 +--
.../security/query/IndexSecurityDUnitTest.java | 3 +--
.../query/PartitionedIndexSecurityDUnitTest.java | 3 +--
...itionedQuerySecurityAllowedQueriesDUnitTest.java | 3 +--
...trictedButMethodsDoNotExistQueriesDUnitTest.java | 3 +--
...onedQuerySecurityRestrictedQueriesDUnitTest.java | 3 +--
...itionedQuerySecurityAllowedQueriesDUnitTest.java | 3 +--
.../PdxQuerySecurityAllowedQueriesDUnitTest.java | 3 +--
.../PdxQuerySecurityRestrictedQueriesDUnitTest.java | 3 +--
.../query/QuerySecurityAllowedQueriesDUnitTest.java | 3 +--
...ecurityAuthorizedUserBindParameterDUnitTest.java | 3 +--
.../QuerySecurityRestrictedQueriesDUnitTest.java | 3 +--
...urityRetrictedButMethodsDoNotExistDUnitTest.java | 3 +--
...urityUnauthorizedUserBindParameterDUnitTest.java | 3 +--
.../geode/test/dunit/DistributedTestCase.java | 4 +---
.../cache/examples/CacheTestCaseExampleTest.java | 4 +---
.../examples/AsyncInvokeCallableExampleTest.java | 4 +---
.../examples/AsyncInvokeRunnableExampleTest.java | 4 +---
.../test/dunit/examples/BeforeClassExampleTest.java | 4 +---
.../CatchingUnexpectedExceptionExampleTest.java | 4 +---
.../examples/DistributedTestCaseExampleTest.java | 4 +---
.../examples/DistributedTestRuleExampleTest.java | 4 +---
.../DoNotHandleUnexpectedExceptionExampleTest.java | 4 +---
.../dunit/examples/FixtureOrderingExampleTest.java | 4 +---
.../dunit/examples/InvokeRunnableExampleTest.java | 4 +---
.../examples/LocatorPortClusterExampleTest.java | 4 +---
.../examples/ReplaceTryFinallyExampleTest.java | 4 +---
.../dunit/internal/DUnitBlackboardDUnitTest.java | 4 +---
.../tests/CacheRuleBuilderDistributedTest.java | 4 +---
.../dunit/rules/tests/CacheRuleDistributedTest.java | 4 +---
...StartupRuleCanSpecifyOlderVersionsDUnitTest.java | 4 +---
...butedRestoreSystemPropertiesDistributedTest.java | 4 +---
.../tests/DistributedTestRuleDistributedTest.java | 4 +---
.../tests/SharedCountersRuleDistributedTest.java | 4 +---
.../tests/SharedErrorCollectorDistributedTest.java | 4 +---
.../test/dunit/tests/BasicDistributedTest.java | 4 +---
.../dunit/tests/GetCurrentVmNumDistributedTest.java | 4 +---
.../GetDefaultDiskStoreNameDistributedTest.java | 4 +---
.../GetPidAndIdAfterBounceDistributedTest.java | 4 +---
.../dunit/tests/GetPidAndIdDistributedTest.java | 4 +---
.../tests/GetTestMethodNameDistributedTest.java | 4 +---
.../dunit/tests/GetUniqueNameDistributedTest.java | 4 +---
...gGetPropertiesDisconnectsAllDistributedTest.java | 4 +---
.../geode/test/dunit/tests/VMDistributedTest.java | 4 +---
.../geode/cache/query/cq/CQDistributedTest.java | 3 +--
.../geode/cache/query/cq/dunit/CqDataDUnitTest.java | 3 +--
.../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/CqDataUsingPoolDUnitTest.java | 3 +--
.../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../geode/cache/query/cq/dunit/CqPerfDUnitTest.java | 3 +--
.../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 3 +--
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 3 +--
.../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/CqQueryUsingPoolDUnitTest.java | 3 +--
.../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 3 +--
...ResultSetUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cq/dunit/CqSecurityAuthorizedUserDUnitTest.java | 3 +--
...qSecurityPartitionedAuthorizedUserDUnitTest.java | 3 +--
...ecurityPartitionedUnauthorizedUserDUnitTest.java | 3 +--
.../dunit/CqSecurityUnauthorizedUserDUnitTest.java | 3 +--
.../cache/query/cq/dunit/CqStateDUnitTest.java | 3 +--
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 3 +--
.../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 3 +--
.../CqStatsUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cq/dunit/PartitionedRegionCqQueryDUnitTest.java | 3 +--
...ionedRegionCqQueryOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 3 +--
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 3 +--
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 3 +--
.../cache/query/dunit/QueryMonitorDUnitTest.java | 3 +--
.../cache/snapshot/ClientSnapshotDUnitTest.java | 3 +--
.../internal/cache/PRDeltaPropagationDUnitTest.java | 3 +--
.../geode/internal/cache/PutAllCSDUnitTest.java | 3 +--
.../cache/RemoteCQTransactionDUnitTest.java | 3 +--
.../geode/internal/cache/ha/CQListGIIDUnitTest.java | 3 +--
.../internal/cache/ha/HADispatcherDUnitTest.java | 3 +--
.../tier/sockets/ClientServerMiscBCDUnitTest.java | 3 +--
.../tier/sockets/ClientToServerDeltaDUnitTest.java | 3 +--
.../sockets/DeltaPropagationWithCQDUnitTest.java | 3 +--
...eltaToRegionRelationCQRegistrationDUnitTest.java | 3 +--
.../tier/sockets/DurableClientCrashDUnitTest.java | 3 +--
.../tier/sockets/DurableClientNetDownDUnitTest.java | 3 +--
.../tier/sockets/DurableClientSimpleDUnitTest.java | 3 +--
.../cache/tier/sockets/DurableClientTestCase.java | 3 +--
.../management/CacheServerManagementDUnitTest.java | 3 +--
.../commands/DescribeClientCommandDUnitTest.java | 3 +--
.../commands/DurableClientCommandsDUnitTest.java | 5 ++---
.../cli/commands/ListClientCommandDUnitTest.java | 3 +--
.../management/internal/pulse/TestCQDUnitTest.java | 4 +---
.../internal/pulse/TestClientsDUnitTest.java | 4 +---
.../internal/pulse/TestServerDUnitTest.java | 4 +---
.../geode/security/CQPDXPostProcessorDUnitTest.java | 3 +--
.../geode/security/CQPostProcessorDunitTest.java | 3 +--
.../security/ClientAuthorizationCQDUnitTest.java | 3 +--
.../security/ClientAuthzObjectModDUnitTest.java | 3 +--
.../geode/security/ClientCQAuthDUnitTest.java | 3 +--
.../ClientCQPostAuthorizationDUnitTest.java | 3 +--
.../security/ClientPostAuthorizationDUnitTest.java | 3 +--
.../geode/security/ClientQueryAuthDUnitTest.java | 3 +--
.../geode/security/MultiUserAPIDUnitTest.java | 3 +--
.../security/MultiUserDurableCQAuthzDUnitTest.java | 3 +--
.../test/junit/categories/DistributedTest.java | 21 ---------------------
.../geode/cache/lucene/EvictionDUnitTest.java | 3 +--
.../geode/cache/lucene/ExpirationDUnitTest.java | 3 +--
.../cache/lucene/LuceneClientSecurityDUnitTest.java | 3 +--
...curityWithRegionCreatedBeforeIndexDUnitTest.java | 3 +--
.../lucene/LuceneCommandsSecurityDUnitTest.java | 3 +--
...curityWithRegionCreatedBeforeIndexDUnitTest.java | 3 +--
.../cache/lucene/LuceneIndexCreationDUnitTest.java | 3 +--
.../LuceneIndexCreationOnFixedPRDUnitTest.java | 3 +--
.../cache/lucene/LuceneIndexDestroyDUnitTest.java | 3 +--
.../cache/lucene/LuceneQueriesClientDUnitTest.java | 3 +--
.../geode/cache/lucene/LuceneQueriesDUnitTest.java | 3 +--
.../lucene/LuceneQueriesReindexClientDUnitTest.java | 3 +--
.../cache/lucene/LuceneQueriesReindexDUnitTest.java | 3 +--
...thRegionCreatedBeforeReindexClientDUnitTest.java | 3 +--
...riesWithRegionCreatedBeforeReindexDUnitTest.java | 3 +--
...ueriesWithReindexFlagEnabledClientDUnitTest.java | 3 +--
...uceneQueriesWithReindexFlagEnabledDUnitTest.java | 3 +--
.../lucene/LuceneSearchWithRollingUpgradeDUnit.java | 3 +--
...thRollingUpgradeReindexFlagEnabledDUnitTest.java | 3 +--
.../cache/lucene/MixedObjectIndexDUnitTest.java | 3 +--
.../geode/cache/lucene/PaginationDUnitTest.java | 3 +--
.../geode/cache/lucene/RebalanceDUnitTest.java | 3 +--
.../lucene/RebalanceWithRedundancyDUnitTest.java | 3 +--
...ancyWithRegionCreatedBeforeReindexDUnitTest.java | 3 +--
.../LuceneClusterConfigurationDUnitTest.java | 3 +--
...ionWhereRegionCreatedBeforeReindexDUnitTest.java | 3 +--
...eClusterConfigurationWithReindexFlagEnabled.java | 3 +--
.../management/LuceneManagementDUnitTest.java | 3 +--
.../org/apache/geode/OldClientSupportDUnitTest.java | 3 +--
.../LocatorConnectionAuthenticationDUnitTest.java | 3 +--
.../v1/acceptance/LocatorConnectionDUnitTest.java | 3 +--
.../operations/GetAndPutJsonDocumentsDUnitTest.java | 3 +--
.../geode/cache/CacheXml70GatewayDUnitTest.java | 3 +--
.../geode/cache/CacheXml80GatewayDUnitTest.java | 3 +--
...atewayReceiverAutoConnectionSourceDUnitTest.java | 3 +--
.../geode/cache/wan/WANRollingUpgradeDUnitTest.java | 3 +--
.../internal/cache/UpdateVersionDUnitTest.java | 3 +--
...QueueOverflowMBeanAttributesDistributedTest.java | 3 +--
.../cache/wan/CacheClientNotifierDUnitTest.java | 3 +--
.../GatewayLegacyAuthenticationRegressionTest.java | 3 +--
.../cache/wan/GatewayReceiverMBeanDUnitTest.java | 3 +--
...enderOverflowMBeanAttributesDistributedTest.java | 3 +--
.../cache/wan/Simple2CacheServerDUnitTest.java | 3 +--
.../geode/internal/cache/wan/WANTestBase.java | 3 +--
.../ConcurrentParallelGatewaySenderDUnitTest.java | 3 +--
...urrentParallelGatewaySenderOffHeapDUnitTest.java | 3 +--
...tParallelGatewaySenderOperation_1_DUnitTest.java | 3 +--
...tParallelGatewaySenderOperation_2_DUnitTest.java | 3 +--
...rrentSerialGatewaySenderOperationsDUnitTest.java | 3 +--
...rialGatewaySenderOperationsOffHeapDUnitTest.java | 3 +--
.../ConcurrentWANPropagation_1_DUnitTest.java | 3 +--
.../ConcurrentWANPropagation_2_DUnitTest.java | 3 +--
.../cache/wan/disttx/DistTXWANDUnitTest.java | 3 +--
.../misc/CommonParallelGatewaySenderDUnitTest.java | 3 +--
...CommonParallelGatewaySenderOffHeapDUnitTest.java | 3 +--
.../KeepEventsOnGatewaySenderQueueDUnitTest.java | 3 +--
.../NewWANConcurrencyCheckForDestroyDUnitTest.java | 3 +--
.../wan/misc/NewWanAuthenticationDUnitTest.java | 3 +--
.../internal/cache/wan/misc/PDXNewWanDUnitTest.java | 3 +--
...catedRegion_ParallelWANPersistenceDUnitTest.java | 3 +--
...catedRegion_ParallelWANPropagationDUnitTest.java | 3 +--
.../misc/SenderWithTransportFilterDUnitTest.java | 3 +--
...ShutdownAllPersistentGatewaySenderDUnitTest.java | 3 +--
.../cache/wan/misc/WANLocatorServerDUnitTest.java | 3 +--
.../internal/cache/wan/misc/WANSSLDUnitTest.java | 3 +--
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 3 +--
.../cache/wan/misc/WanValidationsDUnitTest.java | 3 +--
...elGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 +--
...elGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 +--
...llelGatewaySenderOperationsOffHeapDUnitTest.java | 3 +--
...lGatewaySenderQueueOverflowOffHeapDUnitTest.java | 3 +--
.../ParallelWANConflationOffHeapDUnitTest.java | 3 +--
...istenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 +--
...WANPropagationConcurrentOpsOffHeapDUnitTest.java | 3 +--
.../ParallelWANPropagationOffHeapDUnitTest.java | 3 +--
.../SerialGatewaySenderQueueOffHeapDUnitTest.java | 3 +--
...istenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 +--
.../SerialWANPropagationOffHeapDUnitTest.java | 3 +--
...opagation_PartitionedRegionOffHeapDUnitTest.java | 3 +--
.../ParallelGatewaySenderOperation_2_DUnitTest.java | 3 +--
.../ParallelGatewaySenderOperationsDUnitTest.java | 3 +--
...ParallelGatewaySenderQueueOverflowDUnitTest.java | 3 +--
.../parallel/ParallelWANConflationDUnitTest.java | 3 +--
...WANPersistenceEnabledGatewaySenderDUnitTest.java | 3 +--
...ParallelWANPropagationClientServerDUnitTest.java | 3 +--
...arallelWANPropagationConcurrentOpsDUnitTest.java | 3 +--
.../parallel/ParallelWANPropagationDUnitTest.java | 3 +--
.../ParallelWANPropagationLoopBackDUnitTest.java | 3 +--
.../wan/parallel/ParallelWANStatsDUnitTest.java | 3 +--
.../cache/wan/serial/GatewayReceiverDUnitTest.java | 3 +--
...alGatewaySenderDistributedDeadlockDUnitTest.java | 3 +--
.../SerialGatewaySenderEventListenerDUnitTest.java | 3 +--
.../SerialGatewaySenderOperationsDUnitTest.java | 3 +--
.../serial/SerialGatewaySenderQueueDUnitTest.java | 3 +--
...WANPersistenceEnabledGatewaySenderDUnitTest.java | 3 +--
.../wan/serial/SerialWANPropagationDUnitTest.java | 3 +--
.../SerialWANPropagationLoopBackDUnitTest.java | 3 +--
...alWANPropagation_PartitionedRegionDUnitTest.java | 3 +--
.../SerialWANPropagationsFeatureDUnitTest.java | 3 +--
.../cache/wan/serial/SerialWANStatsDUnitTest.java | 3 +--
.../CreateDestroyGatewaySenderCommandDUnitTest.java | 3 +--
.../CreateGatewayReceiverCommandDUnitTest.java | 3 +--
.../DestroyGatewayReceiverCommandDUnitTest.java | 3 +--
.../DestroyGatewaySenderCommandDUnitTest.java | 3 +--
.../PauseGatewaySenderCommandDUnitTest.java | 3 +--
.../ResumeGatewaySenderCommandDUnitTest.java | 3 +--
.../StartGatewayReceiverCommandDUnitTest.java | 3 +--
.../StartGatewaySenderCommandDUnitTest.java | 3 +--
.../StatusGatewayReceiverCommandDUnitTest.java | 3 +--
.../StatusGatewaySenderCommandDUnitTest.java | 3 +--
.../StopGatewayReceiverCommandDUnitTest.java | 3 +--
.../StopGatewaySenderCommandDUnitTest.java | 3 +--
.../wan/wancommand/WanCommandListDUnitTest.java | 3 +--
.../geode/management/WANManagementDUnitTest.java | 3 +--
.../cli/commands/CreateRegionCommandDUnitTest.java | 3 +--
.../cli/commands/DescribeRegionDUnitTest.java | 3 +--
...erConfigurationIndexWithFromClauseDUnitTest.java | 3 +--
.../WANClusterConfigurationDUnitTest.java | 3 +--
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 3 +--
.../cli/commands/ClusterConfigurationDUnitTest.java | 3 +--
.../cli/commands/CommandOverHttpDUnitTest.java | 3 +--
.../cli/commands/ConnectCommandWithSSLTest.java | 3 +--
.../commands/DescribeConfigCommandDUnitTest.java | 3 +--
...ExecuteFunctionCommandWithSecurityDUnitTest.java | 3 +--
.../cli/commands/ExportConfigCommandDUnitTest.java | 3 +--
.../commands/ExportLogsStatsOverHttpDUnitTest.java | 3 +--
.../commands/FunctionCommandsOverHttpDUnitTest.java | 3 +--
.../commands/ListIndexCommandOverHttpDUnitTest.java | 3 +--
.../RebalanceCommandOverHttpDistributedTest.java | 3 +--
.../commands/ShutdownCommandOverHttpDUnitTest.java | 3 +--
gradle/test.gradle | 1 -
876 files changed, 876 insertions(+), 2060 deletions(-)
diff --git a/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index e68270a..ca30bb3 100644
--- a/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.modules.session.catalina.ClientServerCacheLifecycleListe
import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager;
import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SessionTest;
-@Category({DistributedTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class Tomcat8SessionsClientServerDUnitTest extends TestSessionsTomcat8Base {
// Set up the session manager we need
diff --git a/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
index cf0f30a..2f528d7 100644
--- a/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
@@ -24,10 +24,9 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener;
import org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SessionTest;
-@Category({DistributedTest.class, SessionTest.class})
+@Category({SessionTest.class})
public class Tomcat8SessionsDUnitTest extends TestSessionsTomcat8Base {
// Set up the session manager we need
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index d5277b8..d638ed9 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -85,7 +85,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.rules.RequiresGeodeHome;
@@ -104,7 +103,7 @@ import org.apache.geode.test.junit.rules.RequiresGeodeHome;
* @see org.apache.geode.management.internal.cli.util.CommandStringBuilder
* @since GemFire 7.0
*/
-@Category({DistributedTest.class, FlakyTest.class}) // GEODE-3530
+@Category({FlakyTest.class}) // GEODE-3530
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@SuppressWarnings("serial")
public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
index 346af12..f468ecd 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java
@@ -36,12 +36,11 @@ import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.test.compiler.JarBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.rules.GeodeDevRestClient;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category({RestAPITest.class, DistributedTest.class})
+@Category({RestAPITest.class})
public class RestFunctionExecuteDUnitTest {
@ClassRule
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 899ab72..4420272 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -52,7 +52,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -62,7 +61,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* @since GemFire 8.0
*/
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index 1251455..39c6b30 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -55,10 +55,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
class RestAPITestBase extends JUnit4DistributedTestCase {
protected Cache cache = null;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 5bebd41..9f18cb0 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -74,7 +74,6 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -83,7 +82,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @since GemFire 8.0
*/
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index 85971fa..31c34dd 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -32,12 +32,11 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index e4b86ed..27e328f 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -34,11 +34,10 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.rest.internal.web.RestFunctionTemplate;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index d5d0efd..c42b60e 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -109,14 +109,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.geode.util.test.TestUtil;
/**
* @since GemFire 8.0
*/
-@Category({DistributedTest.class, RestAPITest.class})
+@Category({RestAPITest.class})
public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
private static final long serialVersionUID = -254776154266339226L;
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
index 8dc7fda..0c4ba15 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
@@ -28,7 +28,6 @@ import org.junit.rules.TestName;
import org.apache.geode.modules.session.functions.GetMaxInactiveInterval;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SessionTest;
/**
@@ -37,7 +36,7 @@ import org.apache.geode.test.junit.categories.SessionTest;
* This class contains all of the tests of session replication functionality. Subclasses of this
* class configure different containers in order to run these tests against specific containers.
*/
-@Category({DistributedTest.class, SessionTest.class})
+@Category({SessionTest.class})
public abstract class CargoTestBase extends JUnit4CacheTestCase {
@Rule
public transient TestName testName = new TestName();
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
index aae71e4..30fe529 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@@ -45,7 +44,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* This test iterates through the versions of Geode and executes session client compatibility with
* the current version of Geode.
*/
-@Category({DistributedTest.class, BackwardCompatibilityTest.class})
+@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class TomcatSessionBackwardsCompatibilityTest {
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
index 478b277..6bbd76a 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
@@ -40,12 +40,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class AlterConnectionCommandDUnitTest {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index c7461da..3ae44f4 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -44,12 +44,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class AlterMappingCommandDUnitTest {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
index e96dcb6..d37fa7b 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
@@ -34,12 +34,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class CreateConnectionCommandDUnitTest {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 37474bf..0803543 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -37,12 +37,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class CreateMappingCommandDUnitTest {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
index 35dae6a..50fb236 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
@@ -40,11 +40,10 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DescribeConnectionCommandDUnitTest implements Serializable {
private static final String CONNECTION_NAME = "connectionName";
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index 22856ce..589f501 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -41,12 +41,11 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DescribeMappingCommandDUnitTest implements Serializable {
private static final String REGION_NAME = "testRegion";
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
index 7cb1cf3..a079315 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
@@ -38,12 +38,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DestroyConnectionCommandDUnitTest implements Serializable {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
index 9dd2049..c159059 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
@@ -39,12 +39,11 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class DestroyMappingCommandDunitTest implements Serializable {
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
index 406922f..df0b028 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
@@ -28,11 +28,10 @@ import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
import org.apache.geode.connectors.jdbc.internal.configuration.ConnectorService;
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.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
@SuppressWarnings("serial")
public class JdbcClusterConfigDistributedTest {
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
index 283c675..f2f41c3 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
@@ -34,12 +34,11 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.JDBCConnectorTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, JDBCConnectorTest.class})
+@Category({JDBCConnectorTest.class})
public class ListConnectionCommandDUnitTest implements Serializable {
@Rule
diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index 0aec539..93357db 100644
--- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
+++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
@@ -34,11 +33,10 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class})
+
public class ListMappingCommandDUnitTest implements Serializable {
@Rule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
index 82baa22..bcbe702 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
@@ -41,9 +41,8 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
public ClientServerTimeSyncDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
index c5c7d2a..1a52029 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -37,12 +37,11 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests cases where we have both a connection pool and a bridge loader.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
private static int bridgeServerPort;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
index d0863f7..8f42b64 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
@@ -23,10 +23,9 @@ import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
@FixMethodOrder(NAME_ASCENDING)
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ConnectionPoolAutoDUnitTest extends ConnectionPoolDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 189de8a..801ad2c 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -77,7 +77,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -88,7 +87,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* Test uses Groboutils TestRunnable objects to achieve multi threading behavior in the test.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
@FixMethodOrder(NAME_ASCENDING)
public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
index 78f81c5..a903763 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
@@ -35,7 +35,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -44,7 +43,6 @@ import org.apache.geode.i18n.StringId;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Create and LocalDestroy/LocalInvalidate should create event with NewValue
@@ -55,7 +53,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class CreateAndLocalDestroyInTXRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
index 5c0cb96..559def7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
@@ -16,14 +16,12 @@ package org.apache.geode.cache;
import java.util.Arrays;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -34,7 +32,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+
@RunWith(Parameterized.class)
@UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@SuppressWarnings("serial")
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
index 9a50619..4ce5d29 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
@@ -16,14 +16,12 @@ package org.apache.geode.cache;
import java.util.Arrays;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -34,7 +32,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+
@RunWith(Parameterized.class)
@UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@SuppressWarnings("serial")
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
index 22efcb6..4b02562 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
@@ -29,16 +29,14 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PRCreationTotalNumBucketsDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
index 1b955e2..7e1041c 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
@@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.PoolImpl;
@@ -36,12 +35,11 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* verifies the count of clear operation
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class RegionClearStatsDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
index 1d46ad0..dd7cb2d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
@@ -33,14 +33,12 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -54,7 +52,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class RegionExpirationDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
index c9cb01d..7e03a40 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
@@ -29,14 +29,12 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.dunit.rules.SharedCountersRule;
import org.apache.geode.test.dunit.rules.SharedErrorCollector;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -47,7 +45,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
*
* @since GemFire 2.0
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class ReplicateCacheListenerDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index cd467e5..4495799 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the
@@ -59,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 8.0
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTestCase {
protected static final long WAIT_TIME_MILLISECONDS = TimeUnit.SECONDS.toMillis(5);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
index 74b215f..4f53682 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
@@ -51,9 +51,8 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class RemoveAllCacheListenerClientServerRegressionTest extends DistributedTestCase {
private final AtomicInteger serverPort = new AtomicInteger(0);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index ff54514..994e0f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -49,13 +49,12 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests cases that are particular for the auto connection source - dynamically discovering servers,
* locators, handling locator disappearance, etc.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 65f5c04..307ef9e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -87,7 +87,6 @@ import org.apache.geode.test.dunit.RMIException;
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;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.apache.geode.util.test.TestUtil;
@@ -95,7 +94,7 @@ import org.apache.geode.util.test.TestUtil;
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for
* details
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 889896a..d3c15f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -55,9 +55,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
index e28d345..c1c39fc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -51,14 +51,13 @@ import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
/**
* Test for GEODE-396
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SSLNoClientAuthDUnitTest extends JUnit4DistributedTestCase {
private Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index d91a408..31e2d0a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -105,7 +105,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -113,7 +112,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* @since GemFire 6.0
*/
-@Category(DistributedTest.class)
+
public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
public static class Range implements DataSerializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index c4a5bd5..9330939 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -90,7 +90,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
@@ -99,7 +98,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
final String expectedEx = LocalizedStrings.MemoryMonitor_MEMBER_ABOVE_CRITICAL_THRESHOLD
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
index 29efa02..3481c3d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
@@ -71,7 +71,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -80,7 +79,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
* TODO: javadoc this test properly and cleanup the helper methods to be more flexible and
* understandable
*/
-@Category(DistributedTest.class)
+
public class ResourceManagerDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
index ee4cb06..f96a3ca 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -31,7 +31,6 @@ import java.util.Locale;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -59,9 +58,8 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
public PartitionRegionHelperDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 828fb43..38f5257 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CompactRangeIndexDUnitTest extends JUnit4DistributedTestCase {
QueryTestUtils utils;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
index 9aaa518..f7f1ed9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
@@ -47,11 +47,10 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class CompiledInDUnitTest extends JUnit4CacheTestCase {
final String rootRegionName = "root";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
index d36912d..11992e4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.QueryObserverAdapter;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CorruptedIndexIntegrationTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index 6f5ca06..bf24baa 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -24,10 +24,9 @@ import org.apache.geode.cache.query.functional.GroupByTestImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class GroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
index 7064cda..53f8c9c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -42,10 +42,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class GroupByQueryDUnitTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
index 93b6731..a69cdf0 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
@@ -30,10 +30,9 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class HashIndexDUnitTest extends JUnit4DistributedTestCase {
QueryTestUtils utils;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
index a07648b..6b67e43 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
@@ -52,10 +52,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class HelperTestCase extends JUnit4CacheTestCase {
protected void createPartitionRegion(VM vm, final String regionName,
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 3d698bd..9cd4ca1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -30,10 +30,9 @@ import org.apache.geode.cache.query.functional.NonDistinctOrderByTestImplementat
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class NonDistinctOrderByPartitionedDUnitTest extends NonDistinctOrderByDUnitImpl {
public NonDistinctOrderByPartitionedDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
index ff91884..270d76c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class OrderByPartitionedDUnitTest extends JUnit4CacheTestCase {
private OrderByPartitionedJUnitTest createTestInstance() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 21f399a..f66f9ce 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -39,11 +39,10 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.util.test.TestUtil;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PartitionedRegionCompactRangeIndexDUnitTest extends JUnit4DistributedTestCase {
private Properties getSystemProperties(String cacheXML) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
index 5766e6e..ce823c3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
@@ -24,10 +24,9 @@ import org.apache.geode.cache.query.functional.PdxGroupByTestImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxGroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
index 775921a..3e0e604 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
@@ -49,10 +49,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxLocalQueryDUnitTest extends PDXQueryTestBase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
index 959ae4e..3b05444 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
@@ -37,10 +37,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxLocalQueryVersionedClassDUnitTest extends PDXQueryTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
index 7f52083..59e1bee 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
@@ -71,10 +71,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxQueryDUnitTest extends PDXQueryTestBase {
public static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
index 347008b..3a87a80 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -72,10 +72,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PdxStringQueryDUnitTest extends JUnit4CacheTestCase {
final String rootRegionName = "root";
final String regionName = "PdxTest";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 12bb603..2d32fba 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -54,14 +54,13 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* This tests the data inconsistency during update on an index and querying the same UNLOCKED index.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class QueryDataInconsistencyDUnitTest implements Serializable {
private static final int cnt = 0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
index 9c99c60..23bc64b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
@@ -57,11 +57,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
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.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class QueryIndexDUnitTest extends JUnit4CacheTestCase {
public static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 58c2507..0a71d87 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -59,11 +59,10 @@ import org.apache.geode.test.dunit.AsyncInvocation;
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.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
private static final String NAME = "PartitionedPortfolios";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index f593f35..ba422ae 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -51,7 +50,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
*
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryParamsAuthorizationDUnitTest extends JUnit4CacheTestCase {
private final String regName = "exampleRegion";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 4b8f8a5..017acd8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -68,7 +68,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
@@ -76,7 +75,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
* This tests the querying using a RegionFunctionContext which provides a filter (routing keys) to
* run the query on subset of buckets "locally". If query includes buckets
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index f90a2bf..0c98556 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -64,7 +64,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
@@ -72,7 +71,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
* @since GemFire 5.0.1
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
index 3c0eb70..ea5d6e5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -57,7 +57,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
@@ -66,7 +65,7 @@ import org.apache.geode.test.junit.categories.OQLQueryTest;
*
* @since GemFire 5.0.1
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class RemoteQueryDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index b6debfa..598bde1 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -83,10 +83,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
index a529adf..19b230c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
@@ -51,13 +51,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* Test for #44807 to eliminate unnecessary serialization/deserialization in select * queries
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class SelectStarQueryDUnitTest extends JUnit4CacheTestCase {
/** Used for saving & restoring oldObserver without serialization */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 2a52fac..ce352bc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -56,10 +56,9 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
String name;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 2c8d598..0bc5bd2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
@@ -63,7 +62,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
*
*
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
String name;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index c648cab..57de6fc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
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.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
@@ -66,7 +65,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
* During validation all region operations are paused for a while. Validation happens multiple time
* during one test run on a fixed time interval.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest
extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 9a4e067..60a17ad 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -55,14 +55,13 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
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.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* During validation all region operations are paused for a while. Validation happens multiple time
* during one test run on a fixed time interval.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class ConcurrentIndexUpdateWithoutWLDUnitTest extends JUnit4DistributedTestCase {
PRQueryDUnitHelper helper = new PRQueryDUnitHelper();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 1e7d521..0b468d6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -56,10 +56,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class CopyOnReadIndexDUnitTest extends JUnit4CacheTestCase {
VM vm0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 0c2c92f..81f6378 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
private final int NUM_BKTS = 10;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
index 9a2083b..de1bf87 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
@@ -51,7 +51,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
@@ -59,7 +58,7 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
* destroys and puts back entries in separated thread in the same region and runs query in parallel
* and checks for UNDEFINED values in result set of the query.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
@RunWith(JUnitParamsRunner.class)
public class InitializeIndexEntryDestroyQueryDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index 5bc281e..e0c24eb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -44,10 +44,9 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class MultiIndexCreationDUnitTest extends JUnit4CacheTestCase {
private final String regionName = "MultiIndexCreationDUnitTest";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index e2e2171..6d34235 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PutAllWithIndexPerfDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index 0229366..e458931 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@ -42,13 +42,12 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* TODO: most of these tests log statements instead of using assertions
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PRBasicIndexCreationDUnitTest extends CacheTestCase {
private static final String PARTITIONED_REGION_NAME = "PartionedPortfolios";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
index 393798a..2c03471 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
@@ -40,10 +40,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PRBasicMultiIndexCreationDUnitTest extends CacheTestCase {
private final PRQueryDUnitHelper PRQHelp = new PRQueryDUnitHelper();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
index 6f2e1f5..252bcfe 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
@@ -41,14 +41,13 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This tests creates partition regions with 1 Datastore & 1 Accessor node, firing a simple query
* and validating the ResultSet size and Contents.
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRBasicQueryDUnitTest extends CacheTestCase {
private static final String name = "Portfolios";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
index 0046ee0..08cc9d3 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
@@ -28,13 +28,12 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Basic functional test for removing index from a partitioned region system.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
public class PRBasicRemoveIndexDUnitTest extends CacheTestCase {
private static final String name = "PartitionedPortfolios";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 4a334de..1b0427d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -65,11 +65,10 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRColocatedEquiJoinDUnitTest extends CacheTestCase {
private static final String name = "Portfolios1";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
index e4c7f65..485fbf6 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
@@ -26,10 +26,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRInvalidQueryDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
index e6a565c..55772ba 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
@@ -46,10 +46,9 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
index d39f712..6402e2e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryPortfolioDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index 844fdf0..73474da 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -33,10 +33,9 @@ import org.apache.geode.cache.query.data.PortfolioData;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryRegionCloseDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index a45516f..2edf33f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryRegionDestroyedDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index 5842597..78ae58c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -41,13 +41,12 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
/**
* This test verifies exception handling on coordinator node for remote as well as local querying.
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
public class PRQueryRemoteNodeExceptionDUnitTest extends CacheTestCase {
private static final String PARTITIONED_REGION_NAME = "Portfolios";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
index a6a5178..362e9f3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -38,11 +38,10 @@ import org.apache.geode.internal.cache.snapshot.SnapshotOptionsImpl;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-@Category({DistributedTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class ParallelSnapshotDUnitTest extends JUnit4CacheTestCase {
private static final byte[] ffff = new byte[] {0xf, 0xf, 0xf, 0xf};
private static final byte[] eeee = new byte[] {0xe, 0xe, 0xe, 0xe};
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
index 4de1d8a..96bacd6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
@@ -34,11 +34,10 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-@Category({DistributedTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class SnapshotByteArrayDUnitTest extends JUnit4CacheTestCase {
@Rule
public TemporaryFolder tempDir = new SerializableTemporaryFolder();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
index dcb79f9..995be7a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
@@ -54,10 +54,9 @@ import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
-@Category({DistributedTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class SnapshotDUnitTest extends JUnit4CacheTestCase {
private static final int NUM_ENTRIES = 1000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
index f3f3252..3a3d393 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -34,10 +34,9 @@ import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SnapshotTest;
-@Category({DistributedTest.class, SnapshotTest.class})
+@Category({SnapshotTest.class})
public class SnapshotPerformanceDUnitTest extends JUnit4CacheTestCase {
public SnapshotPerformanceDUnitTest() {
super();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
index 3aff0f8..e982a24 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -31,14 +30,13 @@ import org.apache.geode.cache.LoaderHelper;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure cache close is working.
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class CacheCloseDUnitTest extends JUnit4CacheTestCase {
public CacheCloseDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
index bdb7386..6651616 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -45,9 +44,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class CacheMapTxnDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
protected static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index 1749d6c..a32f58b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -21,7 +21,6 @@ import static org.apache.geode.test.dunit.Assert.assertEquals;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -39,9 +38,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class CacheRegionsReliablityStatsCheckDUnitTest extends JUnit4CacheTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
index 895a3fd..7fe5c0a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -35,7 +34,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the {@link CacheStatistics} that are maintained by a {@link Region} and a
@@ -44,7 +42,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class CacheStatisticsDUnitTest extends JUnit4CacheTestCase {
public CacheStatisticsDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
index 4d4f374..feeb7f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -43,9 +42,8 @@ import org.apache.geode.internal.cache.xmlcache.AsyncEventQueueCreation;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class CacheXml70DUnitTest extends CacheXml66DUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
index ae677f1..c31aaf5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -48,9 +47,8 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.internal.cache.xmlcache.DiskStoreAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class CacheXml80DUnitTest extends CacheXml70DUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
index 294c562..631395e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -35,7 +34,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.XmlParser;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests 8.1 schema based configuration. From this point all config test cases should extend this
@@ -43,7 +41,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 8.1
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
index c189b9b..5e6171a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Declarable;
@@ -42,9 +41,8 @@ import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.ResourceManagerCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class CacheXmlGeode10DUnitTest extends CacheXml81DUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
index b638987..a5b2589 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache30;
import static org.apache.geode.test.dunit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -29,14 +28,13 @@ import org.apache.geode.cache.SubscriptionAttributes;
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.DistributedTest;
/**
* Make sure that create are distributed and done in remote regions that are CACHED_ALL_EVENTS*.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {
private VM getOtherVm() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
index 75e3bff..ba2a762 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -40,14 +39,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test the getCallbackArgument in light of bug 34075.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class CallbackArgDUnitTest extends JUnit4CacheTestCase {
protected transient int invokeCount;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
index 362689b..37d679d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
@@ -26,7 +26,6 @@ import static org.apache.geode.test.dunit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -43,9 +42,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ClearMultiVmCallBkDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
index 6e51f5e..e7c924a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -49,9 +48,8 @@ import org.apache.geode.test.dunit.SerializableRunnable;
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.DistributedTest;
-@Category(DistributedTest.class)
+
public class ClearMultiVmDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index de3cfcd..43ca8a1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -74,14 +74,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the ClientMembership API including ClientMembershipListener.
*
* @since GemFire 4.2.1
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientMembershipDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
index 99ef5c9..ee1d5f1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
@@ -17,14 +17,13 @@ package org.apache.geode.cache30;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same as parent but uses selector in server
*
* @since GemFire 5.1
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
@Override
protected int getMaxThreads() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
index f35a552..fb52e21 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
@@ -50,14 +50,13 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the client register interest
*
* @since GemFire 4.2.3
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
protected static int bridgeServerPort;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
index 4933d13..e6a1795 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -17,14 +17,13 @@ package org.apache.geode.cache30;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same as parent but uses selector in server
*
* @since GemFire 5.1
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
@Override
protected int getMaxThreads() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index eeaf0f3..1878aa0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -83,14 +83,13 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
*
*
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
public static LocalRegion TestRegion;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
index 9d8d39e..f719484 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -39,9 +38,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ConcurrentLeaveDuringGIIDUnitTest extends JUnit4CacheTestCase {
public ConcurrentLeaveDuringGIIDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
index fb935cc..3cf1f0c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -22,9 +21,8 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DiskDistributedNoAckAsyncOverflowRegionDUnitTest
extends DiskDistributedNoAckRegionTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
index aa39e4c..21b08f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
@@ -16,16 +16,13 @@ package org.apache.geode.cache30;
import java.io.File;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DiskDistributedNoAckAsyncRegionDUnitTest extends DiskDistributedNoAckRegionTestCase {
/** Creates a new instance of DiskDistributedNoAckSyncOverflowRegionTest */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
index b63a3c9..2aa7224 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -23,9 +22,8 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DiskDistributedNoAckSyncOverflowRegionDUnitTest
extends DiskDistributedNoAckRegionTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
index 75e76dd..c9600c2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
@@ -30,7 +30,6 @@ import java.io.Serializable;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -43,7 +42,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -51,7 +49,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
*
* @since GemFire 3.2
*/
-@Category(DistributedTest.class)
+
public class DiskRegionDistributedTest implements Serializable {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
index 18cef86..48c40c3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -52,9 +51,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistAckMapMethodsDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
index 7c74a949..a6b1a9f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -22,9 +21,8 @@ import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistributedAckOverflowRegionCCEDUnitTest extends DistributedAckRegionCCEDUnitTest {
public DistributedAckOverflowRegionCCEDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 54ddb2c..0c4020d 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -34,7 +33,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class DistributedAckOverflowRegionCCEOffHeapDUnitTest
extends DistributedAckOverflowRegionCCEDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
index 0d57517..7805ec0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.cache30;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -26,9 +25,8 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistributedAckPersistentRegionCCEDUnitTest extends DistributedAckRegionCCEDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 0308fe3..b46159c 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
@@ -37,7 +36,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class DistributedAckPersistentRegionCCEOffHeapDUnitTest
extends DistributedAckPersistentRegionCCEDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
index f7a6578..f29df8d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -65,10 +65,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 246e5b5..b55a1ee 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -18,14 +18,11 @@ import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMO
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
@@ -33,7 +30,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
-@Category(DistributedTest.class)
+
public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegionCCEDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
index d077eb0..7577943 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
@@ -14,20 +14,18 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.compression.Compressor;
import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with compression.
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings({"deprecation", "serial"})
public class DistributedAckRegionCompressionDUnitTest extends DistributedAckRegionDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
index 31f9386..7f0d459 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -34,7 +33,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of a cache {@link Region region} that has a scope of
@@ -42,7 +40,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 4a58977..c3f0e48 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -18,21 +18,18 @@ import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMO
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with OffHeap memory.
*
* @since Geode 1.0
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings({"deprecation", "serial"})
public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
index eaf32f9..c1ffdc1 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
@@ -30,7 +30,6 @@ import java.io.IOException;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -52,9 +51,8 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistributedMulticastRegionDUnitTest extends JUnit4CacheTestCase {
static int locatorVM = 3;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 05587c3..50be01a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -45,10 +45,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+
public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest {
static volatile boolean ListenerBlocking;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 763d98b..1c3c67e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -18,21 +18,18 @@ import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMO
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
*
* @since Geode 1.0
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings({"deprecation", "serial"})
public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckRegionCCEDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
index 320751c..2e0d6b2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -44,7 +43,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of a cache {@link Region region} that has a scope of
@@ -52,7 +50,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class DistributedNoAckRegionDUnitTest extends MultiVMRegionTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index c8ead00..8a01c47 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -34,7 +33,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
* @since Geode 1.0
*/
@SuppressWarnings({"deprecation", "serial"})
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegionDUnitTest {
public DistributedNoAckRegionOffHeapDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
index 15b28cb..c3dad1a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -39,14 +38,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure dynamic regions work
*
* @since GemFire 4.3
*/
-@Category(DistributedTest.class)
+
public class DynamicRegionDUnitTest extends JUnit4CacheTestCase {
// Specify oplog size in MB
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
index 667bc1c..46f06c5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
@@ -38,12 +38,11 @@ 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.DLockTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed locking of global region entries.
*/
-@Category({DistributedTest.class, DLockTest.class})
+@Category({DLockTest.class})
public class GlobalLockingDUnitTest extends JUnit4CacheTestCase {
private static Region region_testBug32356;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
index 0082397..aca4aa4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -41,13 +40,12 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test is only for GLOBAL REPLICATE Regions. Tests are similar to
* {@link DistributedAckRegionCCEDUnitTest}.
*/
-@Category(DistributedTest.class)
+
public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 54d804c..51f72f8 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -33,7 +32,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
@SuppressWarnings({"deprecation", "serial"})
public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
index 42a9572..47d1d58 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -46,7 +45,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of a cache {@link Region region} that has a scope of
@@ -54,7 +52,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
index 254fb63..516311b 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -35,7 +34,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
@SuppressWarnings({"deprecation", "serial", "rawtypes", "unchecked"})
public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
index 6937faa..eae8179 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
@@ -24,7 +24,6 @@ import java.io.File;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -56,7 +55,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the lru eviction controller and its statistics.
@@ -64,7 +62,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.2
*/
-@Category(DistributedTest.class)
+
public class LRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
private static boolean usingMain = false;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
index 4b10291..5b1b853 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -33,7 +32,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.cache.TimeoutException;
import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the functionality of a {@link Scope#LOCAL locally scoped} cache {@link Region} including
@@ -42,7 +40,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.0
*/
-@Category(DistributedTest.class)
+
public class LocalRegionDUnitTest extends CacheListenerTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
index 70ae73b..9b0d746 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Properties;
import java.util.Random;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -40,7 +39,6 @@ import org.apache.geode.internal.cache.eviction.MemoryLRUController;
import org.apache.geode.internal.size.ReflectionSingleObjectSizer;
import org.apache.geode.internal.size.WellKnownClassSizer;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the basic functionality of the memory lru eviction controller and its statistics.
@@ -48,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 3.2
*/
-@Category(DistributedTest.class)
+
public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
private static boolean usingMain = false;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index a01c562..4ec3d1d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceT
import org.apache.geode.internal.cache.eviction.HeapEvictor;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -35,7 +34,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class OffHeapLRUEvictionControllerDUnitTest extends LRUEvictionControllerDUnitTest {
public OffHeapLRUEvictionControllerDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
index ebc15e9..c029f5f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -49,12 +48,11 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PRBucketSynchronizationDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
index 78b3dd8..26fa578 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
@@ -14,20 +14,18 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.compression.Compressor;
import org.apache.geode.compression.SnappyCompressor;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests Partitioned Region with compression.
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionCompressionDUnitTest extends PartitionedRegionDUnitTest {
public PartitionedRegionCompressionDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
index 7de7fa6..bb51ac4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
@@ -55,7 +55,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
@@ -65,7 +64,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
public static boolean InvalidateInvoked = false;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
index 93006f7..7598563 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertTrue;
import java.util.List;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheListener;
@@ -33,12 +31,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire 6.0
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionMembershipListenerDUnitTest
extends RegionMembershipListenerDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
index 47bcc3b..c7d4884 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -25,7 +25,6 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.internal.cache.OffHeapTestUtil;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -33,7 +32,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java
index e580208..192f433 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
@@ -48,14 +47,13 @@ import org.apache.geode.distributed.internal.DMStats;
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.DistributedTest;
/**
* Make sure that operations are distributed and done in regions remote from a PROXY
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class ProxyDUnitTest extends JUnit4CacheTestCase {
private transient Region r;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
index 71741e9..5fdb2a0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -50,9 +49,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PutAllCallBkRemoteVMDUnitTest extends JUnit4DistributedTestCase {
static volatile Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
index 9cd9f73..e97e871 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -48,9 +47,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PutAllCallBkSingleVMDUnitTest extends JUnit4DistributedTestCase {
static volatile Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
index b9dbf61..281d98a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import java.util.TreeMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -47,9 +46,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PutAllMultiVmDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
index 1bdc509..da5442a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.TreeMap;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheEvent;
@@ -45,14 +44,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure message queuing works.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class QueueMsgDUnitTest extends ReliabilityTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
index b292886..8065faa 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
@@ -20,7 +20,6 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -46,12 +45,11 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* concurrency-control tests for client/server
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class RRSynchronizationDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 5bd916d..65c41ad 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -98,11 +98,10 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
@SuppressWarnings("serial")
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ReconnectDUnitTest extends JUnit4CacheTestCase {
static int locatorPort;
static Locator locator;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
index dfbd0bf..f970503 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
@@ -46,7 +45,7 @@ import org.apache.geode.util.test.TestUtil;
* gfsh but was configured both by gfsh and a cache.xml file. The JIRA ticket for this is
* GEODE-2732.
*/
-@Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class})
+@Category({MembershipTest.class, ClientServerTest.class})
public class ReconnectWithCacheXMLDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
index d5e9c3f..f290dc6 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
@@ -21,10 +21,9 @@ import java.util.Properties;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class})
+@Category({MembershipTest.class, ClientServerTest.class})
public class ReconnectWithUDPSecurityDUnitTest extends ReconnectDUnitTest {
public ReconnectWithUDPSecurityDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
index ed59d35..23eca06 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
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;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class})
+@Category({MembershipTest.class, ClientServerTest.class})
public class ReconnectedCacheServerDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
index 7297c67..5fb7b07 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -55,7 +54,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @since GemFire 5.0
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class RegionMembershipListenerDUnitTest extends JUnit4CacheTestCase {
private transient MyRML myListener;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
index c63f29c..06f6db2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests region reliability defined by MembershipAttributes using DISTRIBUTED_ACK scope.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class RegionReliabilityDistAckDUnitTest extends RegionReliabilityTestCase {
public RegionReliabilityDistAckDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
index a3b7c24..60a240e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests region reliability defined by MembershipAttributes using DISTRIBUTED_NO_ACK scope.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class RegionReliabilityDistNoAckDUnitTest extends RegionReliabilityTestCase {
public RegionReliabilityDistNoAckDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
index 5d43a57..900b4ed 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.cache30;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Scope;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests region reliability defined by MembershipAttributes using GLOBAL scope.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class RegionReliabilityGlobalDUnitTest extends RegionReliabilityTestCase {
public RegionReliabilityGlobalDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
index 6458c26..e1939c9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -40,14 +39,13 @@ import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.membership.InternalRole;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the functionality of the {@link RegionRoleListener} class.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
protected static transient Set rolesGain = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
index 3c5ad4b..c15a770 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure PR cache values are lazily deserialized
@@ -52,7 +50,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class RemotePRValuesAreNotDeserializedRegressionTest extends CacheTestCase {
private static final String REGION_NAME = "bug38013";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
index c447db0..e3695da 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Collections;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -44,9 +43,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class RemoveAllMultiVmDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
index 6132644..8608ab7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -55,7 +54,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @since GemFire 5.0
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class RequiredRolesDUnitTest extends ReliabilityTestCase {
protected transient volatile boolean startTestWaitForRequiredRoles = false;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
index 7f5b161..0137927 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -48,12 +47,11 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests various search load and write scenarios for distributed regions
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings({"deprecation", "unchecked", "rawtypes", "serial"})
public class SearchAndLoadDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java
index 054feba..14bd2fd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -62,7 +61,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @since GemFire 4.2.1
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
@Ignore("Test was disabled by renaming to DisabledTest")
public class SlowRecDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
index 7de4e43..a0caa0f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
@@ -90,10 +90,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+
public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
protected RegionAttributes getRegionAttributes() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java
index 9c088e3..739ac19 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java
@@ -31,7 +31,6 @@ import javax.transaction.UserTransaction;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.CopyHelper;
import org.apache.geode.cache.AttributesFactory;
@@ -63,14 +62,13 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test the order of operations done on the farside of a tx.
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class TXOrderDUnitTest extends JUnit4CacheTestCase {
private final int TEST_PUT = 0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
index 6721ff9..4b1b001 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.fail;
import java.io.File;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -43,9 +42,8 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class TXRestrictionsDUnitTest extends JUnit4CacheTestCase {
protected RegionAttributes getRegionAttributes() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
index d40c960..a038b35 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -39,7 +38,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to make sure cache values are lazily deserialized
@@ -49,7 +47,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class ValuesAreLazilyDeserializedRegressionTest extends CacheTestCase {
private static final String REGION_NAME = "bug34948";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
index 823c288..0bf3ce4 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
@@ -61,12 +61,11 @@ 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.DLockTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed ownership via the DistributedLockService api.
*/
-@Category({DistributedTest.class, DLockTest.class})
+@Category({DLockTest.class})
public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
private static DistributedSystem dlstSystem;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
index d39082b..94a8d63 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
@@ -55,14 +55,13 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* Tests the functionality of the {@link DistributedMember} class.
*
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
/**
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
index c6f31fb..22f3598 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
@@ -73,13 +73,12 @@ import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipMan
import org.apache.geode.test.dunit.IgnoredException;
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 DistributedSystem} class.
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
private int mcastPort;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
index cdf7871..ed061de 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
@@ -47,14 +47,13 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Extracted from LocatorLauncherLocalIntegrationTest.
*
* @since GemFire 8.0
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class HostedLocatorsDUnitTest extends JUnit4DistributedTestCase {
protected static final int TIMEOUT_MILLISECONDS = 5 * 60 * 1000; // 5 minutes
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 2011d25..28eb1d3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -96,7 +96,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.util.test.TestUtil;
@@ -105,7 +104,7 @@ import org.apache.geode.util.test.TestUtil;
*
* @since GemFire 4.0
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class LocatorDUnitTest extends JUnit4DistributedTestCase {
static volatile InternalDistributedSystem system = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
index d74c63d..4788848 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.test.dunit.DistributedTestUtils;
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.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
@Override
protected void addDSProps(Properties p) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java
index beb6b47..1d51185 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java
@@ -34,13 +34,12 @@ import org.apache.geode.distributed.internal.membership.InternalRole;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
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 setting of Roles in a DistributedSystem
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class RoleDUnitTest extends JUnit4DistributedTestCase {
static Properties distributionProperties = new Properties();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
index 94ea7a4..796dea9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.Cache;
@@ -38,9 +37,8 @@ import org.apache.geode.management.membership.MembershipListener;
import org.apache.geode.management.membership.UniversalMembershipListenerAdapter;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ServerLauncherDUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
index fb7960d..5d2fc3e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
@@ -35,10 +35,9 @@ import org.apache.geode.internal.SystemAdmin;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+
public class SystemAdminDUnitTest extends JUnit4DistributedTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
index 24b7a8b..1f02f32 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
@@ -21,16 +21,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class CacheConfigDAODUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
index 0ba2381..4a092ff 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
@@ -74,13 +74,12 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.SharedErrorCollector;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This class tests the functionality of the {@link ClusterDistributionManager} class.
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ClusterDistributionManagerDUnitTest extends DistributedTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
index 37191ff..55ca938 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
@@ -54,14 +54,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
* This class tests the functionality of the {@linkplain org.apache.geode.internal.admin internal
* admin} API.
*/
-@Category(DistributedTest.class)
+
public class ClusterDistributionManagerForAdminDUnitTest extends CacheTestCase
implements AlertListener {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
index f17cbea..c37f6f5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -38,10 +38,9 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class DistributionAdvisorDUnitTest extends JUnit4DistributedTestCase {
private transient DistributionAdvisor.Profile profiles[];
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
index 8bdbc71..881f53b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
@@ -47,9 +47,8 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.junit.categories.DLockTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DLockTest.class, DistributedTest.class})
+@Category({DLockTest.class})
public class DlockAndTxlockRegressionTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
public static final String TRANSACTION_COUNT = "transactionCount";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
index c1ba4ab..5b7a355 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
@@ -42,11 +42,10 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ProductUseLogDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
index 32decb1..e2166b0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
@@ -38,13 +38,12 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* TRAC #40751: A RuntimeException from a user's toData method causes a hang
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ValueToDataThrowsRuntimeExceptionRegressionTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index 41e89b6..54ca77b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.execute.Function;
@@ -53,9 +52,8 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class GemFireDeadlockDetectorDUnitTest extends JUnit4CacheTestCase {
private static final Set<Thread> stuckThreads =
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
index e1eaa34..f5685a8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.internal.DistributionMessage;
@@ -42,9 +41,8 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class StreamingOperationManyDUnitTest extends JUnit4DistributedTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
index dbfd550..8c7367a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.internal.DistributionMessage;
@@ -43,9 +42,8 @@ import org.apache.geode.internal.cache.Token;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class StreamingOperationOneDUnitTest extends JUnit4DistributedTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 1b56e56..49c1e84 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -40,13 +40,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
* This tests the rolling upgrade for locators with different GOSSIPVERSION.
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
index f9c723e..41888c9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
@@ -18,19 +18,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_T
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache30.CacheMapTxnDUnitTest;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same tests as that of {@link CacheMapTxnDUnitTest} after setting "distributed-transactions"
* property to true
*/
-@Category(DistributedTest.class)
+
public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
public CacheMapDistTXDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
index 0649792..08861d7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
import java.util.HashMap;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -48,13 +47,12 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* TODO: reenable this test and fix it when work on Dist TX resumes -- it fails with no members to
* host buckets
*/
-@Category(DistributedTest.class)
+
public class DistTXDebugDUnitTest extends JUnit4CacheTestCase {
protected VM accessor = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
index e857561..0c36548 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
@@ -20,17 +20,15 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache30.TXOrderDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same tests as that of {@link TXOrderDUnitTest} after setting "distributed-transactions" property
* to true
*/
-@Category(DistributedTest.class)
+
public class DistTXOrderDUnitTest extends TXOrderDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
index a0a57cd..adb5800 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.disttx;
import static org.apache.geode.test.dunit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -33,9 +32,8 @@ import org.apache.geode.internal.cache.execute.data.Customer;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistTXPersistentDebugDUnitTest extends DistTXDebugDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
index 5d7e430..e9f1a79 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
@@ -18,16 +18,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_T
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache30.TXRestrictionsDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same tests as that of {@link TXRestrictionsDUnitTest} after setting "distributed-transactions"
* property to true
*/
-@Category(DistributedTest.class)
+
public class DistTXRestrictionsDUnitTest extends TXRestrictionsDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
index 8a46859..8e2955a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
@@ -18,12 +18,9 @@ import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_T
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.internal.cache.TransactionsWithDeltaDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
public DistTXWithDeltaDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
index f365185..b17409c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -68,10 +67,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("deprecation")
-@Category(DistributedTest.class)
+
public class DistributedTransactionDUnitTest extends JUnit4CacheTestCase {
protected final String CUSTOMER_PR = "customerPRRegion";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
index c6cecb2..8514aee 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
@@ -20,12 +20,10 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.execute.PRTransactionDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
index 9d9e598..3e93ca6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -20,12 +20,10 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.execute.PRTransactionWithVersionsDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PRDistTXWithVersionsDUnitTest extends PRTransactionWithVersionsDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index 60744bd..26fa3d2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -18,16 +18,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_T
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.internal.cache.partitioned.PersistentPartitionedRegionWithTransactionDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Same tests as that of {@link PersistentPartitionedRegionWithTransactionDUnitTest} after setting
* "distributed-transactions" property to true
*/
-@Category(DistributedTest.class)
+
public class PersistentPartitionedRegionWithDistTXDUnitTest
extends PersistentPartitionedRegionWithTransactionDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 7d6bdf3..4c82444 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -35,7 +35,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
/**
@@ -44,7 +43,7 @@ import org.apache.geode.test.junit.categories.SerializationTest;
*
*
*/
-@Category({DistributedTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTestCase {
private transient ByteArrayOutputStream baos;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
index 8e403f0..fc01de0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
@@ -47,10 +47,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class ClassNotFoundExceptionDUnitTest extends JUnit4CacheTestCase {
public ClassNotFoundExceptionDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
index 5728bd4..d0c710f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
@@ -50,10 +50,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({DistributedTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class PdxDeleteFieldDUnitTest extends JUnit4CacheTestCase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java
index ace02f7..ccc49ee 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java
@@ -51,10 +51,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({DistributedTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class PdxRenameDUnitTest extends JUnit4CacheTestCase {
final List<String> filesToBeDeleted = new CopyOnWriteArrayList<String>();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
index 02bc354..f3b6202 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.fail;
import org.junit.After;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -34,12 +33,11 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.DistributedTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* TRAC #33726: afterRegionCreate event delivered before region initialization occurs
*/
-@Category(DistributedTest.class)
+
public class AfterRegionCreateBeforeInitializationRegressionTest extends DistributedTestCase {
private static boolean[] flags = new boolean[2];
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
index 27ec286..6ac1922 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.ToDataException;
@@ -44,9 +43,8 @@ import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class BrokenSerializationConsistencyRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
index 41c5617..4815d5f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
@@ -38,7 +38,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.ForcedDisconnectException;
import org.apache.geode.cache.AttributesFactory;
@@ -58,7 +57,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.dunit.rules.SharedErrorCollector;
-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;
@@ -68,7 +66,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #41733: Hang in BucketAdvisor.waitForPrimaryMember
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class BucketCreationCrashRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
index 754d645..f8eb949 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
@@ -21,7 +21,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -32,7 +31,6 @@ import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -42,7 +40,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* TRAC #41091: Missing primary detected after member forcefully disconnected from DS (underlying
* InternalGemFireError: Trying to clear a bucket region that was not destroyed)
*/
-@Category(DistributedTest.class)
+
public class BucketCreationGIIHARegressionTest extends CacheTestCase {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
index c7f52ea..611ed72 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
@@ -49,14 +48,13 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the use of CacheDistributionAdvisor in createSubRegion
*
*
*/
-@Category(DistributedTest.class)
+
public class CacheAdvisorDUnitTest extends JUnit4CacheTestCase {
private transient VM[] vms;
private transient InternalDistributedMember[] ids;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
index a276800..3e3eece 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
@@ -27,7 +27,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -38,7 +37,6 @@ import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-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;
@@ -49,7 +47,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #37241: cleanupFailedInitialization on should also clean disk files created
*/
-@Category(DistributedTest.class)
+
public class CleanupFailedInitWithDiskFilesRegressionTest extends CacheTestCase {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
index 8f414eb..f603195 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -47,9 +46,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ClearDAckDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
index 066de28..09109c2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
@@ -24,7 +24,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.entries.VersionedThinDiskRegionEntryHeapObjectKey;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-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;
@@ -48,7 +46,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* TRAC #37377: Clear operation with GII in progress may result in a deleted entry to be logged in
* the oplog without accompanying create
*/
-@Category(DistributedTest.class)
+
public class ClearDuringGiiOplogWithMissingCreateRegressionTest extends CacheTestCase {
private static final int PUT_COUNT = 10000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
index ff6674a..ba9450d 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
@@ -29,7 +29,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -42,7 +41,6 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
import org.apache.geode.internal.cache.SearchLoadAndWriteProcessor.NetSearchRequestMessage;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-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;
@@ -58,7 +56,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* TRAC #40299: Suspect String - DiskAccessException : Data for DiskEntry could not be obtained
* from Disk. A clear operation may have deleted the oplogs (logged as error)
*/
-@Category(DistributedTest.class)
+
public class ClearDuringNetSearchOplogRegressionTest extends CacheTestCase {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
index c5b58cb..77a5b64 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -41,13 +40,12 @@ import org.apache.geode.test.dunit.LogWriterUtils;
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.DistributedTest;
/**
* For the Global region subsequent puts should be blocked until the clear operation is completely
* done
*/
-@Category(DistributedTest.class)
+
public class ClearGlobalDUnitTest extends JUnit4DistributedTestCase {
static VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
index b27ee16..51e438a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -32,13 +31,12 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.DistributedTestCase;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* TRAC #33359: AssertionError thrown while processing
* cache.DistributedClearOperation$ClearRegionMessage
*/
-@Category(DistributedTest.class)
+
public class ClearRegionMessageAssertionRegressionTest extends DistributedTestCase {
private static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
index e97c531..c357e84 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.Logger;
import org.assertj.core.api.JUnitSoftAssertions;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheEvent;
@@ -49,7 +48,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test class to verify proper RVV locking interaction between entry operations such as PUT/REMOVE
@@ -65,7 +63,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*/
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+
public class ClearRvvLockingDUnitTest extends JUnit4CacheTestCase {
@Rule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
index b800171..2403001 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
@@ -29,7 +29,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheEvent;
@@ -42,7 +41,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
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.DistributedTest;
/**
* Test class to verify proper locking interaction between transactions and the CLEAR region
@@ -58,7 +56,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* This forces CLEAR to wait until commit processing is complete.
*/
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+
public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
@Rule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
index 2fe8629..7a2ab57 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
@@ -68,7 +68,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Client side deserialization should not throw EOFException when copy-on-read is true.
@@ -78,7 +77,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire bugfix5.7
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class ClientDeserializationCopyOnReadRegressionTest extends ClientServerTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
index f152a7b..c4b95e3 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
@@ -59,14 +59,13 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Class <code>ClientServerGetAllDUnitTest</code> test client/server getAll.
*
* @since GemFire 5.7
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index aa6a72a..10e7cdb 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -54,14 +54,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests the fix for bug #43407 under a variety of configurations and also tests that
* tombstones are treated in a similar manner. The ticket complains that a client that does a get(K)
* does not end up with the entry in its cache if K is invalid on the server.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerInvalidAndDestroyedEntryDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
index 63fcef3..d59113b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
@@ -22,8 +22,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.Region;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.distributed.ConfigurationProperties;
@@ -33,12 +31,11 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* test client initiated transactions with concurrency checks enabled.
*/
-@Category(DistributedTest.class)
+
public class ClientServerTransactionCCEDUnitTest extends ClientServerTransactionDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
index 29391da..6ba9dc7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
@@ -119,13 +119,12 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests the basic client-server transaction functionality
*/
-@Category(DistributedTest.class)
+
public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest {
protected static final int MAX_ENTRIES = 10;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
index 97010ca..b7a3a1a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
@@ -21,7 +21,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheTransactionManager;
import org.apache.geode.cache.Region;
@@ -32,7 +31,6 @@ import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.LocatorTestBase;
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.rules.serializable.SerializableTestName;
/**
@@ -88,7 +86,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* at java.lang.Thread.run(Thread.java:662)
* </pre>
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class ClientTxCommitShouldNotHangRegressionTest extends LocatorTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
index e829eb3..b84716a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -31,9 +30,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ConcurrentDestroySubRegionDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
index 83163f3..885d394 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.Delta;
@@ -64,12 +63,11 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* tests for the concurrentMapOperations. there are more tests in ClientServerMiscDUnitTest
*/
-@Category(DistributedTest.class)
+
public class ConcurrentMapOpsDUnitTest extends JUnit4CacheTestCase {
private static final String REP_REG_NAME = "repRegion";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
index e8ba2c4..885e788 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.dunit.AsyncInvocation;
@@ -36,7 +35,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.Repeat;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.RepeatRule;
/**
@@ -44,7 +42,7 @@ import org.apache.geode.test.junit.rules.RepeatRule;
*
* see bugs #50785 and #46438
*/
-@Category(DistributedTest.class)
+
public class ConnectDisconnectDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
index edc0cfe..e65e9e0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -32,13 +31,12 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test that the bucket size does not go negative when we fault out and in a delta object.
*
*/
-@Category(DistributedTest.class)
+
public class DeltaFaultInDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
index ff7c78d..f76d099 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
@@ -28,7 +28,6 @@ import java.io.File;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.InvalidDeltaException;
@@ -73,12 +72,11 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire 6.1
*/
-@Category(DistributedTest.class)
+
public class DeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
private final Compressor compressor = SnappyCompressor.getDefaultInstance();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
index fd25cb9..3b64344 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.InvalidDeltaException;
@@ -53,9 +52,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
protected static VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
index dc6fa8f..a41f2e4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
import java.io.Serializable;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -38,9 +37,8 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class DeltaSizingDUnitTest extends JUnit4CacheTestCase {
public DeltaSizingDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
index 7523e94..f668dea 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
@@ -27,7 +27,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.internal.util.DelayedAction;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-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;
@@ -112,7 +110,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* at java.lang.Thread.run(Thread.java:662) from com.gemstone.gemfire.internal.cache.persistence.PersistentGatewayDUnitTest$5.run with 0 args : "Create gateway region" (took 1277 ms)
* </pre>
*/
-@Category(DistributedTest.class)
+
public class DiskRecoveryWithVersioningGiiRegressionTest extends CacheTestCase {
private static final int ENTRY_COUNT = 1000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
index 90ef19b..c426486 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -39,7 +38,6 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Disk Reg DUNIT Test: A byte array value when put in a remote VM , gets pushed to local VM as a
@@ -48,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*/
-@Category(DistributedTest.class)
+
public class DiskRegByteArrayDUnitTest extends JUnit4CacheTestCase {
static Cache cache;
static Properties props = new Properties();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index a99f02d..4becd88 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -36,10 +36,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class DistrbutedRegionProfileOffHeapDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
index 6853125..d73475c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.ExpirationAttributes;
@@ -44,7 +43,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableErrorCollector;
/**
@@ -55,7 +53,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableErrorCollector
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class EntriesDoNotExpireDuringGiiRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
index af4464d..80307aa 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
@@ -19,7 +19,6 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
@@ -37,9 +36,8 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase {
public FireAndForgetFunctionOnAllServersDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
index 7c24944..14cda43 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -65,9 +64,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class FixedPRSinglehopDUnitTest extends JUnit4CacheTestCase {
private static final String PR_NAME = "fixed_single_hop_pr";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 25d4663..a2bf5f8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -67,10 +67,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+
public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
VM P; // GII provider
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
index 2090d95..b3e1e81 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -44,9 +43,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class GIIFlowControlDUnitTest extends JUnit4CacheTestCase {
protected static final String REGION_NAME = "region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
index 78de8bc..2e56d84 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
@@ -26,7 +26,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -37,7 +36,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.Scope;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-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;
@@ -50,7 +48,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #39079: Regions with persistence remain in use after IOException have occurred
*/
-@Category(DistributedTest.class)
+
public class GiiDiskAccessExceptionRegressionTest extends CacheTestCase {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
index c1d083d..7870d90 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -48,14 +47,13 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the GridAdvisor
*
* @since GemFire 5.7
*/
-@Category(DistributedTest.class)
+
public class GridAdvisorDUnitTest extends JUnit4DistributedTestCase {
private static InternalCache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 1eff278..23d1d59 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -48,7 +47,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the size of clientUpdateMessageImpl with the size calculated by {@link MemoryLRUController}
@@ -56,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.7
*/
-@Category(DistributedTest.class)
+
public class HAOverflowMemObjectSizerDUnitTest extends JUnit4DistributedTestCase {
protected static InternalLocator locator;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
index bbf394c..c2b5fc1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
@@ -30,7 +30,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.Region;
@@ -46,7 +45,6 @@ import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-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;
@@ -57,7 +55,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #39079: Regions with persistence remain in use after IOException have occurred
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class InitializedDiskRegionWithIoExceptionRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
index f11eeb3..47fd9c6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -43,13 +42,12 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests interrupting gemfire threads and seeing what happens
*
*/
-@Category(DistributedTest.class)
+
public class InterruptClientServerDUnitTest extends JUnit4CacheTestCase {
private static volatile Thread puttingThread;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
index 645013b..a2af4d3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
@@ -18,11 +18,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCK
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
public class InterruptsConserveSocketsFalseDUnitTest extends InterruptsDUnitTest {
public InterruptsConserveSocketsFalseDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
index 4dc449b..54bc3cd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
@@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -36,13 +35,12 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests interrupting gemfire threads during a put operation to see what happens
*
*/
-@Category(DistributedTest.class)
+
public class InterruptsDUnitTest extends JUnit4CacheTestCase {
private static volatile Thread puttingThread;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
index 8f18fa0..9bcdc3d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertNotNull;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -28,13 +27,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test that keys iterator do not returned keys with removed token as its values
*
*/
-@Category(DistributedTest.class)
+
public class IteratorDUnitTest extends JUnit4CacheTestCase {
public IteratorDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
index f4ae57e..072bbb7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -46,9 +45,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class MapClearGIIDUnitTest extends JUnit4CacheTestCase {
protected static boolean wasGIIInProgressDuringClear = false;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
index 99df736..5187895 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -43,9 +42,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class NetSearchMessagingDUnitTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
index 36cea09..1b6bd02 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -43,13 +43,12 @@ import org.apache.geode.internal.tcp.ConnectionTable;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
/**
* Tests the P2P delta propagation functionality.
*/
-@Category({DistributedTest.class, SerializationTest.class})
+@Category({SerializationTest.class})
public class P2PDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
static VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
index efb0f02..25a0922 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
@@ -27,7 +27,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.DataPolicy;
@@ -36,7 +35,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -45,7 +43,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #42055: a pr accessor configured for OverflowToDisk fails during creation because of disk
*/
-@Category(DistributedTest.class)
+
public class PRAccessorWithOverflowRegressionTest extends CacheTestCase {
private static final int ENTRIES_COUNT = 1;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
index 0f8cc5f..74294de 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
@@ -22,7 +22,6 @@ import java.io.DataOutput;
import java.io.IOException;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.ToDataException;
@@ -35,7 +34,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests a toData that always throws an IOException. This test does a put with the bad to data from
@@ -43,7 +41,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*
*/
-@Category(DistributedTest.class)
+
public class PRBadToDataDUnitTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
index 70249a1..ccb2234 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
@@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -40,9 +39,8 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore.BucketVisitor;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PRCustomPartitioningDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
index 46c538e..1f81dc8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -40,9 +39,8 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PREntryIdleExpirationDistributedTest implements Serializable {
@ClassRule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
index e67cab7..b812827 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
@@ -22,14 +22,12 @@ import java.util.Map.Entry;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -38,7 +36,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #45164: Iterating on Region.entrySet() can return null on partitioned region
*/
-@Category(DistributedTest.class)
+
public class PREntrySetIteratorRegressionTest extends CacheTestCase {
private static final int ENTRY_COUNT = 10_000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
index 75e8377..38ae7c5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
@@ -31,7 +31,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -48,13 +47,12 @@ import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Distributed tests for querying a PartitionedRegion.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PRQueryDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
index ae1370c..b1fc15d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
@@ -49,13 +49,12 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
/**
* Extracted from {@link PRQueryDistributedTest}.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class PRQueryWithIndexAndPdxDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
index e429a2b..57a940e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
@@ -46,14 +46,13 @@ import org.apache.geode.cache.query.internal.index.AbstractIndex;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Extracted from {@link PRQueryDistributedTest}.
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class PRQueryWithIndexDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
index f8c30ff..eef55b3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
@@ -46,14 +46,13 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Extracted from {@link PRQueryDistributedTest}.
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryWithOrderByDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
index d7f23f1..d7a6910 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
@@ -48,7 +48,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.dunit.rules.SharedErrorCollector;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -58,7 +57,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #43102: hang while executing query with pdx objects
*/
-@Category({DistributedTest.class, OQLQueryTest.class})
+@Category({OQLQueryTest.class})
@SuppressWarnings("serial")
public class PRQueryWithPdxDuringRebalanceRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
index 535b0a6..3cb1645 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -54,7 +53,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #50749: RegionDestroyedException when running a OQL inside function for a colocated region
*/
-@Category({DistributedTest.class, OQLIndexTest.class})
+@Category({OQLIndexTest.class})
@SuppressWarnings("serial")
public class PRWithIndexAfterRebalanceRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
index b6cbd92..b8189b3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -43,10 +42,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings({"serial", "rawtypes", "deprecation", "unchecked"})
-@Category(DistributedTest.class)
+
public class PartitionListenerDUnitTest extends JUnit4CacheTestCase {
public PartitionListenerDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index 0c6252e..2cb040b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -18,16 +18,14 @@ import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCK
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test all the PartitionedRegion api calls when ConserveSockets is set to false
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionAPIConserveSocketsFalseDUnitTest
extends PartitionedRegionAPIDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
index 7e13c47..392255d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheLoader;
@@ -44,12 +43,11 @@ import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is a dunit test for PartitionedRegion creation and Region API's functionality.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PartitionedRegionAPIDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
index e4f6f00..e14afe9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
@@ -22,7 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -31,13 +30,12 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Verifies that destroyRegion, localDestroyRegion and close work properly when PartitionedRegion is
* a subregion.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionAsSubregionDUnitTest extends CacheTestCase {
private static final int TOTAL_NUM_BUCKETS = GLOBAL_MAX_BUCKETS_DEFAULT;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index 23c7fca..25c7f74 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.ExecutionException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -42,12 +41,11 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests bucket Creation and distribution for the multiple Partition regions.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionBucketCreationDistributionDUnitTest extends CacheTestCase {
private String regionOne;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
index c39e6a8..50bb69c 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -29,12 +28,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify the meta-data cleanUp done at the time of cache close Op.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionCacheCloseDUnitTest extends CacheTestCase {
private static final int TOTAL_NUM_BUCKETS = 5;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index fcb4d93..b8db17f 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -24,18 +24,16 @@ import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
/**
* This class tests regions created by xml files
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionCacheXMLExampleDUnitTest extends CacheTestCase {
private static final String CACHE_XML_FILE_1 = "PartitionRegionCacheExample1.xml";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
index db75f05..6034726 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.DataPolicy;
@@ -38,9 +37,8 @@ import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class PartitionedRegionCloseDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
index 215784d..5c4a546 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.ExecutionException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -45,7 +44,6 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.ExecutorServiceRule;
/**
@@ -53,7 +51,7 @@ import org.apache.geode.test.junit.rules.ExecutorServiceRule;
* will verify the functionality under distributed scenario.
*/
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+
public class PartitionedRegionCreationDUnitTest extends CacheTestCase {
private VM vm0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 82ae51f..7d255bf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -38,11 +38,10 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@SuppressWarnings("synthetic-access")
-@Category(DistributedTest.class)
+
public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCase {
public PartitionedRegionDelayedRecoveryDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
index 5834947..476b9ab 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -40,12 +39,11 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test aims to test the destroyRegion functionality.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionDestroyDUnitTest extends CacheTestCase {
private static volatile CountDownLatch signalLatch = new CountDownLatch(1);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
index 48b41f1..180e8a8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -32,14 +31,13 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests total entry count of partitioned regions.
*
*
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionEntryCountDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = 19808034671087558L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
index 60334b2..87403cf 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
@@ -28,7 +28,6 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheException;
@@ -63,9 +62,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PartitionedRegionEvictionDUnitTest extends JUnit4CacheTestCase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
index 61c6430..822824e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
@@ -27,7 +27,6 @@ import java.util.concurrent.CountDownLatch;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -45,9 +44,8 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PartitionedRegionHADUnitTest extends CacheTestCase {
private static final String PR_ZERO_REDUNDANCY = "PR_ZeroRedundancy";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
index fb58a28..3ecda8a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -42,7 +41,6 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests for PartitionedRegion cleanup on Node Failure through Membership listener.<br>
@@ -53,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* (2) testMetaDataCleanupOnMultiplePRNodeFail - Test for PartitionedRegion metadata cleanup for
* multiple failed nodes.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends CacheTestCase {
private static final int VM_COUNT = 4;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
index 5aed604..a08a1f0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheWriterException;
@@ -35,13 +34,12 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests invalidateRegion functionality on partitioned regions
*
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionInvalidateDUnitTest extends JUnit4CacheTestCase {
public PartitionedRegionInvalidateDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
index 8fcfc5a..3255dbe 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
@@ -34,12 +33,11 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class is to test LOCAL_MAX_MEMORY property of partition region while creation of bucket.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PartitionedRegionLocalMaxMemoryDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 27b2041..9e11092 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -24,7 +24,6 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
/**
@@ -32,7 +31,7 @@ import org.apache.geode.test.junit.categories.OffHeapTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
@SuppressWarnings("serial")
public class PartitionedRegionLocalMaxMemoryOffHeapDUnitTest
extends PartitionedRegionLocalMaxMemoryDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
index dba0e70..1156228 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
@@ -21,7 +21,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -29,12 +28,11 @@ import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test is dunit test for the multiple Partition Regions in 4 VMs.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionMultipleDUnitTest extends CacheTestCase {
private static final int REDUNDANCY = 0;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index 7647ba5..7938b20 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -26,10 +26,9 @@ import org.apache.geode.internal.cache.control.OffHeapMemoryMonitor;
import org.apache.geode.internal.cache.eviction.HeapEvictor;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.OffHeapTest;
-@Category({DistributedTest.class, OffHeapTest.class})
+@Category({OffHeapTest.class})
public class PartitionedRegionOffHeapEvictionDUnitTest extends PartitionedRegionEvictionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
index eafbf8c..36227ad 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.TreeSet;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -36,12 +35,11 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests PRID (PartitionedRegion Id) metadata.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionPRIDDUnitTest extends CacheTestCase {
private static final String RETRY_TIMEOUT_PROPERTY_VALUE = "20000";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index 9bf121e..3320ba4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -35,9 +34,8 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PartitionedRegionRedundancyZoneDUnitTest extends JUnit4CacheTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index e26ac7f..a9f0c72 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -85,10 +85,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
private static final String PR_NAME = "single_hop_pr";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index 7386210..c5c0bfe 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -65,9 +65,8 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4CacheTestCase {
protected static final String PR_NAME = "single_hop_pr";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
index f915fa1..6b935a0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
@@ -24,7 +24,6 @@ import java.io.File;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStore;
@@ -35,7 +34,6 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
@@ -43,7 +41,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
* PartitionedRegions with different combinations of Scope and Redundancy (Scope DIST_ACK,
* Redundancy 1 AND Scope DIST_NO_ACK, Redundancy 0).
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionSizeDUnitTest extends CacheTestCase {
private static final String DISK_STORE_NAME = "DISKSTORE";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
index 4f44a49..7f6f8c9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeoutException;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.Statistics;
import org.apache.geode.cache.Cache;
@@ -35,9 +34,8 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.control.RebalanceOperation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PartitionedRegionStatsDUnitTest extends CacheTestCase {
private static final int CNT = 10;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index 8177cee..18ea0fd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.Set;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -45,14 +44,13 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Confirm that the utils used for testing work as advertised
*
* @since GemFire 5.0
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionTestUtilsDUnitTest extends CacheTestCase {
private static final int TOTAL_NUM_BUCKETS = 5;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
index 205c97b..046fa39 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
@@ -21,7 +21,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
@@ -30,12 +29,11 @@ import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Verifies creation of partitioned region and distributed region with same name.
*/
-@Category(DistributedTest.class)
+
public class PartitionedRegionWithSameNameDUnitTest extends CacheTestCase {
private String regionName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
index 8e7785b..e6aa6f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
@@ -26,7 +26,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -42,9 +41,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PersistentRegionTransactionDUnitTest extends JUnit4CacheTestCase {
private VM server;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
index e6a8fdd..3c5e7bb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -47,9 +46,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class PutAllDAckDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
index 832a2cc..72cb927 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -56,9 +55,8 @@ import org.apache.geode.test.dunit.SerializableRunnable;
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.DistributedTest;
-@Category(DistributedTest.class)
+
public class PutAllGlobalDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
/**
* timeout period for the put() operation, when it is run concurrent with a conflicting putAll()
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
index 46d2889..69c39fd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
@@ -33,9 +32,8 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class RegionListenerDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
index e632d06..213b6f9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
@@ -42,7 +42,6 @@ import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -56,7 +55,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
*
* @since GemFire 6.5
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class RegisterInterestWithEvictionRegressionTest extends ClientServerTestCase {
private static final int ENTRIES_ON_SERVER = 10;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
index 092854f..8dd722a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
@@ -16,12 +16,9 @@ package org.apache.geode.internal.cache;
import java.util.Properties;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class RemoteTransactionCCEDUnitTest extends RemoteTransactionDUnitTest {
private static final long serialVersionUID = 5960292521068781262L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
index 5757746..fd2f193 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
@@ -43,7 +43,6 @@ import javax.transaction.UserTransaction;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.ExpirationDetector;
import org.apache.geode.cache.AttributesFactory;
@@ -116,9 +115,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class RemoteTransactionDUnitTest extends JUnit4CacheTestCase {
protected final String CUSTOMER = "custRegion";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
index 3a7f00a..d86f683 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -44,12 +43,11 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Adapted from RemoveAllDAckDUnitTest
*/
-@Category(DistributedTest.class)
+
public class RemoveAllDAckDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
index 9acd2be..79356a6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -41,9 +40,8 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class RemoveDAckDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
index 04935082..c4a3bdb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -46,9 +45,8 @@ import org.apache.geode.test.dunit.SerializableRunnable;
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.DistributedTest;
-@Category(DistributedTest.class)
+
public class RemoveGlobalDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
static Cache cache;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
index 6d2ab11..b20a681 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
@@ -30,7 +30,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAttributes;
@@ -42,9 +41,8 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ReplicateEntryIdleExpirationDistributedTest implements Serializable {
@ClassRule
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
index 5391401..71b71ac 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
@@ -55,9 +55,8 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class SingleHopStatsDUnitTest extends JUnit4CacheTestCase {
private static final String Region_Name = "42010";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
index 0c4b366..ea795d2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
@@ -25,7 +25,6 @@ import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -54,7 +53,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* A test of the when we will use the object sizer to determine the actual size of objects wrapped
@@ -66,7 +64,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* support indexes on regions with overflow to disk.
*
*/
-@Category(DistributedTest.class)
+
public class SizingFlagDUnitTest extends JUnit4CacheTestCase {
public SizingFlagDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
index 5146ef4..6fd1244 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
@@ -24,17 +24,15 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.test.dunit.VM;
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.util.test.TestUtil;
-@Category(DistributedTest.class)
+
public class StartServerWithXmlDUnitTest {
private VM server;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
index 817430a..747f5ef 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
@@ -43,7 +43,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.MembershipTest;
/**
@@ -51,7 +50,7 @@ import org.apache.geode.test.junit.categories.MembershipTest;
*
* @since GemFire 5.1
*/
-@Category({DistributedTest.class, MembershipTest.class})
+@Category({MembershipTest.class})
public class SystemFailureDUnitTest extends DistributedCacheTestCase {
static final String REGION_NAME = "SystemFailureDUnitTest";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
index 64cac4f..7c05d0d 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.util.Iterator;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.Delta;
@@ -56,9 +55,8 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
private static final String D_REFERENCE = "ref";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
index 16f15f6..e3205de 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
@@ -54,7 +54,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -69,7 +68,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* <li>CacheServer via Pool (transaction)-> CacheServer</li>
* </ol>
*/
-@Category({DistributedTest.class, BackwardCompatibilityTest.class})
+@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@SuppressWarnings("serial")
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
index ebc4372..09e05af 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
@@ -49,7 +49,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
@@ -80,7 +79,6 @@ import org.apache.geode.management.BackupStatus;
import org.apache.geode.management.ManagementException;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
@@ -91,7 +89,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
* <li>Test backing up and recovering while ops are in progress?
* </ul>
*/
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class BackupDistributedTest extends PersistentPartitionedRegionTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
index 1ab9933..0cd4db9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
@@ -40,7 +40,6 @@ import org.awaitility.Awaitility;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.apache.geode.cache.Cache;
@@ -58,9 +57,8 @@ import org.apache.geode.cache30.CacheTestCase;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class})
+
public abstract class BackupPrepareAndFinishMsgDUnitTest extends CacheTestCase {
// Although this test does not make use of other members, the current member needs to be
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
index d1316f7..4305916 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
@@ -45,7 +45,6 @@ import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.logging.log4j.Logger;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
@@ -77,13 +76,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
/**
* Tests for the incremental backup feature.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class IncrementalBackupDistributedTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index 0cdc4e6..4be47ac 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -45,7 +45,6 @@ import java.util.concurrent.TimeoutException;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -98,10 +97,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
@SuppressWarnings("synthetic-access")
-@Category(DistributedTest.class)
+
public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
private static final long MAX_WAIT = 60;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
index e3159fe..7e49b5e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -53,14 +52,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests <code>EventTracker</code> management.
*
* @since GemFire 6.5
*/
-@Category(DistributedTest.class)
+
public class EventTrackerDUnitTest extends JUnit4CacheTestCase {
/** The port on which the <code>CacheServer</code> was started in this VM */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
index 96d664f..5ca8608 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
-@Category({DistributedTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class EvictionDUnitTest extends EvictionTestBase {
@Test
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
index c3b4d62..40672fd 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
@@ -49,10 +49,9 @@ import org.apache.geode.internal.size.ReflectionSingleObjectSizer;
import org.apache.geode.internal.size.Sizeable;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
-@Category({DistributedTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
@SuppressWarnings("serial")
public class EvictionObjectSizerDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
index 14e6605..509aafc 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
@@ -50,11 +50,10 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category({DistributedTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class EvictionStatsDUnitTest extends CacheTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
index b455f48..487920b 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
@@ -26,8 +26,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -62,9 +60,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class EvictionTestBase extends JUnit4CacheTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
index 63cce7f..b7f2804 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
@@ -37,14 +37,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Performs eviction dunit tests for off-heap memory.
*/
-@Category({DistributedTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class OffHeapEvictionDUnitTest extends EvictionDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
index 4fff617..0671a0f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
@@ -28,7 +28,6 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.EvictionTest;
/**
@@ -36,7 +35,7 @@ import org.apache.geode.test.junit.categories.EvictionTest;
*
* @since Geode 1.0
*/
-@Category({DistributedTest.class, EvictionTest.class})
+@Category({EvictionTest.class})
public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
index a3135b2..46ed4d8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
@@ -71,7 +70,7 @@ import org.apache.geode.test.junit.categories.FunctionServiceTest;
* TRAC #51193: The function execution connection on the server is never terminated even if the
* gemfire.CLIENT_FUNCTION_TIMEOUT property is set
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class ClientFunctionTimeoutRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index d66008c..3a341b9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -55,10 +55,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
index 4e036be..080213e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -51,9 +50,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class ColocationFailoverDUnitTest extends JUnit4DistributedTestCase {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 3842c27..3db60b9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -75,11 +75,10 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class DistributedRegionFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
VM replicate1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
index e16063f..0398b93 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
@@ -85,7 +84,7 @@ import org.apache.geode.test.junit.categories.FunctionServiceTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class ExecuteFunctionInstanceRegressionTest extends CacheTestCase {
private String regionName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
index 542b533..f128a86 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
@@ -34,7 +34,6 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
@@ -44,7 +43,7 @@ import org.apache.geode.test.junit.categories.FunctionServiceTest;
* <p>
* Extracted from {@link PRFunctionExecutionDUnitTest}.
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
@SuppressWarnings("serial")
public class FunctionExceptionsIncludeLocalMemberRegressionTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
index 5429c35..14b4361 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
@@ -48,11 +48,10 @@ import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
@SuppressWarnings("serial")
public class FunctionExecutionWithExceptionDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
index db391c7..0b0a105 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.internal.cache.execute;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests function execution with a client accessing a single member with a PR using onRegion calls.
*/
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRDUnitTest extends FunctionServiceClientAccessorPRBase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
index 6f39fb3..1299496 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
@@ -20,14 +20,13 @@ import org.apache.geode.cache.client.internal.ClientMetadataService;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests function execution with a client accessing multiple members with a PR with redundancy 0
* using onRegion calls.
*/
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersDUnitTest
extends FunctionServiceClientAccessorPRBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
index 53c2500..9c66193 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
@@ -19,13 +19,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onRegion using multiple servers from a single client that has single hop disabled
*/
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest
extends FunctionServiceClientAccessorPRBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
index 2fb639f..64de849 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.internal.cache.execute;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onServers using multiple servers from a single client.
*/
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientMultipleOnServerDUnitTest
extends FunctionServiceClientOnServerBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
index f51c215..4ffba72 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.internal.cache.execute;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Tests onServers using a single server from a single client.
*/
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class FunctionServiceClientOnServerDUnitTest extends FunctionServiceClientOnServerBase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
index ccb5ffb..7302eed 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
@@ -22,13 +22,12 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServiceLocalPRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
index 6e2fafe..9cc65f6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
@@ -21,13 +21,12 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServiceLocalRRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
index d07e13b..e486b45 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
@@ -25,13 +25,12 @@ import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServiceMultipleOnMemberDUnitTest extends FunctionServiceBase {
private Set<DistributedMember> members = new HashSet<DistributedMember>();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
index e45c4f9..30c38c3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
@@ -16,13 +16,12 @@ package org.apache.geode.internal.cache.execute;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServicePeerAccessorPRDUnitTest extends FunctionServicePeerAccessorPRBase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
index a4d6fbf..89548f1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
@@ -16,13 +16,12 @@ package org.apache.geode.internal.cache.execute;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServicePeerAccessorPRMultipleMembersDUnitTest
extends FunctionServicePeerAccessorPRBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
index cde5e24..c838d03 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
@@ -23,13 +23,12 @@ import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServicePeerAccessorRRDUnitTest extends FunctionServiceBase {
public static final String REGION = "region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
index 20a9708..83fa739 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
@@ -20,13 +20,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
* Test of the behavior of a custom ResultCollector when handling exceptions
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServiceSingleOnMemberDUnitTest extends FunctionServiceBase {
private DistributedMember memberId;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index c8565cd..8bd987a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -65,7 +65,6 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
/**
@@ -73,7 +72,7 @@ import org.apache.geode.test.junit.categories.FunctionServiceTest;
* Client-Server with Region/without Region, P2P with partitioned Region/Distributed Region,member
* Execution
*/
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase {
static Boolean isByName = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
index 2adbe78..7387dc5 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -49,10 +49,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class LocalDataSetDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index b33cc52..446fcc1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -51,10 +51,9 @@ import org.apache.geode.internal.cache.PartitionedRegion;
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.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class LocalDataSetIndexingDUnitTest extends JUnit4CacheTestCase {
protected static VM dataStore1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index 65ac3ab..baf46e0 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -43,10 +43,9 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class LocalFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 0178b1a..a7d0508 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -61,10 +61,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
private static final String TEST_FUNCTION6 = TestFunction.TEST_FUNCTION6;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index d2f1dc8..a6110ed 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -40,11 +40,10 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
@SuppressWarnings("serial")
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class MultiRegionFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 7dc5503..c516976 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -58,10 +58,9 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class OnGroupsFunctionExecutionDUnitTest extends JUnit4DistributedTestCase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 07f6caa..1760064 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -33,10 +33,9 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 100045e..46a95c0 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -67,11 +67,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 44f5728..8ffa397 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -60,11 +60,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRClientServerTestBase {
private static Locator locator = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 2c5e4f9..e8311fb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -61,11 +61,10 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 2b16f6a..b0ef901 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -63,11 +63,10 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 53552dd..a7161b1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -61,10 +61,9 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
+@Category({ClientServerTest.class, FunctionServiceTest.class})
public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
extends PRClientServerTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
index c8a9393..0dc1b93 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.Set;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
@@ -78,14 +77,13 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the test for the custom and colocated partitioning of PartitionedRegion
*
*/
@SuppressWarnings("synthetic-access")
-@Category(DistributedTest.class)
+
public class PRColocationDUnitTest extends JUnit4CacheTestCase {
VM accessor = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index e7fd6f6..7a70615 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -82,10 +82,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
public class PRFunctionExecutionDUnitTest extends CacheTestCase {
private static final String STRING_KEY = "execKey";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
index 447fa7f..6f1a9d7 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
@@ -52,10 +52,9 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FunctionServiceTest;
-@Category({DistributedTest.class, FunctionServiceTest.class})
+@Category({FunctionServiceTest.class})
@SuppressWarnings("serial")
public class PRFunctionExecutionWithResultSenderDUnitTest extends CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
index 6abbff2..9489bdc 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -53,9 +52,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class PRSetOperationJTADUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
index 8e10eed..b730ad7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
@@ -29,7 +29,6 @@ import org.apache.logging.log4j.Logger;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.apache.geode.cache.CacheTransactionManager;
@@ -45,9 +44,8 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class PRSetOperationTXDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
index 5a021ec..2d12d79 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
@@ -31,7 +31,6 @@ import org.apache.logging.log4j.Logger;
import org.assertj.core.api.Assertions;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import util.TestException;
import org.apache.geode.cache.CacheTransactionManager;
@@ -71,14 +70,13 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test for co-located PR transactions. the test creates two data hosts and uses function execution
* to execute transactions.
*
*/
-@Category(DistributedTest.class)
+
public class PRTransactionDUnitTest extends PRColocationDUnitTest {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
index e0062a8..5f95073 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
import java.util.Properties;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributes;
@@ -38,9 +37,8 @@ import org.apache.geode.internal.cache.TXManagerImpl;
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.DistributedTest;
-@Category(DistributedTest.class)
+
public class PRTransactionWithSizeOperationDUnitTest extends JUnit4CacheTestCase {
Host host = Host.getHost(0);
VM dataStore1 = host.getVM(0);
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
index bfda290..ea7daff 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
@@ -14,11 +14,8 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
public class PRTransactionWithVersionsDUnitTest extends PRTransactionDUnitTest {
public PRTransactionWithVersionsDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
index 1953978..df7ee34 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
@@ -27,7 +27,6 @@ import java.util.Map.Entry;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.internal.ClientMetadataService;
@@ -38,9 +37,8 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+
public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
index 53302d4..dd43382 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
@@ -37,10 +36,9 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
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.rules.GfshCommandRule;
-@Category({DistributedTest.class})
+
@SuppressWarnings("serial")
public class ExtensionClusterConfigurationDUnitTest {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 5748f36..16e0087 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -59,7 +59,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test verifies that eventId, while being sent across the network ( client to server, server
@@ -71,7 +70,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* p2p and then finally to client-2. It is verified that client-2 receives the same values for
* thread-id and sequence-id.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/** Cache-server1 */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
index 68d364a..cc96fe9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
@@ -54,7 +54,6 @@ 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;
/**
* Dunit test to verify HA feature. Have 2 nodes S1 & S2. Client is connected to S1 & S2 with S1 as
@@ -62,7 +61,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* failing to S2.During fail over duration do some puts on S1. The client on failing to S2 may
* receive duplicate events but should not miss any events.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class FailoverDUnitTest extends JUnit4DistributedTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
index 57d7725..6fb2770 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
@@ -41,14 +41,13 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This Dunit test is to verify the bug in put() operation. When the put is invoked on the server
* and NotifyBySubscription is false then it follows normal path and then again calls put of region
* on which region queue is based. so recurssion is happening.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HABugInPutDUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME = HABugInPutDUnitTest.class.getSimpleName() + "_region";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
index 1c8ff2c..550718c 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
@@ -52,13 +52,12 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the Dunit test to verify clear and destroyRegion operation in Client-Server
* configuration.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class HAClearDUnitTest extends JUnit4DistributedTestCase {
static VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
index 53ca625..839e125 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is Targetted conflation Dunit test. 1 Client & 1 Server. Slow down the dispatcher. From the
@@ -59,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* invalidate. 4) Do a create , update , update & destroy. The client should receive 3 callbacks (
* craete , conflated update & destroy).
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HAConflationDUnitTest extends JUnit4CacheTestCase {
VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
index 02e3702..67b1577 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
@@ -50,7 +50,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the Dunit test to verify the duplicates after the fail over The test perorms following
@@ -58,7 +57,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* directy from the server1. 3. Stop the server1 so that fail over happens 4. Validate the
* duplicates received by the client1
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HADuplicateDUnitTest extends JUnit4DistributedTestCase {
VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index 62bd2b2..20a228a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -64,14 +64,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;
/**
* Test to verify correct propagation of EventID from server to client
*
* @since GemFire 5.1
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HAEventIdPropagationDUnitTest extends JUnit4DistributedTestCase {
/** server VM * */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
index a1c47a2..2188896 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
@@ -46,7 +46,6 @@ 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;
/**
* This test checks Expiration of events in the regionqueue. 1. It creates regionqueue on 4 vms 2.
@@ -55,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* expiration period. 5. Checks size of the regionqueue. Size of the regionqueue should be equal to
* 0.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HAExpiryDUnitTest extends JUnit4DistributedTestCase {
VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
index ec5051c..2df5a67 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -53,7 +53,6 @@ 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.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test points out the bug when GII of HARegion Queue is happening and at the same time it is
@@ -63,7 +62,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* asynchronously till HARegion Queue gets created in vm1. 6. Validate the data. Puts happened
* during GII should be missed.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HAGIIBugDUnitTest extends JUnit4DistributedTestCase {
VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
index d71ccf1..5c057a9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
@@ -62,14 +62,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;
/**
* Client is connected to S1 which has a slow dispatcher. Puts are made on S1. Then S2 is started
* and made available for the client. After that , S1 's server is stopped. The client fails over to
* S2. The client should receive all the puts . These puts have arrived on S2 via GII of HARegion.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HAGIIDUnitTest extends JUnit4DistributedTestCase {
private static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 36abb8b..001a25a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -64,7 +64,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This DUnit contains various tests to ensure new implementation of ha region queues works as
@@ -72,7 +71,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.7
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARQueueNewImplDUnitTest extends JUnit4DistributedTestCase {
private static final String regionName = HARQueueNewImplDUnitTest.class.getSimpleName();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
index 0f95325..4865786 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
@@ -40,7 +40,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify :
@@ -48,7 +47,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* 1)put() on a mirrored HARegion does not propagate 2)localDestroy() allowed on a mirrored region
* 3) GII happens normally
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionDUnitTest extends JUnit4DistributedTestCase {
VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index 290b713..f4b03d1 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -61,10 +61,9 @@ 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;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueDUnitTest extends JUnit4DistributedTestCase {
private static volatile boolean toCnt = true;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
index ab0885b..a6b9427 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.CacheTestCase;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -67,7 +66,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #36853: HA events can expire on primary server and this can cause data loss.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueExpiryRegressionTest extends CacheTestCase {
/** The time in milliseconds by which the start of dispatcher will be delayed */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
index f86c1f7..ae99c99 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
@@ -58,7 +58,6 @@ import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -67,7 +66,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #48571: CacheClientProxy.getQueueSizeStat() gives negative numbers when client goes down.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HARegionQueueSizeRegressionTest implements Serializable {
private static final AtomicInteger numOfPuts = new AtomicInteger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
index 7f293c6..edec33f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
@@ -47,7 +47,6 @@ import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
@@ -56,7 +55,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* TRAC #48879: Leaking ThreadIdentifiers and DispatchedAndCurrentEvents objects when client uses
* many short lived threads
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
@SuppressWarnings("serial")
public class HARegionQueueThreadIdExpiryRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
index d3d573a..7f4adda 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -53,9 +53,8 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class HASlowReceiverDUnitTest extends JUnit4DistributedTestCase {
protected static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
index ed8b5aa..1aeff38 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -45,14 +45,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;
/**
* This test verifies that all entry operations (create,put,destroy,invalidate) which propagate from
* one server1 to another server2 do get delivered to the client connected to server2 (server2 is
* primary for client)
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class OperationsPropagationDUnitTest extends JUnit4DistributedTestCase {
VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
index 74ae511..26f8080 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
@@ -22,7 +22,6 @@ import java.util.stream.IntStream;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -37,9 +36,8 @@ import org.apache.geode.test.dunit.DUnitEnv;
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.DistributedTest;
-@Category(DistributedTest.class)
+
public class PreferSerializedHARegionQueueTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = 1L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
index 94b7254..6d95497 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
@@ -56,14 +56,13 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify correct propagation of operations eventID's for put all
*
* @since GemFire 5.1
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class PutAllDUnitTest extends JUnit4DistributedTestCase {
/** server1 VM **/
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
index 91b324e..275d855 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is Dunit test for bug 36109. This test has a cache-client having a primary and a secondary
@@ -55,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* , with the failed endpoint getting closed. This bug has been fixed by moving the invalidate stat
* to be part of our implementation.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
@Ignore("Test was disabled by renaming to DisabledTest")
public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
index d80e314..57cd0ab 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -53,12 +53,11 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DLockTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed ownership via the DistributedLockService api.
*/
-@Category({DistributedTest.class, DLockTest.class})
+@Category({DLockTest.class})
public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
private static InternalDistributedSystem system;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
index 8f0164c..82ab520 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.internal.cache.PartitionedRegionDataStore;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -59,7 +58,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #39356: Missing PR buckets with HA
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
@SuppressWarnings("serial")
public class BucketCreationCrashCompletesRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
index 0e6e44a..8b6bd35 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStore;
@@ -49,7 +48,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-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;
@@ -60,7 +58,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* GEODE-3566: Moving a bucket during rebalancing does not update overflow stats
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class BucketRebalanceStatRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
index a2a3a99..1c17189 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
@@ -41,11 +41,10 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class ElidedPutAllDUnitTest extends JUnit4CacheTestCase {
private static final long serialVersionUID = -184003583877999750L;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
index 930068b..632a137 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
@@ -31,7 +31,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -47,13 +46,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Extracted from {@link PersistentPartitionedRegionDistributedTest}.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial")
public class PRDiskConflictWithColocationDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index b86fd93..632ff95 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
/**
@@ -57,7 +56,7 @@ import org.apache.geode.test.junit.categories.RegionsTest;
* and not called while local iteration.
*
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PartitionResolverDUnitTest extends JUnit4CacheTestCase {
private static final String CUSTOMER = "custRegion";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
index 9921545..abcd3f1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
@@ -40,10 +40,9 @@ import org.apache.geode.test.dunit.Assert;
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.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PartitionedRegionLoaderWriterDUnitTest extends JUnit4CacheTestCase {
private static final String PartitionedRegionName = "PartitionedRegionTest";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
index 2866a95..d98ae75 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
@@ -31,10 +31,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PartitionedRegionMetaDataCleanupDUnitTest extends JUnit4CacheTestCase {
public PartitionedRegionMetaDataCleanupDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
index d0c5056..ddb9e7b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
@@ -38,13 +38,12 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.util.CacheWriterAdapter;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionAttributesImpl;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
/**
* Tests the basic use cases for PR persistence.
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PersistPRKRFIntegrationTest {
private static final String REGION_NAME = "testRegion";
private static final String DISK_STORE_NAME = "testRegionDiskStore";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 86a3d77..e949ff3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -78,11 +78,10 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PersistentColocatedPartitionedRegionDUnitTest
extends PersistentPartitionedRegionTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index 2a8f9ec..6dd4a32 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -95,14 +95,13 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* Tests the basic use cases for PR persistence.
*/
-@Category(DistributedTest.class)
+
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("deprecation,serial,unused")
public class PersistentPartitionedRegionDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
index ed784c4..a8ee62f 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
@@ -35,7 +35,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CustomExpiry;
@@ -63,13 +62,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* RegressionTests extracted from {@link PersistentPartitionedRegionDistributedTest}.
*/
-@Category(DistributedTest.class)
+
@SuppressWarnings("serial,unused")
public class PersistentPartitionedRegionRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
index 3df5698..9460e63 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
@@ -32,14 +32,13 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
/**
* Tests the basic use cases for PR persistence.
*
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class PersistentPartitionedRegionWithTransactionDUnitTest
extends PersistentPartitionedRegionTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
index 89ab4f6..5aec1a7 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
@@ -53,7 +53,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -64,7 +63,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* The test ensures that the EXPIRE_DESTROY events are propagated to the subscriber client and the
* secondary server does process the QRMs for the EXPIRE_DESTROY events.
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
@SuppressWarnings("serial")
public class QueueRemovalMessageProcessingDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
index de29f1e..dc1a561 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
import org.apache.geode.test.dunit.rules.DistributedTestRule;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -56,7 +55,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #43684: Register interest with policy KEYS_VALUES is inefficient
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
@SuppressWarnings("serial")
public class RegisterInterestKeysValuesDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index d639cf8..1c5c977 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -66,13 +66,12 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
/**
* Tests the basic use cases for PR persistence.
*/
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
private static HangingCacheListener listener;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
index cc95f18..c8ec072 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
@@ -50,10 +50,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class StreamingPartitionOperationManyDUnitTest extends JUnit4CacheTestCase {
/* SerializableRunnable object to create a PR */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index 140cbbb..ef60f47 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -53,10 +53,9 @@ import org.apache.geode.test.dunit.Assert;
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.DistributedTest;
import org.apache.geode.test.junit.categories.RegionsTest;
-@Category({DistributedTest.class, RegionsTest.class})
+@Category({RegionsTest.class})
public class StreamingPartitionOperationOneDUnitTest extends JUnit4CacheTestCase {
/* SerializableRunnable object to create PR */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index fb11c94..35a7f83 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -33,14 +33,13 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.PartitioningTest;
/**
* This Dunit test class have multiple tests to tests different validations of static partitioning
*/
-@Category({DistributedTest.class, PartitioningTest.class})
+@Category({PartitioningTest.class})
public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
public FixedPartitioningDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index bd25a69..0d06400 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -35,7 +35,6 @@ import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.junit.experimental.categories.Category;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
@@ -75,12 +74,11 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the base class to do operations
*/
-@Category(DistributedTest.class)
+
public class FixedPartitioningTestBase extends JUnit4DistributedTestCase {
protected static String Quarter1 = "Q1";
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index 48fd886..242b833 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -27,10 +27,9 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.PartitioningTest;
-@Category({DistributedTest.class, PartitioningTest.class})
+@Category({PartitioningTest.class})
public class FixedPartitioningWithColocationAndPersistenceDUnitTest
extends FixedPartitioningTestBase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index 74a6910..2dad8d5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -80,10 +80,9 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.PersistenceTest;
-@Category({DistributedTest.class, PersistenceTest.class})
+@Category({PersistenceTest.class})
public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase {
private static final int TEST_REPLICATED_TOMBSTONE_TIMEOUT = 1000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index a64f71f..c11c8d9 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -88,7 +88,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.PersistenceTest;
@@ -96,7 +95,7 @@ import org.apache.geode.test.junit.categories.PersistenceTest;
* This is a test of how persistent distributed regions recover. This test makes sure that when
* multiple VMs are persisting the same region, they recover with the latest data during recovery.
*/
-@Category({DistributedTest.class, PersistenceTest.class})
+@Category({PersistenceTest.class})
public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBase {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
index 541a48e..f91eaa6 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
@@ -26,10 +26,9 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.PersistenceTest;
-@Category({DistributedTest.class, PersistenceTest.class})
+@Category({PersistenceTest.class})
public class PersistentRecoveryOrderOldConfigDUnitTest extends PersistentRecoveryOrderDUnitTest {
@Override
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index 1ef4920..b3ddeb6 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -107,7 +107,6 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -122,7 +121,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @author jhuynh
*/
-@Category({DistributedTest.class, BackwardCompatibilityTest.class})
+@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
index 78a2660..126d5d8 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
@@ -66,7 +66,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -85,7 +84,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* @author jhuynh
*/
-@Category({DistributedTest.class, BackwardCompatibilityTest.class})
+@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
index 6d19233..96bfaba 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
@@ -29,7 +29,6 @@ import java.util.TreeMap;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -51,10 +50,9 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
-@Category(DistributedTest.class)
+
public class GFSnapshotDUnitTest extends JUnit4DistributedTestCase {
private VM locator;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
index 50e2cab..9af7d81 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
@@ -41,7 +41,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
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.SerializableTestName;
/**
@@ -53,7 +52,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
*
* @since GemFire 6.1
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
@SuppressWarnings("serial")
public class DeltaPropagationFailureRegressionTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
index 8f98d16..5f04829 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
@@ -56,11 +56,10 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
@SuppressWarnings("serial")
public class AcceptorImplClientQueueDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
index 9610ad1..3af18bf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
@@ -47,12 +47,11 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class AcceptorImplDUnitTest extends JUnit4DistributedTestCase {
public AcceptorImplDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index 32747e4..3af2c7a 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -45,12 +45,11 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify that server responds to a higher versioned client.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class BackwardCompatibilityHigherVersionClientDUnitTest extends JUnit4DistributedTestCase {
/** the cache */
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index d747628..3f25f0c 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -54,12 +54,11 @@ 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.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests behaviour of transactions in client server model
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class CacheServerTransactionsDUnitTest extends JUnit4DistributedTestCase {
private static final int PAUSE = 5 * 1000;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
index 81ccae5..dd81cfe 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Just like CacheServerTransactionsDUnitTest but configures bridge server with thread pool (i.e.
* selector).
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class CacheServerTransactionsSelectorDUnitTest extends CacheServerTransactionsDUnitTest {
/** constructor */
public CacheServerTransactionsSelectorDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 1138dc0..7092b91 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -58,13 +58,12 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This is the DUnit Test to verify clear and DestroyRegion operation in Client-Server
* Configuration.
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClearPropagationDUnitTest extends JUnit4DistributedTestCase {
VM server1 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 10cd4cb..3a83727 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -57,7 +57,6 @@ 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;
/**
* This test verifies the per-client queue conflation override functionality Taken from the existing
@@ -65,7 +64,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.7
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
VM vm0 = null; // server
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
index 96ca523..08606b1 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
@@ -44,7 +44,6 @@ import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
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.SerializableTestName;
/**
@@ -55,7 +54,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* <p>
* TRAC #36269: RegionDestroy operation may get sent to the originator
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientDestroyRegionNotificationRegressionTest implements Serializable {
private String hostName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
index bab675c..7efbb6d 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
@@ -49,7 +49,6 @@ import org.apache.geode.test.dunit.rules.CacheRule;
import org.apache.geode.test.dunit.rules.ClientCacheRule;
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.SerializableTestName;
/**
@@ -61,7 +60,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
* TRAC #36457: Region Destroy results in unregister interest propagation to server resulting in
* server being falsely marked dead
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientDestroyRegionUnregisterInterestRegressionTest implements Serializable {
private String uniqueName;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index df4dac4..d2f146e 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -57,7 +57,6 @@ 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.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This test verifies the per-client notify-by-subscription (NBS) override functionality along with
@@ -66,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 6.0.3
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
class EventListener extends CacheListenerAdapter {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
index a720422..eb5abcb 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
@@ -60,9 +60,8 @@ 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, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
@SuppressWarnings("serial")
public class ClientProxyWithDeltaDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index f132313..664a7f4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -56,12 +56,11 @@ import org.apache.geode.test.dunit.NetworkUtils;
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;
/**
* Tests client server FORCE_INVALIDATE
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerForceInvalidateDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index db30bb0..3b60358 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -87,12 +87,11 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests client server corner cases between Region and Pool
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerMiscDUnitTest extends JUnit4CacheTestCase {
protected static PoolImpl pool = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
index 7671044..7fb32c2 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Just like parent but enables server thread pool (ie. selector)
*/
-@Category({DistributedTest.class, ClientServerTest.class})
+@Category({ClientServerTest.class})
public class ClientServerMiscSelectorDUnitTest extends ClientServerMiscDUnitTest {
public ClientServerMiscSelectorDUnitTest() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
index 0ffac38..1245e94 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
@@ -54,9 +54,8 @@ 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, ClientServerTest.class})
+@Category({ClientServerTest.class})
@SuppressWarnings("serial")
public class ClientWithInterestFailoverDistributedTest implements Serializable {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index 6044d06..caecfb9 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -59,7 +59,6 @@ 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;
/**
* This test verifies the conflation functionality of the dispatcher.
@@ -70,7 +69,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* The test has two regions. In one scenario they share a common bridgewriter and in the second
* scenario, each has a unique bridgewriter.
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class ConflationDUnitTest extends JUnit4DistributedTestCase {
VM vm0 = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
index b9495da..2a0086b 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
@@ -59,10 +59,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SerializationTest;
-@Category({DistributedTest.class, ClientServerTest.class, SerializationTest.class})
+@Category({ClientServerTest.class, SerializationTest.class})
public final class DataSerializerPropagationDUnitTest extends JUnit4DistributedTestCase {
private static final int instanceCountWithAllPuts = 3;
private static final int instanceCountWithOnePut = 1;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 358802e..1096006 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -60,13 +60,12 @@ 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;
import org.apache.geode.test.junit.categories.FlakyTest;
/**
* Tests propagation of destroy entry operation across the vms
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class DestroyEntryPropagationDUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME =
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index 04befe8..f58f6e5 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -43,9 +43,8 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class DurableClientBug39997DUnitTest extends JUnit4CacheTestCase {
public final void postTearDownCacheTestCase() {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 6797ac4..e4d4aaf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -53,9 +53,8 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
@SuppressWarnings("serial")
public class DurableClientQueueSizeDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index c8ec547..21444ca 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -25,14 +25,13 @@ import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test reconnecting a durable client that is using the locator to discover its servers
*
* @since GemFire 5.7
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class DurableClientReconnectAutoDUnitTest extends DurableClientReconnectDUnitTest {
@BeforeClass
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index bc9330b..0970912 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -64,14 +64,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 for durable reconnect issue
*
* @since GemFire 5.2
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase {
private static Cache cache = null;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 398a184..e302798 100755
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -46,7 +46,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
/**
* The DUnitTest checks whether the following Three counts are incremented correctly or not: 1)
@@ -58,7 +57,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* In the given test DurableClient comes up and goes down discreetly with different
* DurableClientTimeouts so as to increment the counts
*/
-@Category({DistributedTest.class, ClientSubscriptionTest.class})
+@Category({ClientSubscriptionTest.class})
public class DurableClientStatsDUnitTest extends JUnit4DistributedTestCase {
private VM server1VM;
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index b0d6e9e..1c14ce3 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
... 8482 lines suppressed ...
[geode] 07/46: GEODE-5363: Moves distributed tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1f4b251d84607705b7f17a2b1fead4101828627b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 09:06:52 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
.../geode/cache30/CacheListenerTestCase.java | 0
.../apache/geode/cache30/CacheLoaderTestCase.java | 0
.../org/apache/geode/cache30/CacheTestCase.java | 0
.../apache/geode/cache30/CacheWriterTestCase.java | 0
.../apache/geode/cache30/CacheXml66DUnitTest.java | 0
.../org/apache/geode/cache30/CacheXmlTestCase.java | 0
.../cache30/CertifiableTestCacheListener.java | 0
.../DiskDistributedNoAckRegionTestCase.java | 0
.../apache/geode/cache30/DiskRegionTestImpl.java | 0
...tedMulticastRegionWithUDPSecurityDUnitTest.java | 0
.../geode/cache30/MultiVMRegionTestCase.java | 0
.../geode/cache30/RegionAttributesTestCase.java | 0
.../geode/cache30/RegionReliabilityTestCase.java | 0
.../org/apache/geode/cache30/RegionTestCase.java | 0
.../apache/geode/cache30/ReliabilityTestCase.java | 0
.../apache/geode/cache30/TestCacheCallback.java | 0
.../apache/geode/cache30/TestCacheListener.java | 0
.../org/apache/geode/cache30/TestCacheLoader.java | 0
.../org/apache/geode/cache30/TestCacheWriter.java | 0
.../geode/cache30/TestTransactionListener.java | 0
...titionedBackupPrepareAndFinishMsgDUnitTest.java | 0
.../cache/execute/CustomerIDPartitionResolver.java | 0
.../geode/internal/cache/execute/PerfFunction.java | 0
.../internal/cache/execute/PerfTxFunction.java | 0
.../fixed/CustomerFixedPartitionResolver.java | 0
.../fixed/FixedPartitioningTestBaseJUnitTest.java | 0
.../geode/internal/jta/dunit/CommitThread.java | 0
.../geode/internal/jta/dunit/RollbackThread.java | 0
.../geode/internal/offheap/OffHeapRegionBase.java | 0
.../org/apache/geode/management/MBeanUtil.java | 0
.../geode/management/ManagementTestBase.java | 0
.../geode/management/ManagementTestRule.java | 0
.../internal/cli/commands/CliCommandTestBase.java | 0
.../configuration/ClusterConfigTestBase.java | 0
.../generator/AuthzCredentialGenerator.java | 0
.../security/generator/CredentialGenerator.java | 0
.../generator/DummyAuthzCredentialGenerator.java | 0
.../generator/DummyCredentialGenerator.java | 0
.../generator/PKCSCredentialGenerator.java | 0
.../security/generator/SSLCredentialGenerator.java | 0
.../UserPasswordWithExtraPropsAuthInit.java | 0
.../generator/XmlAuthzCredentialGenerator.java | 0
.../geode/internal/DataSerializableJUnitTest.java | 8 +--
.../cache/CustomerIDPartitionResolver.java | 76 ----------------------
.../geode/internal/cache/execute/data/CustId.java | 0
.../geode/internal/cache/execute/data/OrderId.java | 0
.../internal/cache/execute/data/ShipmentId.java | 0
.../DescribeDiskStoreFunctionJUnitTest.java | 11 ----
48 files changed, 4 insertions(+), 91 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionTestImpl.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionTestImpl.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionAttributesTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionAttributesTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReliabilityTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ReliabilityTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestTransactionListener.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TestTransactionListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfFunction.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfFunction.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/CommitThread.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/CommitThread.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java b/geode-core/src/distributedTest/java/org/apache/geode/management/MBeanUtil.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/MBeanUtil.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/ManagementTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/ManagementTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/ManagementTestRule.java b/geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/ManagementTestRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/CredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/CredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/DummyCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
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 b3b24af..5ffd100 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
@@ -1898,7 +1898,7 @@ public class DataSerializableJUnitTest implements Serializable {
if (e instanceof VirtualMachineError) {
SystemFailure.setFailure((VirtualMachineError) e); // don't throw
}
- fail("Uncaught exception in thread " + t, e);
+ fail("Uncaught exception in thread " + t + e);
}
};
Thread thread = new Thread(group, "Registrar") {
@@ -1908,7 +1908,7 @@ public class DataSerializableJUnitTest implements Serializable {
DataSerializer.register(c);
} catch (Exception ex) {
- fail("Interrupted while registering", ex);
+ fail("Interrupted while registering" + ex);
}
}
};
@@ -1956,7 +1956,7 @@ public class DataSerializableJUnitTest implements Serializable {
if (e instanceof VirtualMachineError) {
SystemFailure.setFailure((VirtualMachineError) e); // don't throw
}
- fail("Uncaught exception in thread " + t, e);
+ fail("Uncaught exception in thread " + t + e);
}
};
Thread thread = new Thread(group, "Registrar") {
@@ -1966,7 +1966,7 @@ public class DataSerializableJUnitTest implements Serializable {
Instantiator.register(inst);
} catch (Exception ex) {
- fail("Interrupted while registering", ex);
+ fail("Interrupted while registering" + ex);
}
}
};
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
deleted file mode 100755
index 19ae77b..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.internal.cache;
-
-import java.io.Serializable;
-
-import org.apache.geode.cache.EntryOperation;
-import org.apache.geode.cache.PartitionResolver;
-import org.apache.geode.internal.cache.execute.data.CustId;
-import org.apache.geode.internal.cache.execute.data.OrderId;
-import org.apache.geode.internal.cache.execute.data.ShipmentId;
-
-public class CustomerIDPartitionResolver implements PartitionResolver {
-
- private static CustomerIDPartitionResolver customerIDPartitionResolver = null;
-
- private String id;
-
-
- private String resolverName;
-
- public CustomerIDPartitionResolver() {}
-
- public CustomerIDPartitionResolver(String resolverID) {
- id = resolverID;
- }
-
- public String getName() {
- return this.resolverName;
- }
-
- public Serializable getRoutingObject(EntryOperation opDetails) {
-
- Serializable routingbject = null;
-
- if (opDetails.getKey() instanceof ShipmentId) {
- ShipmentId shipmentId = (ShipmentId) opDetails.getKey();
- routingbject = shipmentId.getOrderId().getCustId();
- }
- if (opDetails.getKey() instanceof OrderId) {
- OrderId orderId = (OrderId) opDetails.getKey();
- routingbject = orderId.getCustId();
- } else if (opDetails.getKey() instanceof CustId) {
- CustId custId = (CustId) opDetails.getKey();
- routingbject = custId.getCustId();
- }
- return routingbject;
- }
-
- public void close() {}
-
- public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (!(o instanceof CustomerIDPartitionResolver))
- return false;
-
- CustomerIDPartitionResolver otherCustomerIDPartitionResolver = (CustomerIDPartitionResolver) o;
- return otherCustomerIDPartitionResolver.id.equals(this.id);
-
- }
-
-}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
rename to geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index cd65dbb..7a4c3a2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
-import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -699,16 +698,6 @@ public class DescribeDiskStoreFunctionJUnitTest {
@Test
public void testExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
- IgnoredException ignoredException =
- IgnoredException.addIgnoredException(IllegalStateException.class.getName());
- try {
- doTestExecuteWithDiskDirsAndDiskSizesMismatch();
- } finally {
- ignoredException.remove();
- }
- }
-
- private void doTestExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMemberId";
final String memberName = "mockMemberName";
[geode] 09/46: GEODE-5363: Moves performance tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 87623b1553034afa19698d6fcab9e1a107ad9d8b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 17:34:52 2018 -0700
GEODE-5363: Moves performance tests into new source set.
---
geode-core/build.gradle | 16 ++++++++++++++++
.../process/BaseProcessStreamReaderIntegrationTest.java | 0
.../query/BaseLineAndCompareQueryPerfJUnitTest.java | 0
.../diskPerf/DiskRegionPerfJUnitPerformanceTest.java | 0
.../cache/snapshot/GFSnapshotJUnitPerformanceTest.java | 0
.../logging/LogWriterDisabledPerformanceTest.java | 0
.../geode/internal/logging/LogWriterPerformanceTest.java | 0
.../logging/log4j/Log4J2DisabledPerformanceTest.java | 0
.../internal/logging/log4j/Log4J2PerformanceTest.java | 0
.../log4j/LogWriterLoggerDisabledPerformanceTest.java | 0
.../logging/log4j/LogWriterLoggerPerformanceTest.java | 0
11 files changed, 16 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index b404df5..4314da7 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -35,6 +35,8 @@ configurations {
integrationTestRuntime.extendsFrom testRuntime
distributedTestCompile.extendsFrom integrationTestCompile
distributedTestRuntime.extendsFrom integrationTestRuntime
+ performanceTestCompile.extendsFrom testCompile
+ performanceTestRuntime.extendsFrom testRuntime
}
dependencies {
@@ -193,6 +195,14 @@ sourceSets {
}
resources.srcDir file('src/distributedTest/resources')
}
+ performanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/performanceTest/java')
+ }
+ resources.srcDir file('src/performanceTest/resources')
+ }
}
jmh {
@@ -277,3 +287,9 @@ dependencies {
tasks.eclipse.dependsOn(generateGrammarSource)
+task integrationTestx(type: Test) {
+ useJUnit()
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
+
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/process/BaseProcessStreamReaderIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java b/geode-core/src/performanceTest/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/cache/query/BaseLineAndCompareQueryPerfJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotJUnitPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterDisabledPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LogWriterPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2DisabledPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/Log4J2DisabledPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2DisabledPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/Log4J2DisabledPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerDisabledPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerDisabledPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerDisabledPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerDisabledPerformanceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
rename to geode-core/src/performanceTest/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
[geode] 45/46: GEODE-5363: Run uiTests from new source set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 05d2560b1943f9ca4810123c2ebc337027019cc6
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 08:44:44 2018 -0700
GEODE-5363: Run uiTests from new source set.
---
geode-assembly/build.gradle | 8 --------
.../tools/pulse/ui/PulseAcceptanceAuthTest.java | 3 ---
.../tools/pulse/ui/PulseAcceptanceNoAuthTest.java | 3 ---
.../apache/geode/test/junit/categories/UITest.java | 21 --------------------
geode-pulse/build.gradle | 12 -----------
.../tools/pulse/tests/junit/BaseServiceTest.java | 3 ---
.../pulse/tests/ui/PulseAnonymousUserTest.java | 3 ---
.../geode/tools/pulse/tests/ui/PulseAuthTest.java | 3 ---
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 3 ---
.../tools/pulse/tests/ui/PulseNoAuthTest.java | 3 ---
gradle/test.gradle | 23 ++++++++++++++++++++--
11 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 8319b09..2dbf7f4 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -440,14 +440,6 @@ def dependOnInstalledProduct = {
environment ('GEODE_HOME', install)
}
-task uiTest(type: Test) {
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.UITest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
- }
- forkEvery(1)
-}
-
// Add the configuration closure to the test targets so they depend on the install directory
test dependOnInstalledProduct
acceptanceTest dependOnInstalledProduct
diff --git a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
index caae0b7..d8aab18 100644
--- a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
+++ b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java
@@ -22,12 +22,10 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.openqa.selenium.WebDriver;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@@ -35,7 +33,6 @@ import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
public class PulseAcceptanceAuthTest extends PulseAcceptanceTestBase {
@ClassRule
diff --git a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
index 6b9a806..6ee6374 100644
--- a/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
+++ b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
@@ -20,11 +20,9 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.openqa.selenium.WebDriver;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.test.junit.rules.EmbeddedPulseRule;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.LocatorStarterRule;
@@ -32,7 +30,6 @@ import org.apache.geode.tools.pulse.internal.data.Cluster;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
public class PulseAcceptanceNoAuthTest extends PulseAcceptanceTestBase {
@ClassRule
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
deleted file mode 100755
index 9c54c4c..0000000
--- a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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;
-
-/**
- * JUnit Test Category that specifies a test involving a browser present to test the UI
- */
-public interface UITest {
-}
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 605aab7..c9d17b2 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -151,18 +151,6 @@ war {
classpath project(':geode-core').webJar.archivePath
}
-task uiTest(type:Test) {
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.UITest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
- }
-
- forkEvery(1)
- doFirst {
- TestPropertiesWriter.writeTestProperties(buildDir, name)
- }
-}
-
uiTest.dependsOn war
uiTest.finalizedBy rootProject.combineReports
rootProject.combineReports.mustRunAfter uiTest
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
index 1ed3da2..59f082e 100644
--- a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
+++ b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
@@ -42,9 +42,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.UITest;
/**
@@ -58,7 +56,6 @@ import org.apache.geode.test.junit.categories.UITest;
*
*/
@Ignore
-@Category(UITest.class)
public abstract class BaseServiceTest {
protected static Properties propsForJUnit = new Properties();
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
index 4785b13..6ef7298 100644
--- a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
+++ b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
@@ -23,17 +23,14 @@ import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.ServerRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseAnonymousUserTest {
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
index 9bcd4f7..3bef529 100644
--- a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
+++ b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
@@ -19,16 +19,13 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.WebDriver;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.ServerRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseAuthTest extends PulseBase {
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
index cbf7299..7732e6d 100644
--- a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
+++ b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
@@ -73,12 +73,10 @@ import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.tools.pulse.tests.DataBrowserResultLoader;
import org.apache.geode.tools.pulse.tests.PulseTestData;
import org.apache.geode.tools.pulse.tests.PulseTestLocators;
@@ -86,7 +84,6 @@ import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.ServerRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
public class PulseAutomatedTest extends PulseBase {
@ClassRule
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
index 1788a93..c854268 100644
--- a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
+++ b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
@@ -19,16 +19,13 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Rule;
-import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.WebDriver;
-import org.apache.geode.test.junit.categories.UITest;
import org.apache.geode.tools.pulse.tests.rules.ScreenshotOnFailureRule;
import org.apache.geode.tools.pulse.tests.rules.ServerRule;
import org.apache.geode.tools.pulse.tests.rules.WebDriverRule;
-@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseNoAuthTest extends PulseBase {
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 7f91df9..a58843f 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -110,6 +110,15 @@ subprojects {
}
resources.srcDir file('src/acceptanceTest/resources')
}
+
+ uiTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/uiTest/java')
+ }
+ resources.srcDir file('src/uiTest/resources')
+ }
}
task integrationTest(type:Test) {
@@ -142,8 +151,17 @@ subprojects {
}
task acceptanceTest(type:Test) {
- testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
- classpath = sourceSets.acceptanceTest.runtimeClasspath
+ testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
+ classpath = sourceSets.acceptanceTest.runtimeClasspath
+
+ forkEvery 1
+
+ outputs.upToDateWhen{false}
+ }
+
+ task uiTest(type:Test) {
+ testClassesDirs = sourceSets.uiTest.output.classesDirs
+ classpath = sourceSets.uiTest.runtimeClasspath
forkEvery 1
@@ -151,6 +169,7 @@ subprojects {
}
+
task flakyTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
[geode] 27/46: GEODE-5363: Don't use UnitTest category to run unit
tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 8bebc44250cf456e759369741d30a72792532713
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 13:58:25 2018 -0700
GEODE-5363: Don't use UnitTest category to run unit tests.
---
geode-junit/build.gradle | 5 +++++
gradle/test.gradle | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 65517e9..560cb42 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -53,3 +53,8 @@ sourceSets {
resources.srcDir file('src/integrationTest/resources')
}
}
+
+test {
+ // Some tests have inner tests that should be ignored
+ exclude "**/*\$*.class"
+}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 18ce11b..4f267dc 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -102,10 +102,6 @@ subprojects {
}
test {
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.UnitTest'
- }
-
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
}
[geode] 06/46: GEODE-5363: Moves distributed tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit dc3f323e46e548e86ea010e5a72f9e475b0f563e
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 21:59:11 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
.../org/apache/geode/cache/client/internal/LocatorTestBase.java | 0
.../java/org/apache/geode/cache/query/QueryTestUtils.java | 0
.../apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java | 0
.../org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java | 0
.../java/org/apache/geode/cache30/CacheSerializableRunnable.java | 0
.../java/org/apache/geode/cache30/ClientServerTestCase.java | 0
.../org/apache/geode/internal/cache/DistributedCacheTestCase.java | 0
.../cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java | 0
.../apache/geode/internal/cache/execute/FunctionServiceBase.java | 0
.../cache/execute/FunctionServiceClientAccessorPRBase.java | 0
.../geode/internal/cache/execute/FunctionServiceClientBase.java | 0
.../internal/cache/execute/FunctionServiceClientOnServerBase.java | 0
.../internal/cache/execute/FunctionServicePeerAccessorPRBase.java | 0
.../geode/internal/cache/execute/MyTransactionFunction.java | 0
.../geode/internal/cache/execute/PRClientServerTestBase.java | 0
.../java/org/apache/geode/internal/cache/execute/data/CustId.java | 0
.../org/apache/geode/internal/cache/execute/data/Customer.java | 0
.../java/org/apache/geode/internal/cache/execute/data/Order.java | 0
.../org/apache/geode/internal/cache/execute/data/OrderId.java | 0
.../org/apache/geode/internal/cache/execute/data/Shipment.java | 0
.../org/apache/geode/internal/cache/execute/data/ShipmentId.java | 0
.../geode/internal/cache/functions/DistributedRegionFunction.java | 0
.../org/apache/geode/internal/cache/functions/TestFunction.java | 0
.../cache/partitioned/PersistentPartitionedRegionTestBase.java | 0
.../internal/cache/persistence/PersistentReplicatedTestBase.java | 0
.../geode/internal/cache/tier/sockets/CacheServerTestUtil.java | 0
.../internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java | 0
.../geode/internal/cache/versions/RegionVersionVectorTest.java | 0
.../geode/management/internal/configuration/ClusterConfig.java | 0
.../internal/configuration/SharedConfigurationTestUtils.java | 0
.../org/apache/geode/security/ClientAuthenticationTestCase.java | 0
.../org/apache/geode/security/ClientAuthenticationTestUtils.java | 0
.../org/apache/geode/security/ClientAuthorizationTestCase.java | 0
.../java/org/apache/geode/security/SecurityTestUtils.java | 0
.../geode/security/generator/LdapUserCredentialGenerator.java | 0
.../java/org/apache/geode/security/query/QuerySecurityBase.java | 0
.../java/org/apache/geode/test/junit/rules/GfshCommandRule.java | 0
.../org/apache/geode/test/junit/rules/LocatorStarterRule.java | 0
.../java/org/apache/geode/test/junit/rules/MemberStarterRule.java | 0
.../java/org/apache/geode/test/junit/rules/ServerStarterRule.java | 0
.../java/org/apache/geode/test/junit/rules/VMProvider.java | 0
.../java/org/apache/geode/internal/DataSerializableJUnitTest.java | 8 +-------
42 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Customer.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Customer.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Order.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Order.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Shipment.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Shipment.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/TestFunction.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/TestFunction.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfig.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityTestUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/SecurityTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityBase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/MemberStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/ServerStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/VMProvider.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/VMProvider.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/VMProvider.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/VMProvider.java
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 3b893a2..b3b24af 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,13 +14,6 @@
*/
package org.apache.geode.internal;
-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;
import java.io.DataInput;
@@ -56,6 +49,7 @@ import java.util.UUID;
import java.util.Vector;
import java.util.concurrent.TimeUnit;
+import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
[geode] 10/46: GEODE-5363: Moves pulse tests into new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9a02153bb89edc18199f4e1ef878eac9fb0dcd88
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 21:37:52 2018 -0700
GEODE-5363: Moves pulse tests into new source sets.
---
geode-core/build.gradle | 6 -----
geode-pulse/build.gradle | 26 ++++++++++++++++++++++
.../controllers/PulseControllerJUnitTest.java | 0
.../tools/pulse/tests/junit/BaseServiceTest.java | 0
.../junit/ClusterSelectedRegionServiceTest.java | 0
.../ClusterSelectedRegionsMemberServiceTest.java | 0
.../tests/junit/MemberGatewayHubServiceTest.java | 0
.../pulse/tests/ui/PulseAnonymousUserTest.java | 0
.../geode/tools/pulse/tests/ui/PulseAuthTest.java | 0
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 0
.../tools/pulse/tests/ui/PulseNoAuthTest.java | 0
11 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 4314da7..499611d 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -287,9 +287,3 @@ dependencies {
tasks.eclipse.dependsOn(generateGrammarSource)
-task integrationTestx(type: Test) {
- useJUnit()
- testClassesDirs = sourceSets.integrationTest.output.classesDirs
- classpath = sourceSets.integrationTest.runtimeClasspath
-}
-
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 21e8df2..605aab7 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -18,6 +18,32 @@ import org.apache.geode.gradle.TestPropertiesWriter
*/
apply plugin: 'war'
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ uiTestCompile.extendsFrom testCompile
+ uiTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ uiTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/uiTest/java')
+ }
+ resources.srcDir file('src/uiTest/resources')
+ }
+}
+
dependencies {
compile 'org.springframework:spring-beans:' + project.'springframework.version'
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
rename to geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
similarity index 100%
rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java
[geode] 14/46: GEODE-5363: Moves geode-lucene tests into new source
sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4b41ef6de727536c55c9955d553b5bc2eef0b707
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 22:19:54 2018 -0700
GEODE-5363: Moves geode-lucene tests into new source sets.
---
geode-lucene/build.gradle | 44 ++++++++++++++++++++++
.../geode/cache/lucene/EvictionDUnitTest.java | 0
.../geode/cache/lucene/ExpirationDUnitTest.java | 0
.../lucene/LuceneClientSecurityDUnitTest.java | 0
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0
.../lucene/LuceneCommandsSecurityDUnitTest.java | 0
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 0
.../apache/geode/cache/lucene/LuceneDUnitTest.java | 0
.../cache/lucene/LuceneIndexCreationDUnitTest.java | 0
.../LuceneIndexCreationOnFixedPRDUnitTest.java | 0
.../cache/lucene/LuceneIndexDestroyDUnitTest.java | 0
.../cache/lucene/LuceneQueriesAccessorBase.java | 0
.../cache/lucene/LuceneQueriesClientDUnitTest.java | 0
.../geode/cache/lucene/LuceneQueriesDUnitTest.java | 0
.../LuceneQueriesReindexClientDUnitTest.java | 0
.../lucene/LuceneQueriesReindexDUnitTest.java | 0
...hRegionCreatedBeforeReindexClientDUnitTest.java | 0
...iesWithRegionCreatedBeforeReindexDUnitTest.java | 0
...eriesWithReindexFlagEnabledClientDUnitTest.java | 0
...ceneQueriesWithReindexFlagEnabledDUnitTest.java | 0
.../LuceneSearchWithRollingUpgradeDUnit.java | 0
...hRollingUpgradeReindexFlagEnabledDUnitTest.java | 0
.../cache/lucene/MixedObjectIndexDUnitTest.java | 0
.../geode/cache/lucene/PaginationDUnitTest.java | 0
.../geode/cache/lucene/RebalanceDUnitTest.java | 0
.../lucene/RebalanceWithRedundancyDUnitTest.java | 0
...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 0
.../LuceneClusterConfigurationDUnitTest.java | 0
...onWhereRegionCreatedBeforeReindexDUnitTest.java | 0
...ClusterConfigurationWithReindexFlagEnabled.java | 0
.../management/LuceneManagementDUnitTest.java | 0
.../cache/lucene/test/LuceneTestUtilities.java | 0
.../lucene/LuceneIndexCreationIntegrationTest.java | 0
.../LuceneIndexCreationOffHeapIntegrationTest.java | 0
...eneIndexCreationPersistenceIntegrationTest.java | 0
.../LuceneIndexMaintenanceIntegrationTest.java | 0
.../cache/lucene/LuceneQueriesIntegrationTest.java | 0
.../LuceneQueriesPersistenceIntegrationTest.java | 0
...hRegionCreatedBeforeReindexIntegrationTest.java | 0
...eriesWithReindexFlagEnabledIntegrationTest.java | 0
.../NestedObjectSeralizerIntegrationTest.java | 0
.../internal/LuceneServiceImplIntegrationTest.java | 0
.../DumpDirectoryFilesIntegrationTest.java | 0
.../repository/IndexRepositoryImplJUnitTest.java | 0
...uceneIndexXmlGeneratorIntegrationJUnitTest.java | 0
...onCreatedBeforeReindexIntegrationJUnitTest.java | 0
...WithReindexFlagEnabledIntegrationJUnitTest.java | 0
.../LuceneIndexXmlParserIntegrationJUnitTest.java | 0
.../lucene/test/LuceneFunctionSecurityTest.java | 0
.../AnalyzeLuceneSerializablesJUnitTest.java | 0
.../IndexRepositoryImplPerformanceTest.java | 0
.../repository/LuceneIndexMemoryOverheadTest.java | 2 +-
.../cache/lucene/test/LuceneTestUtilities.java | 23 -----------
53 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index f86eb5d..95c7416 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -35,10 +35,54 @@ dependencies {
testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
testCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+ performanceTestCompile.extendsFrom testCompile
+ performanceTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+ performanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/performanceTest/java')
+ }
+ resources.srcDir file('src/performanceTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
//The lucene integration tests don't have any issues that requiring forking
integrationTest.forkEvery 0
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/EvictionDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/ExpirationDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOnFixedPRDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneIndexDestroyDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesAccessorBase.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexClientDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesReindexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/MixedObjectIndexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/PaginationDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWhereRegionCreatedBeforeReindexDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationWithReindexFlagEnabled.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
rename to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/internal/management/LuceneManagementDUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
similarity index 100%
copy from geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
copy to geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesPersistenceIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/NestedObjectSeralizerIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/directory/DumpDirectoryFilesIntegrationTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWhereRegionCreatedBeforeReindexIntegrationJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlGeneratorWithReindexFlagEnabledIntegrationJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
similarity index 100%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
rename to geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java
similarity index 98%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java
rename to geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java
index 6dac9bc..4924703 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java
+++ b/geode-lucene/src/performanceTest/java/org/apache/geode/cache/lucene/internal/repository/LuceneIndexMemoryOverheadTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.repository;
-import static org.apache.geode.cache.lucene.LuceneQueriesIntegrationTest.REGION_NAME;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
import java.nio.charset.Charset;
@@ -44,6 +43,7 @@ import org.apache.geode.test.junit.categories.PerformanceTest;
@Category({PerformanceTest.class, LuceneTest.class})
@Ignore("Tests have no assertions")
public class LuceneIndexMemoryOverheadTest extends LuceneIntegrationTest {
+ private static final String REGION_NAME = "index";
private static int NUM_BATCHES = 30;
private static int NUM_ENTRIES = 10000;
private Random random = new Random(0);
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
index 6d2940b..684bed1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/test/LuceneTestUtilities.java
@@ -56,7 +56,6 @@ import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.distributed.EntryScore;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.test.dunit.VM;
public class LuceneTestUtilities {
public static final String INDEX_NAME = "index";
@@ -151,28 +150,6 @@ public class LuceneTestUtilities {
}
}
- public static Region initDataStoreForFixedPR(final Cache cache) throws Exception {
- List<FixedPartitionAttributes> fpaList = new ArrayList<FixedPartitionAttributes>();
- int vmNum = VM.getCurrentVMNum();
- if (vmNum % 2 == 0) {
- FixedPartitionAttributes fpa1 = FixedPartitionAttributes.createFixedPartition(Quarter1, true);
- FixedPartitionAttributes fpa2 =
- FixedPartitionAttributes.createFixedPartition(Quarter2, false);
- fpaList.clear();
- fpaList.add(fpa1);
- fpaList.add(fpa2);
- } else {
- FixedPartitionAttributes fpa1 =
- FixedPartitionAttributes.createFixedPartition(Quarter1, false);
- FixedPartitionAttributes fpa2 = FixedPartitionAttributes.createFixedPartition(Quarter2, true);
- fpaList.clear();
- fpaList.add(fpa1);
- fpaList.add(fpa2);
- }
-
- return createFixedPartitionedRegion(cache, REGION_NAME, fpaList, 40);
- }
-
public static Region createFixedPartitionedRegion(final Cache cache, String regionName,
List<FixedPartitionAttributes> fpaList, int localMaxMemory) {
List<String> allPartitions = new ArrayList();
[geode] 13/46: GEODE-5363: Moves geode-cq tests into new source
sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c618c3aa7a7ff8138b65ae4822986a9617359e21
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 22:05:51 2018 -0700
GEODE-5363: Moves geode-cq tests into new source sets.
---
geode-cq/build.gradle | 34 ++++++++++++++++++++++
.../geode/cache/query/cq/CQDistributedTest.java | 0
.../cache/query/cq/dunit/CqDataDUnitTest.java | 0
.../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqDataUsingPoolDUnitTest.java | 0
.../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 0
.../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 0
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 0
.../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqQueryUsingPoolDUnitTest.java | 0
.../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 0
...esultSetUsingPoolOptimizedExecuteDUnitTest.java | 0
.../dunit/CqSecurityAuthorizedUserDUnitTest.java | 0
...SecurityPartitionedAuthorizedUserDUnitTest.java | 0
...curityPartitionedUnauthorizedUserDUnitTest.java | 0
.../dunit/CqSecurityUnauthorizedUserDUnitTest.java | 0
.../cache/query/cq/dunit/CqStateDUnitTest.java | 0
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 0
.../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 0
.../CqStatsUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cache/query/cq/dunit/CqTimeTestListener.java | 0
.../dunit/PartitionedRegionCqQueryDUnitTest.java | 0
...onedRegionCqQueryOptimizedExecuteDUnitTest.java | 0
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 0
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 0
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 0
.../cache/query/dunit/PdxQueryCQTestBase.java | 0
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 0
.../cache/query/dunit/QueryMonitorDUnitTest.java | 0
.../cache/snapshot/ClientSnapshotDUnitTest.java | 0
.../cache/PRDeltaPropagationDUnitTest.java | 0
.../geode/internal/cache/PutAllCSDUnitTest.java | 0
.../cache/RemoteCQTransactionDUnitTest.java | 0
.../internal/cache/ha/CQListGIIDUnitTest.java | 0
.../internal/cache/ha/HADispatcherDUnitTest.java | 0
.../tier/sockets/ClientServerMiscBCDUnitTest.java | 0
.../tier/sockets/ClientToServerDeltaDUnitTest.java | 0
.../sockets/DeltaPropagationWithCQDUnitTest.java | 0
...ltaToRegionRelationCQRegistrationDUnitTest.java | 0
.../tier/sockets/DurableClientCrashDUnitTest.java | 0
.../sockets/DurableClientNetDownDUnitTest.java | 0
.../tier/sockets/DurableClientSimpleDUnitTest.java | 0
.../cache/tier/sockets/DurableClientTestCase.java | 0
.../management/CacheServerManagementDUnitTest.java | 0
.../cli/commands/ClientCommandsTestUtils.java | 0
.../commands/DescribeClientCommandDUnitTest.java | 0
.../commands/DurableClientCommandsDUnitTest.java | 0
.../cli/commands/ListClientCommandDUnitTest.java | 0
.../management/internal/pulse/TestCQDUnitTest.java | 0
.../internal/pulse/TestClientsDUnitTest.java | 0
.../internal/pulse/TestServerDUnitTest.java | 0
.../security/CQPDXPostProcessorDUnitTest.java | 0
.../geode/security/CQPostProcessorDunitTest.java | 0
.../security/ClientAuthorizationCQDUnitTest.java | 0
.../security/ClientAuthzObjectModDUnitTest.java | 0
.../geode/security/ClientCQAuthDUnitTest.java | 0
.../ClientCQPostAuthorizationDUnitTest.java | 0
.../security/ClientPostAuthorizationDUnitTest.java | 0
.../geode/security/ClientQueryAuthDUnitTest.java | 0
.../geode/security/MultiUserAPIDUnitTest.java | 0
.../security/MultiUserDurableCQAuthzDUnitTest.java | 0
.../apache/geode/cache/query/cq/CQJUnitTest.java | 0
.../AnalyzeCQSerializablesJUnitTest.java | 0
66 files changed, 34 insertions(+)
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index c5e4c02..2c48067 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -19,7 +19,41 @@ dependencies {
compileOnly project(':geode-core')
testCompile project(':geode-core')
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
testCompile project(':geode-junit')
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/CQDistributedTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQDistributedTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/CQDistributedTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityAuthorizedUserDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityAuthorizedUserDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityAuthorizedUserDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityAuthorizedUserDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedAuthorizedUserDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedAuthorizedUserDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedAuthorizedUserDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedAuthorizedUserDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedUnauthorizedUserDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedUnauthorizedUserDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedUnauthorizedUserDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityPartitionedUnauthorizedUserDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityUnauthorizedUserDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityUnauthorizedUserDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqSecurityUnauthorizedUserDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqSecurityUnauthorizedUserDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqTimeTestListener.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/CacheServerManagementDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClientCommandsTestUtils.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommandDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListClientCommandDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/CQPostProcessorDunitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/CQPostProcessorDunitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientCQAuthDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/ClientQueryAuthDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/MultiUserAPIDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
rename to geode-cq/src/distributedTest/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java b/geode-cq/src/integrationTest/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
rename to geode-cq/src/integrationTest/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
diff --git a/geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/geode-cq/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
similarity index 100%
rename from geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
rename to geode-cq/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
[geode] 44/46: GEODE-5363: Remove category filter.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bd5cedab7b8d368d528c779b80ba329488b43a40
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 08:12:44 2018 -0700
GEODE-5363: Remove category filter.
---
gradle/test.gradle | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 61459ee..7f91df9 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -145,16 +145,12 @@ subprojects {
testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
classpath = sourceSets.acceptanceTest.runtimeClasspath
-
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
- }
-
forkEvery 1
outputs.upToDateWhen{false}
}
+
task flakyTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
[geode] 22/46: GEODE-5363: Moves geode-rebalancer tests into new
source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c3a8ec6d2214c7a195a1b89b354f47a11c0720c8
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:18:05 2018 -0700
GEODE-5363: Moves geode-rebalancer tests into new source sets.
---
geode-rebalancer/build.gradle | 21 +++++++++++++++++++++
.../util/AutoBalancerIntegrationJUnitTest.java | 0
.../geode/cache/util/AutoBalancerJUnitTest.java | 0
3 files changed, 21 insertions(+)
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index e61f06d..a99ac89 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -28,3 +28,24 @@ dependencies {
}
testCompile project(':geode-junit')
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
similarity index 100%
rename from geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
rename to geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerIntegrationJUnitTest.java
diff --git a/geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java b/geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
similarity index 100%
rename from geode-rebalancer/src/test/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
rename to geode-rebalancer/src/integrationTest/java/org/apache/geode/cache/util/AutoBalancerJUnitTest.java
[geode] 03/46: GEODE-5363: Creates distributed test source set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e1fa87ed1809f58eff7752a05704e6675b0caf5c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 20:13:59 2018 -0700
GEODE-5363: Creates distributed test source set.
---
geode-core/build.gradle | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index f8a0c5d..97e983e 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -33,6 +33,8 @@ configurations {
archives
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom integrationTestCompile
+ distributedTestRuntime.extendsFrom integrationTestRuntime
}
dependencies {
@@ -187,6 +189,14 @@ sourceSets {
}
resources.srcDir file('src/integrationTest/resources')
}
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
}
jmh {
[geode] 41/46: GEODE-5363: Run acceptanceTest from new source set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2cd9583c46e813b9fecce058f932c0831e4bc68b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 07:35:43 2018 -0700
GEODE-5363: Run acceptanceTest from new source set.
---
gradle/test.gradle | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 20a4d1c..7ec5ced 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -101,6 +101,15 @@ subprojects {
}
resources.srcDir file('src/distributedTest/resources')
}
+
+ acceptanceTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/acceptanceTest/java')
+ }
+ resources.srcDir file('src/acceptanceTest/resources')
+ }
}
task integrationTest(type:Test) {
@@ -142,6 +151,25 @@ subprojects {
outputs.upToDateWhen{false}
}
+ task acceptanceTest(type:Test) {
+ testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
+ classpath = sourceSets.acceptanceTest.runtimeClasspath
+
+
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
+ }
+
+ forkEvery 1
+
+ if (project.hasProperty('maxParallelForks'))
+ maxParallelForks = project.maxParallelForks as int
+ if (project.hasProperty('forkEvery'))
+ forkEvery = project.forkEvery as int
+
+ outputs.upToDateWhen{false}
+ }
+
task flakyTest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
@@ -352,14 +380,6 @@ subprojects {
forkEvery 30
}
- task acceptanceTest(type:Test) {
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
- }
- forkEvery 1
- outputs.upToDateWhen{false}
- }
-
// apply common test configuration
gradle.taskGraph.whenReady( { graph ->
tasks.withType(Test).each { test ->
[geode] 12/46: GEODE-5363: Moves geode-wan tests into new source
sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a21d027ee351fdfb32a1a1b899b664fe9a7c7a8e
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 21:58:49 2018 -0700
GEODE-5363: Moves geode-wan tests into new source sets.
---
geode-wan/build.gradle | 34 ++++++++++++++++++++++
.../geode/cache/CacheXml70GatewayDUnitTest.java | 0
.../geode/cache/CacheXml80GatewayDUnitTest.java | 0
...tewayReceiverAutoConnectionSourceDUnitTest.java | 0
.../cache/wan/WANRollingUpgradeDUnitTest.java | 0
.../internal/cache/UpdateVersionDUnitTest.java | 0
...ueueOverflowMBeanAttributesDistributedTest.java | 0
.../cache/wan/CacheClientNotifierDUnitTest.java | 0
.../GatewayLegacyAuthenticationRegressionTest.java | 0
.../cache/wan/GatewayReceiverMBeanDUnitTest.java | 0
...nderOverflowMBeanAttributesDistributedTest.java | 0
.../cache/wan/Simple2CacheServerDUnitTest.java | 0
.../geode/internal/cache/wan/WANTestBase.java | 0
.../ConcurrentParallelGatewaySenderDUnitTest.java | 0
...rrentParallelGatewaySenderOffHeapDUnitTest.java | 0
...ParallelGatewaySenderOperation_1_DUnitTest.java | 0
...ParallelGatewaySenderOperation_2_DUnitTest.java | 0
...rentSerialGatewaySenderOperationsDUnitTest.java | 0
...ialGatewaySenderOperationsOffHeapDUnitTest.java | 0
.../ConcurrentWANPropagation_1_DUnitTest.java | 0
.../ConcurrentWANPropagation_2_DUnitTest.java | 0
.../cache/wan/disttx/DistTXWANDUnitTest.java | 0
.../misc/CommonParallelGatewaySenderDUnitTest.java | 0
...ommonParallelGatewaySenderOffHeapDUnitTest.java | 0
.../KeepEventsOnGatewaySenderQueueDUnitTest.java | 0
.../NewWANConcurrencyCheckForDestroyDUnitTest.java | 0
.../wan/misc/NewWanAuthenticationDUnitTest.java | 0
.../cache/wan/misc/PDXNewWanDUnitTest.java | 0
...atedRegion_ParallelWANPersistenceDUnitTest.java | 0
...atedRegion_ParallelWANPropagationDUnitTest.java | 0
.../misc/SenderWithTransportFilterDUnitTest.java | 0
...hutdownAllPersistentGatewaySenderDUnitTest.java | 0
.../cache/wan/misc/WANLocatorServerDUnitTest.java | 0
.../internal/cache/wan/misc/WANSSLDUnitTest.java | 0
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 0
.../cache/wan/misc/WanValidationsDUnitTest.java | 0
...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 0
...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 0
...lelGatewaySenderOperationsOffHeapDUnitTest.java | 0
...GatewaySenderQueueOverflowOffHeapDUnitTest.java | 0
.../ParallelWANConflationOffHeapDUnitTest.java | 0
...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 0
...ANPropagationConcurrentOpsOffHeapDUnitTest.java | 0
.../ParallelWANPropagationOffHeapDUnitTest.java | 0
.../SerialGatewaySenderQueueOffHeapDUnitTest.java | 0
...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 0
.../SerialWANPropagationOffHeapDUnitTest.java | 0
...pagation_PartitionedRegionOffHeapDUnitTest.java | 0
...ParallelGatewaySenderOperation_2_DUnitTest.java | 0
.../ParallelGatewaySenderOperationsDUnitTest.java | 0
...arallelGatewaySenderQueueOverflowDUnitTest.java | 0
.../parallel/ParallelWANConflationDUnitTest.java | 0
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 0
...arallelWANPropagationClientServerDUnitTest.java | 0
...rallelWANPropagationConcurrentOpsDUnitTest.java | 0
.../parallel/ParallelWANPropagationDUnitTest.java | 0
.../ParallelWANPropagationLoopBackDUnitTest.java | 0
.../wan/parallel/ParallelWANStatsDUnitTest.java | 0
.../cache/wan/serial/GatewayReceiverDUnitTest.java | 0
...lGatewaySenderDistributedDeadlockDUnitTest.java | 0
.../SerialGatewaySenderEventListenerDUnitTest.java | 0
.../SerialGatewaySenderOperationsDUnitTest.java | 0
.../serial/SerialGatewaySenderQueueDUnitTest.java | 0
.../wan/serial/SerialWANConflationDUnitTest.java | 0
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 0
.../wan/serial/SerialWANPropagationDUnitTest.java | 0
.../SerialWANPropagationLoopBackDUnitTest.java | 0
...lWANPropagation_PartitionedRegionDUnitTest.java | 0
.../SerialWANPropagationsFeatureDUnitTest.java | 0
.../cache/wan/serial/SerialWANStatsDUnitTest.java | 0
...CreateDestroyGatewaySenderCommandDUnitTest.java | 0
.../CreateGatewayReceiverCommandDUnitTest.java | 0
.../DestroyGatewayReceiverCommandDUnitTest.java | 0
.../DestroyGatewaySenderCommandDUnitTest.java | 0
.../PauseGatewaySenderCommandDUnitTest.java | 0
.../ResumeGatewaySenderCommandDUnitTest.java | 0
.../StartGatewayReceiverCommandDUnitTest.java | 0
.../StartGatewaySenderCommandDUnitTest.java | 0
.../StatusGatewayReceiverCommandDUnitTest.java | 0
.../StatusGatewaySenderCommandDUnitTest.java | 0
.../StopGatewayReceiverCommandDUnitTest.java | 0
.../StopGatewaySenderCommandDUnitTest.java | 0
.../cache/wan/wancommand/WANCommandUtils.java | 0
.../wan/wancommand/WanCommandListDUnitTest.java | 0
.../geode/management/WANManagementDUnitTest.java | 0
.../cli/commands/CreateRegionCommandDUnitTest.java | 0
.../cli/commands/DescribeRegionDUnitTest.java | 0
...rConfigurationIndexWithFromClauseDUnitTest.java | 0
.../WANClusterConfigurationDUnitTest.java | 0
.../AnalyzeWANSerializablesJUnitTest.java | 0
.../cache/wan/misc/WANConfigurationJUnitTest.java | 0
91 files changed, 34 insertions(+)
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index ce46d27..1bfef94 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -19,7 +19,41 @@ dependencies {
compileOnly project(':geode-core')
testCompile project(':geode-core')
+ // TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile project(':geode-junit')
testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueOverflowMBeanAttributesDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueOverflowMBeanAttributesDistributedTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueOverflowMBeanAttributesDistributedTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueOverflowMBeanAttributesDistributedTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderOverflowMBeanAttributesDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewaySenderOverflowMBeanAttributesDistributedTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderOverflowMBeanAttributesDistributedTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/GatewaySenderOverflowMBeanAttributesDistributedTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WANCommandUtils.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/management/WANManagementDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/management/WANManagementDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
rename to geode-wan/src/distributedTest/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/geode-wan/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
rename to geode-wan/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
similarity index 100%
rename from geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
rename to geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
[geode] 36/46: GEODE-5363: Fixes tomcat tests.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 93684393d286e8174dda6793a798d5252e352a4e
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 17:28:37 2018 -0700
GEODE-5363: Fixes tomcat tests.
---
.../src/{test => integrationTest}/resources/tomcat/conf/tomcat-users.xml | 0
.../tomcat/temp => integrationTest/resources/tomcat/logs}/.gitkeep | 0
.../tomcat/logs => integrationTest/resources/tomcat/temp}/.gitkeep | 0
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/extensions/geode-modules/src/test/resources/tomcat/conf/tomcat-users.xml b/extensions/geode-modules/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from extensions/geode-modules/src/test/resources/tomcat/conf/tomcat-users.xml
rename to extensions/geode-modules/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
diff --git a/extensions/geode-modules/src/test/resources/tomcat/temp/.gitkeep b/extensions/geode-modules/src/integrationTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from extensions/geode-modules/src/test/resources/tomcat/temp/.gitkeep
rename to extensions/geode-modules/src/integrationTest/resources/tomcat/logs/.gitkeep
diff --git a/extensions/geode-modules/src/test/resources/tomcat/logs/.gitkeep b/extensions/geode-modules/src/integrationTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from extensions/geode-modules/src/test/resources/tomcat/logs/.gitkeep
rename to extensions/geode-modules/src/integrationTest/resources/tomcat/temp/.gitkeep
[geode] 31/46: GEODE-5363: Move codeAnalysis resources to
integrationTest
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 352d4abec3dab7d0c4d0e1f9199e304e9a2a1876
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 15:20:01 2018 -0700
GEODE-5363: Move codeAnalysis resources to integrationTest
---
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../integrationTest}/resources/org/apache/geode/codeAnalysis/openBugs.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../integrationTest}/resources/org/apache/geode/codeAnalysis/openBugs.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
.../resources/org/apache/geode/codeAnalysis/excludedClasses.txt | 0
.../resources/org/apache/geode/codeAnalysis/openBugs.txt | 0
.../org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt | 0
17 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
similarity index 100%
rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
similarity index 100%
rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
rename to geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-cq/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
similarity index 100%
rename from geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
rename to geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-lucene/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-cq/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
similarity index 100%
rename from geode-cq/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
rename to geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-wan/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
diff --git a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
similarity index 100%
rename from geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
rename to geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
diff --git a/geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt b/geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
similarity index 100%
rename from geode-web-api/src/test/resources/org/apache/geode/codeAnalysis/openBugs.txt
rename to geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/openBugs.txt
diff --git a/geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
similarity index 100%
rename from geode-connectors/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
rename to geode-web-api/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
[geode] 05/46: GEODE-5363: Moves distributed tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit fd8e66e84a2b8884854a37989e714106a9324001
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 21:26:37 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
.../java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java | 0
.../java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java | 0
.../java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java | 0
.../java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java | 0
.../org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java | 0
.../java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java | 0
.../java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java | 0
.../java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java | 0
.../org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java | 0
.../java/org/apache/geode/cache/query/dunit/QueryAuthorization.java | 0
.../org/apache/geode/distributed/AbstractLauncherServiceStateTest.java | 0
.../java/org/apache/geode/distributed/AbstractLauncherTest.java | 0
.../java/org/apache/geode/distributed/AuthInitializer.java | 0
.../java/org/apache/geode/distributed/DistributedLockBlackboard.java | 0
.../java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java | 0
.../java/org/apache/geode/distributed/DistributedSystemConnectPerf.java | 0
.../java/org/apache/geode/distributed/DistributedSystemJUnitTest.java | 0
.../java/org/apache/geode/distributed/LauncherIntegrationTestCase.java | 0
.../java/org/apache/geode/distributed/LocatorCommand.java | 0
.../java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java | 0
.../org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java | 0
.../geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java | 0
.../java/org/apache/geode/distributed/LocatorLauncherTest.java | 0
.../java/org/apache/geode/distributed/LocatorStateTest.java | 0
.../java/org/apache/geode/distributed/MyAuthenticator.java | 0
.../java/org/apache/geode/distributed/MyPrincipal.java | 0
.../java/org/apache/geode/distributed/ServerCommand.java | 0
.../java/org/apache/geode/distributed/ServerLauncherBuilderTest.java | 0
.../java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java | 0
.../org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java | 0
.../apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java | 0
.../apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java | 0
.../java/org/apache/geode/distributed/ServerLauncherTest.java | 0
.../java/org/apache/geode/distributed/ServerLauncherUtils.java | 0
.../geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java | 0
.../org/apache/geode/distributed/TestServerLauncherCacheProvider.java | 0
.../java/org/apache/geode/distributed/UsesLocatorCommand.java | 0
.../java/org/apache/geode/distributed/UsesServerCommand.java | 0
.../geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java | 0
.../apache/geode/distributed/internal/ClusterDistributionManagerTest.java | 0
.../java/org/apache/geode/distributed/internal/DateMessage.java | 0
.../org/apache/geode/distributed/internal/DistributionAdvisorTest.java | 0
.../apache/geode/distributed/internal/DistributionConfigJUnitTest.java | 0
.../org/apache/geode/distributed/internal/DistributionMessageTest.java | 0
.../distributed/internal/InternalConfigurationPersistenceServiceTest.java | 0
.../java/org/apache/geode/distributed/internal/LDM.java | 0
.../apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java | 0
.../java/org/apache/geode/distributed/internal/ProduceDateMessages.java | 0
.../org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java | 0
.../java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java | 0
.../org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java | 0
.../apache/geode/distributed/internal/StartupMessageDataJUnitTest.java | 0
.../apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java | 0
.../geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java | 0
.../geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java | 0
.../org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java | 0
.../distributed/internal/locks/DLockServiceCharacterizationTests.java | 0
.../geode/distributed/internal/membership/InternalRoleJUnitTest.java | 0
.../apache/geode/distributed/internal/membership/NetViewJUnitTest.java | 0
.../geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java | 0
.../distributed/internal/membership/gms/MembershipManagerHelper.java | 0
.../internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java | 0
.../membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java | 0
.../membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java | 0
.../internal/membership/gms/membership/GMSJoinLeaveTestHelper.java | 0
.../internal/membership/gms/membership/StatRecorderJUnitTest.java | 0
.../geode/distributed/internal/membership/gms/messenger/InterceptUDP.java | 0
.../java/org/apache/geode/test/dunit/Assert.java | 0
.../java/org/apache/geode/test/dunit/AsyncInvocation.java | 0
.../java/org/apache/geode/test/dunit/DUnitBlackboard.java | 0
.../java/org/apache/geode/test/dunit/DUnitEnv.java | 0
.../java/org/apache/geode/test/dunit/Disconnect.java | 0
.../java/org/apache/geode/test/dunit/DistributedTestUtils.java | 0
.../{test => distributedTest}/java/org/apache/geode/test/dunit/Host.java | 0
.../java/org/apache/geode/test/dunit/IgnoredException.java | 0
.../java/org/apache/geode/test/dunit/Invoke.java | 0
.../java/org/apache/geode/test/dunit/Jitter.java | 0
.../java/org/apache/geode/test/dunit/LocalVM.java | 0
.../java/org/apache/geode/test/dunit/LogWriterUtils.java | 0
.../java/org/apache/geode/test/dunit/NamedCallable.java | 0
.../java/org/apache/geode/test/dunit/NamedRunnable.java | 0
.../java/org/apache/geode/test/dunit/NetworkUtils.java | 0
.../java/org/apache/geode/test/dunit/RMIException.java | 0
.../java/org/apache/geode/test/dunit/RepeatableRunnable.java | 0
.../java/org/apache/geode/test/dunit/SerializableCallable.java | 0
.../java/org/apache/geode/test/dunit/SerializableCallableIF.java | 0
.../java/org/apache/geode/test/dunit/SerializableConsumerIF.java | 0
.../java/org/apache/geode/test/dunit/SerializableRunnable.java | 0
.../java/org/apache/geode/test/dunit/SerializableRunnableIF.java | 0
.../java/org/apache/geode/test/dunit/StoppableWaitCriterion.java | 0
.../java/org/apache/geode/test/dunit/ThreadUtils.java | 0
.../{test => distributedTest}/java/org/apache/geode/test/dunit/VM.java | 0
.../{test => distributedTest}/java/org/apache/geode/test/dunit/Wait.java | 0
.../java/org/apache/geode/test/dunit/WaitCriterion.java | 0
.../java/org/apache/geode/test/dunit/cache/CacheTestCase.java | 0
.../java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java | 0
.../org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java | 0
.../java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java | 0
.../java/org/apache/geode/test/dunit/internal/InternalBlackboard.java | 0
.../java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java | 0
.../org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java | 0
.../org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java | 0
.../java/org/apache/geode/test/dunit/rules/CacheRule.java | 0
.../java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java | 0
.../java/org/apache/geode/test/dunit/rules/ClientCacheRule.java | 0
.../java/org/apache/geode/test/dunit/rules/ClientVM.java | 0
.../java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java | 0
.../java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java | 0
.../org/apache/geode/test/dunit/rules/DistributedExternalResource.java | 0
.../apache/geode/test/dunit/rules/DistributedRestoreSystemProperties.java | 0
.../java/org/apache/geode/test/dunit/rules/DistributedTestRule.java | 0
.../geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java | 0
.../java/org/apache/geode/test/dunit/rules/MemberVM.java | 0
.../java/org/apache/geode/test/dunit/rules/RemoteInvoker.java | 0
.../java/org/apache/geode/test/dunit/rules/SharedCountersRule.java | 0
.../java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java | 0
.../org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java | 0
.../java/org/apache/geode/test/dunit/standalone/BounceResult.java | 0
.../java/org/apache/geode/test/dunit/standalone/ChildVM.java | 0
.../java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java | 0
.../java/org/apache/geode/test/dunit/standalone/ProcessManager.java | 0
.../java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java | 0
.../java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java | 0
.../java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java | 0
124 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CloseCacheAuthorization.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByDUnitImpl.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PDXQueryTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PortfolioPdxVersion.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PositionPdxVersion.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryAPITestPartitionResolver.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryAuthorization.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherServiceStateTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/AbstractLauncherTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AuthInitializer.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/AuthInitializer.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/AuthInitializer.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/AuthInitializer.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboard.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockBlackboard.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboard.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockBlackboard.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockBlackboardImpl.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemConnectPerf.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemConnectPerf.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemConnectPerf.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemConnectPerf.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorCommand.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorCommand.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherBuilderTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorStateTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorStateTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/MyAuthenticator.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/MyAuthenticator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/MyAuthenticator.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/MyAuthenticator.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/MyPrincipal.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/MyPrincipal.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/MyPrincipal.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/MyPrincipal.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerCommand.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerCommand.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherBuilderTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTestHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherWaitOnServerMultiThreadedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/UsesLocatorCommand.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/UsesLocatorCommand.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/UsesServerCommand.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/UsesServerCommand.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DateMessage.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionMessageTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LDM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LDM.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProduceDateMessages.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ReplyProcessor21Test.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/locks/DLockServiceCharacterizationTests.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/InternalRoleJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/AbstractGMSAuthenticatorTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/AsyncInvocation.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/AsyncInvocation.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/DUnitBlackboard.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/DUnitEnv.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Disconnect.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Disconnect.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Host.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Host.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/IgnoredException.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Invoke.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/LocalVM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LocalVM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/LocalVM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LocalVM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/LogWriterUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/NamedCallable.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/NamedCallable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/NamedRunnable.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/NamedRunnable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NetworkUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/NetworkUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NetworkUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/RMIException.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/RMIException.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/RepeatableRunnable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallableIF.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/SerializableCallableIF.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableConsumerIF.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableConsumerIF.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/SerializableConsumerIF.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableConsumerIF.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableRunnable.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/SerializableRunnable.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableRunnableIF.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/VM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/VM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/Wait.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/WaitCriterion.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/CacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/CacheTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/cache/CacheTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/CacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CacheRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/CacheRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/CacheRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/CacheRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClientCacheRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClientCacheRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClientCacheRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClientCacheRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClientVM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClientVM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClientVM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClientVM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/ClusterStartupRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedRestoreSystemProperties.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedRestoreSystemProperties.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedRestoreSystemProperties.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedRestoreSystemProperties.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/MemberVM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/MemberVM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/MemberVM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedCountersRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/SharedCountersRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedCountersRule.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/SharedCountersRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/BounceResult.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/BounceResult.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
[geode] 21/46: GEODE-5363: Moves geode-web tests into new source
sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ad28899f9c7cac0a67ca46610640b2fa9bc25ddb
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:15:58 2018 -0700
GEODE-5363: Moves geode-web tests into new source sets.
---
geode-web/build.gradle | 35 ++++++++++++++++++++++
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 0
.../commands/ClusterConfigurationDUnitTest.java | 0
.../cli/commands/CommandOverHttpDUnitTest.java | 0
.../cli/commands/ConnectCommandWithSSLTest.java | 0
.../commands/DescribeConfigCommandDUnitTest.java | 0
...xecuteFunctionCommandWithSecurityDUnitTest.java | 0
.../cli/commands/ExportConfigCommandDUnitTest.java | 0
.../commands/ExportLogsStatsOverHttpDUnitTest.java | 0
.../FunctionCommandsOverHttpDUnitTest.java | 0
.../ListIndexCommandOverHttpDUnitTest.java | 0
.../RebalanceCommandOverHttpDistributedTest.java | 0
.../commands/ShutdownCommandOverHttpDUnitTest.java | 0
.../internal/cli/commands/CommandOverHttpTest.java | 0
.../commands/ConnectCommandIntegrationTest.java | 0
.../commands/ConnectCommandWithSecurityTest.java | 0
.../ExportLogsOverHttpIntegrationTest.java | 0
.../cli/commands/IndexCommandOverHttpTest.java | 0
.../cli/commands/QueryCommandOverHttpTest.java | 0
.../security/GfshCommandsOverHttpSecurityTest.java | 0
.../internal/security/LogNoPasswordTest.java | 0
.../HttpOperationInvokerMBeanOperationTest.java | 0
.../shell/HttpOperationInvokerSecurityTest.java | 0
23 files changed, 35 insertions(+)
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 736fd00..d931535 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -78,6 +78,40 @@ idea.module.iml {
}
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+ integrationTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
distributedTest {
dependsOn war
}
@@ -92,3 +126,4 @@ war {
classpath configurations.runtime
classpath project(':geode-core').webJar.archivePath
}
+
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
rename to geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
similarity index 100%
rename from geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
rename to geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
[geode] 46/46: GEODE-5363: Rebase cleanup
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit a01271b385296bad642f54e751371333aaf62fc5
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Jul 11 09:12:46 2018 -0700
GEODE-5363: Rebase cleanup
---
.../cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java | 3 +--
.../cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
similarity index 99%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
index 2e2dca2..974e5ea 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
+++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsIntegrationTest.java
@@ -58,13 +58,12 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.assertions.CommandResultAssert;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LuceneTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.ServerStarterRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-@Category({IntegrationTest.class, LuceneTest.class})
+@Category(LuceneTest.class)
@RunWith(JUnitParamsRunner.class)
@SuppressWarnings("serial")
public class LuceneIndexCommandsIntegrationTest {
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
similarity index 99%
rename from geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
rename to geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
index 2b3a703..764c9b9 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
+++ b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsWithReindexAllowedIntegrationTest.java
@@ -39,10 +39,9 @@ import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
import org.apache.geode.cache.lucene.internal.repository.serializer.PrimitiveSerializer;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.LuceneTest;
-@Category({IntegrationTest.class, LuceneTest.class})
+@Category(LuceneTest.class)
public class LuceneIndexCommandsWithReindexAllowedIntegrationTest
extends LuceneIndexCommandsIntegrationTest {
[geode] 08/46: GEODE-5363: Moves distributed tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2b6d2563088382230e2a2980950b7d432a7e254d
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 2 16:07:31 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
geode-core/build.gradle | 12 ++--
.../cache/query/dunit/QueryUsingPoolDUnitTest.java | 72 --------------------
.../index/IndexTrackingQueryObserverDUnitTest.java | 50 +-------------
.../cache/CustomerIDPartitionResolver.java | 76 ++++++++++++++++++++++
.../java/hydra/MethExecutor.java | 0
.../java/hydra/MethExecutorResult.java | 0
.../java/hydra/SchedulingOrder.java | 0
.../apache/geode/cache/query/QueryTestUtils.java | 0
.../apache/geode/cache/query/dunit/TestObject.java | 76 ++++++++++++++++++++++
.../functional/OrderByPartitionedJUnitTest.java | 2 +-
.../index/IndexTrackingQueryObserverJUnitTest.java | 1 -
.../internal/index/IndexTrackingTestHook.java | 63 ++++++++++++++++++
.../geode/cache30/CacheSerializableRunnable.java | 0
.../apache/geode/cache30/ClientServerTestCase.java | 0
.../geode/cache30/GlobalLockingDUnitTest.java | 0
.../geode/cache30/MultiVMRegionTestCase.java | 0
.../org/apache/geode/cache30/RegionTestCase.java | 0
.../apache/geode/cache30/TestCacheCallback.java | 0
.../apache/geode/cache30/TestCacheListener.java | 0
.../org/apache/geode/cache30/TestCacheLoader.java | 0
.../org/apache/geode/cache30/TestCacheWriter.java | 0
.../distributed/LauncherIntegrationTestCase.java | 0
.../apache/geode/distributed/LocatorCommand.java | 0
.../LocatorLauncherIntegrationTestCase.java | 0
.../LocatorLauncherRemoteIntegrationTestCase.java | 0
.../apache/geode/distributed/ServerCommand.java | 0
.../ServerLauncherIntegrationTestCase.java | 0
.../ServerLauncherLocalIntegrationTestCase.java | 0
.../ServerLauncherRemoteIntegrationTestCase.java | 0
.../TestServerLauncherCacheProvider.java | 0
.../geode/distributed/UsesLocatorCommand.java | 0
.../geode/distributed/UsesServerCommand.java | 0
.../membership/gms/MembershipManagerHelper.java | 0
.../gms/membership/GMSJoinLeaveTestHelper.java | 0
.../membership/gms/messenger/InterceptUDP.java | 0
.../cache/tier/sockets/CacheServerTestUtil.java | 0
.../geode/internal/offheap/OffHeapRegionBase.java | 0
.../java/org/apache/geode/test/dunit/Assert.java | 0
.../apache/geode/test/dunit/AsyncInvocation.java | 0
.../apache/geode/test/dunit/DUnitBlackboard.java | 0
.../java/org/apache/geode/test/dunit/DUnitEnv.java | 0
.../org/apache/geode/test/dunit/Disconnect.java | 0
.../geode/test/dunit/DistributedTestUtils.java | 0
.../java/org/apache/geode/test/dunit/Host.java | 0
.../apache/geode/test/dunit/IgnoredException.java | 0
.../java/org/apache/geode/test/dunit/Invoke.java | 0
.../java/org/apache/geode/test/dunit/Jitter.java | 0
.../apache/geode/test/dunit/LogWriterUtils.java | 0
.../org/apache/geode/test/dunit/NamedCallable.java | 0
.../org/apache/geode/test/dunit/NamedRunnable.java | 0
.../org/apache/geode/test/dunit/RMIException.java | 0
.../geode/test/dunit/RepeatableRunnable.java | 0
.../geode/test/dunit/SerializableCallable.java | 0
.../geode/test/dunit/SerializableCallableIF.java | 0
.../geode/test/dunit/SerializableRunnable.java | 0
.../geode/test/dunit/SerializableRunnableIF.java | 0
.../geode/test/dunit/StoppableWaitCriterion.java | 0
.../org/apache/geode/test/dunit/ThreadUtils.java | 0
.../java/org/apache/geode/test/dunit/VM.java | 0
.../java/org/apache/geode/test/dunit/Wait.java | 0
.../org/apache/geode/test/dunit/WaitCriterion.java | 0
.../dunit/cache/internal/CacheTestFixture.java | 0
.../dunit/cache/internal/JUnit4CacheTestCase.java | 0
.../dunit/internal/DistributedTestFixture.java | 0
.../test/dunit/internal/InternalBlackboard.java | 0
.../dunit/internal/InternalBlackboardImpl.java | 0
.../dunit/internal/JUnit4DistributedTestCase.java | 0
.../dunit/rules/AbstractDistributedTestRule.java | 0
.../test/dunit/rules/DistributedTestRule.java | 0
.../geode/test/dunit/rules/RemoteInvoker.java | 0
.../geode/test/dunit/standalone/BounceResult.java | 0
.../geode/test/dunit/standalone/ChildVM.java | 0
.../geode/test/dunit/standalone/DUnitLauncher.java | 0
.../test/dunit/standalone/ProcessManager.java | 0
.../geode/test/dunit/standalone/RemoteDUnitVM.java | 0
.../test/dunit/standalone/RemoteDUnitVMIF.java | 0
.../test/dunit/standalone/StandAloneDUnitEnv.java | 0
.../geode/test/junit/rules/GfshCommandRule.java | 0
.../geode/test/junit/rules/LocatorStarterRule.java | 0
.../geode/test/junit/rules/MemberStarterRule.java | 0
.../geode/test/junit/rules/ServerStarterRule.java | 0
81 files changed, 225 insertions(+), 127 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 97e983e..b404df5 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -166,10 +166,6 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
-
- // Integration Tests
-
-
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -204,6 +200,14 @@ jmh {
duplicateClassesStrategy = 'warn'
}
+dependencies {
+ // Integration Tests
+ integrationTestCompile sourceSets.test.output
+
+ // Distributed Tests
+ distributedTestCompile sourceSets.integrationTest.output
+}
+
// Creates the version properties file and writes it to the classes dir
task createVersionPropertiesFile {
def propertiesFile = file(generatedResources + "/org/apache/geode/internal/GemFireVersion.properties");
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index c295bf1..f90a2bf 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.util.Comparator;
import java.util.Iterator;
@@ -35,8 +33,6 @@ import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheException;
@@ -1848,74 +1844,6 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
return bridgeServerPort;
}
- public static class TestObject implements DataSerializable {
- protected String _ticker;
- protected int _price;
- public int id;
- public int important;
- public int selection;
- public int select;
-
- public TestObject() {}
-
- public TestObject(int id, String ticker) {
- this.id = id;
- this._ticker = ticker;
- this._price = id;
- this.important = id;
- this.selection = id;
- this.select = id;
- }
-
- public int getId() {
- return this.id;
- }
-
- public String getTicker() {
- return this._ticker;
- }
-
- public int getPrice() {
- return this._price;
- }
-
- public void toData(DataOutput out) throws IOException {
- out.writeInt(this.id);
- DataSerializer.writeString(this._ticker, out);
- out.writeInt(this._price);
- }
-
- public void fromData(DataInput in) throws IOException, ClassNotFoundException {
- this.id = in.readInt();
- this._ticker = DataSerializer.readString(in);
- this._price = in.readInt();
- }
-
- @Override
- public String toString() {
- StringBuffer buffer = new StringBuffer();
- buffer.append("TestObject [").append("id=").append(this.id).append("; ticker=")
- .append(this._ticker).append("; price=").append(this._price).append("]");
- return buffer.toString();
- }
-
- @Override
- public boolean equals(Object o) {
- TestObject other = (TestObject) o;
- if ((id == other.id) && (_ticker.equals(other._ticker))) {
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- return this.id;
- }
-
- }
-
private static class IdComparator implements Comparator {
public int compare(Object obj1, Object obj2) {
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index 7525cc2..7992b54 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Collection;
-import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
@@ -39,9 +38,6 @@ import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator.TestHook;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
@@ -60,7 +56,6 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
private final int NUM_BKTS = 10;
private static final String queryStr = "select * from /portfolio where ID >= 0";
protected static final int TOTAL_OBJECTS = 1000;
- public static final String INDEX_NAME = "keyIndex1";
public IndexTrackingQueryObserverDUnitTest() {
super();
@@ -191,7 +186,7 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
Index keyIndex1 = null;
try {
if (create) {
- keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, IndexType.FUNCTIONAL, "ID",
+ keyIndex1 = (IndexProtocol) qs.createIndex(IndexTrackingTestHook.INDEX_NAME, IndexType.FUNCTIONAL, "ID",
"/portfolio ");
assertNotNull(keyIndex1);
assertTrue(keyIndex1 instanceof PartitionedIndex);
@@ -281,47 +276,4 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
return asyncInv;
}
- /**
- * TODO: Not implemented fully for all the hooks.
- *
- */
- public static class IndexTrackingTestHook implements TestHook {
- IndexInfo rMap;
- Region regn;
- int bkts;
-
- public IndexTrackingTestHook(Region region, int bukts) {
- this.regn = region;
- this.bkts = bukts;
- }
-
-
- public void hook(int spot) throws RuntimeException {
-
- QueryObserver observer = QueryObserverHolder.getInstance();
- assertTrue(observer instanceof IndexTrackingQueryObserver);
- IndexTrackingQueryObserver gfObserver = (IndexTrackingQueryObserver) observer;
-
- if (spot == 1) { // before index lookup
- } else if (spot == 2) { // before key range index lookup
- } else if (spot == 3) { // End of afterIndexLookup call
- } else if (spot == 4) { // Before resetting indexInfoMap
- Map map = gfObserver.getUsedIndexes();
- assertEquals(1, map.size());
-
- assertTrue(map.get(INDEX_NAME) instanceof IndexInfo);
- rMap = (IndexInfo) map.get(INDEX_NAME);
-
- if (this.regn instanceof PartitionedRegion) {
- assertEquals(1, rMap.getResults().size());
- } else if (this.regn instanceof LocalRegion) {
- assertEquals(1, rMap.getResults().size());
- }
- }
- }
-
- public IndexInfo getRegionMap() {
- return rMap;
- }
- }
}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
new file mode 100755
index 0000000..19ae77b
--- /dev/null
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
@@ -0,0 +1,76 @@
+/*
+ * 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.internal.cache;
+
+import java.io.Serializable;
+
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.internal.cache.execute.data.CustId;
+import org.apache.geode.internal.cache.execute.data.OrderId;
+import org.apache.geode.internal.cache.execute.data.ShipmentId;
+
+public class CustomerIDPartitionResolver implements PartitionResolver {
+
+ private static CustomerIDPartitionResolver customerIDPartitionResolver = null;
+
+ private String id;
+
+
+ private String resolverName;
+
+ public CustomerIDPartitionResolver() {}
+
+ public CustomerIDPartitionResolver(String resolverID) {
+ id = resolverID;
+ }
+
+ public String getName() {
+ return this.resolverName;
+ }
+
+ public Serializable getRoutingObject(EntryOperation opDetails) {
+
+ Serializable routingbject = null;
+
+ if (opDetails.getKey() instanceof ShipmentId) {
+ ShipmentId shipmentId = (ShipmentId) opDetails.getKey();
+ routingbject = shipmentId.getOrderId().getCustId();
+ }
+ if (opDetails.getKey() instanceof OrderId) {
+ OrderId orderId = (OrderId) opDetails.getKey();
+ routingbject = orderId.getCustId();
+ } else if (opDetails.getKey() instanceof CustId) {
+ CustId custId = (CustId) opDetails.getKey();
+ routingbject = custId.getCustId();
+ }
+ return routingbject;
+ }
+
+ public void close() {}
+
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof CustomerIDPartitionResolver))
+ return false;
+
+ CustomerIDPartitionResolver otherCustomerIDPartitionResolver = (CustomerIDPartitionResolver) o;
+ return otherCustomerIDPartitionResolver.id.equals(this.id);
+
+ }
+
+}
diff --git a/geode-core/src/distributedTest/java/hydra/MethExecutor.java b/geode-core/src/integrationTest/java/hydra/MethExecutor.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/MethExecutor.java
rename to geode-core/src/integrationTest/java/hydra/MethExecutor.java
diff --git a/geode-core/src/distributedTest/java/hydra/MethExecutorResult.java b/geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/MethExecutorResult.java
rename to geode-core/src/integrationTest/java/hydra/MethExecutorResult.java
diff --git a/geode-core/src/distributedTest/java/hydra/SchedulingOrder.java b/geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
similarity index 100%
rename from geode-core/src/distributedTest/java/hydra/SchedulingOrder.java
rename to geode-core/src/integrationTest/java/hydra/SchedulingOrder.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtils.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache/query/QueryTestUtils.java
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
new file mode 100644
index 0000000..91b7353
--- /dev/null
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/dunit/TestObject.java
@@ -0,0 +1,76 @@
+package org.apache.geode.cache.query.dunit;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+
+public class TestObject implements DataSerializable {
+ protected String _ticker;
+ protected int _price;
+ public int id;
+ public int important;
+ public int selection;
+ public int select;
+
+ public TestObject() {}
+
+ public TestObject(int id, String ticker) {
+ this.id = id;
+ this._ticker = ticker;
+ this._price = id;
+ this.important = id;
+ this.selection = id;
+ this.select = id;
+ }
+
+ public int getId() {
+ return this.id;
+ }
+
+ public String getTicker() {
+ return this._ticker;
+ }
+
+ public int getPrice() {
+ return this._price;
+ }
+
+ public void toData(DataOutput out) throws IOException {
+ out.writeInt(this.id);
+ DataSerializer.writeString(this._ticker, out);
+ out.writeInt(this._price);
+ }
+
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ this.id = in.readInt();
+ this._ticker = DataSerializer.readString(in);
+ this._price = in.readInt();
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("TestObject [").append("id=").append(this.id).append("; ticker=")
+ .append(this._ticker).append("; price=").append(this._price).append("]");
+ return buffer.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ TestObject other = (TestObject) o;
+ if ((id == other.id) && (_ticker.equals(other._ticker))) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return this.id;
+ }
+
+}
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index 57d65696..5a7d779 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.cache.query.Struct;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.data.Position;
-import org.apache.geode.cache.query.dunit.QueryUsingPoolDUnitTest.TestObject;
+import org.apache.geode.cache.query.dunit.TestObject;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLQueryTest;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index 1b556ac..0aa9071 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
@@ -39,7 +39,6 @@ import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
import org.apache.geode.cache.query.internal.QueryObserver;
import org.apache.geode.cache.query.internal.QueryObserverHolder;
-import org.apache.geode.cache.query.internal.index.IndexTrackingQueryObserverDUnitTest.IndexTrackingTestHook;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.OQLIndexTest;
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
new file mode 100644
index 0000000..612e8c1
--- /dev/null
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingTestHook.java
@@ -0,0 +1,63 @@
+package org.apache.geode.cache.query.internal.index;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Map;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator;
+
+/**
+ * TODO: Not implemented fully for all the hooks.
+ *
+ */
+public class IndexTrackingTestHook implements PartitionedRegionQueryEvaluator.TestHook {
+
+ public static final String INDEX_NAME = "keyIndex1";
+
+ IndexTrackingQueryObserver.IndexInfo rMap;
+ Region regn;
+ int bkts;
+
+ public IndexTrackingTestHook(Region region, int bukts) {
+ this.regn = region;
+ this.bkts = bukts;
+ }
+
+
+ public void hook(int spot) throws RuntimeException {
+
+ QueryObserver observer = QueryObserverHolder.getInstance();
+ assertTrue(observer instanceof IndexTrackingQueryObserver);
+ IndexTrackingQueryObserver gfObserver = (IndexTrackingQueryObserver) observer;
+
+ if (spot == 1) { // before index lookup
+ } else if (spot == 2) { // before key range index lookup
+ } else if (spot == 3) { // End of afterIndexLookup call
+ } else if (spot == 4) { // Before resetting indexInfoMap
+ Map map = gfObserver.getUsedIndexes();
+ assertEquals(1, map.size());
+
+ assertTrue(map.get(
+ INDEX_NAME) instanceof IndexTrackingQueryObserver.IndexInfo);
+ rMap = (IndexTrackingQueryObserver.IndexInfo) map.get(
+ INDEX_NAME);
+
+ if (this.regn instanceof PartitionedRegion) {
+ assertEquals(1, rMap.getResults().size());
+ } else if (this.regn instanceof LocalRegion) {
+ assertEquals(1, rMap.getResults().size());
+ }
+ }
+ }
+
+ public IndexTrackingQueryObserver.IndexInfo getRegionMap() {
+ return rMap;
+ }
+}
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/ClientServerTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/ClientServerTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/RegionTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/RegionTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheCallback.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheCallback.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheListener.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheListener.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheLoader.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheLoader.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheWriter.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
rename to geode-core/src/integrationTest/java/org/apache/geode/cache30/TestCacheWriter.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorCommand.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorCommand.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerCommand.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerCommand.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherLocalIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/ServerLauncherRemoteIntegrationTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/TestServerLauncherCacheProvider.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesLocatorCommand.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/UsesServerCommand.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/UsesServerCommand.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveTestHelper.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
rename to geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/InterceptUDP.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Assert.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Assert.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Assert.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/AsyncInvocation.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitBlackboard.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitEnv.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DUnitEnv.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DUnitEnv.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Disconnect.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Disconnect.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Disconnect.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/DistributedTestUtils.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Host.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Host.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Host.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/IgnoredException.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/IgnoredException.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/IgnoredException.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Invoke.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Invoke.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Invoke.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Jitter.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Jitter.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Jitter.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/LogWriterUtils.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedCallable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedCallable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedCallable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedRunnable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/NamedRunnable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/NamedRunnable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RMIException.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RMIException.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RMIException.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/RepeatableRunnable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableCallableIF.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnable.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/SerializableRunnableIF.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/StoppableWaitCriterion.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/ThreadUtils.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/ThreadUtils.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/ThreadUtils.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/VM.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/VM.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/VM.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Wait.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/Wait.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/Wait.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/WaitCriterion.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/WaitCriterion.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/WaitCriterion.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboard.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/InternalBlackboardImpl.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/RemoteInvoker.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/BounceResult.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ChildVM.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVM.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/RemoteDUnitVMIF.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
rename to geode-core/src/integrationTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
[geode] 04/46: GEODE-5363: Moves distributed tests into new source
set.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 35693ba94c8b8d8b8249de53963cfc6ec27dc9f3
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Jun 29 20:53:03 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
geode-core/src/{test => distributedTest}/java/hydra/MethExecutor.java | 0
.../src/{test => distributedTest}/java/hydra/MethExecutorResult.java | 0
geode-core/src/{test => distributedTest}/java/hydra/SchedulingOrder.java | 0
.../java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java | 0
.../java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java | 0
.../java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java | 0
.../java/org/apache/geode/cache/ConnectionPoolDUnitTest.java | 0
.../org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java | 0
.../java/org/apache/geode/cache/PRCacheListenerDistributedTest.java | 0
.../geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java | 0
.../org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java | 0
.../java/org/apache/geode/cache/RegionClearStatsDistributedTest.java | 0
.../java/org/apache/geode/cache/RegionExpirationDistributedTest.java | 0
.../org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java | 0
.../apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java | 0
.../cache/client/RemoveAllCacheListenerClientServerRegressionTest.java | 0
.../apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java | 0
.../geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java | 0
.../apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java | 0
.../org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java | 0
.../java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java | 0
.../apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java | 0
.../org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java | 0
.../org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java | 0
.../org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java | 0
.../apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/HelperTestCase.java | 0
.../geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java | 0
.../org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java | 0
.../cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java | 0
.../geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java | 0
.../geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java | 0
.../apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java | 0
.../org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java | 0
.../apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java | 0
.../geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java | 0
.../geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java | 0
.../java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java | 0
.../internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java | 0
.../index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java | 0
.../index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java | 0
.../query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java | 0
.../apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java | 0
.../cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java | 0
.../query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java | 0
.../geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java | 0
.../geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java | 0
.../geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java | 0
.../geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java | 0
.../org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java | 0
.../apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java | 0
.../geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java | 0
.../org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java | 0
.../java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java | 0
.../apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java | 0
.../apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java | 0
.../geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java | 0
.../cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java | 0
.../java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java | 0
.../java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java | 0
.../java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java | 0
.../org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheCloseDUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java | 0
.../apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheXml70DUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheXml80DUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheXml81DUnitTest.java | 0
.../java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java | 0
.../java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java | 0
.../java/org/apache/geode/cache30/CallbackArgDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClientMembershipDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java | 0
.../org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java | 0
.../java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java | 0
.../java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java | 0
.../geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java | 0
.../apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java | 0
.../geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java | 0
.../java/org/apache/geode/cache30/DiskRegionDistributedTest.java | 0
.../java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java | 0
.../apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java | 0
.../geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java | 0
.../apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java | 0
.../geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java | 0
.../org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java | 0
.../apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java | 0
.../java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java | 0
.../org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java | 0
.../org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java | 0
.../java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java | 0
.../apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java | 0
.../org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/DynamicRegionDUnitTest.java | 0
.../java/org/apache/geode/cache30/GlobalLockingDUnitTest.java | 0
.../java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java | 0
.../java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/GlobalRegionDUnitTest.java | 0
.../java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java | 0
.../java/org/apache/geode/cache30/LocalRegionDUnitTest.java | 0
.../java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java | 0
.../org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java | 0
.../java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java | 0
.../org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java | 0
.../java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java | 0
.../geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java | 0
.../java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java | 0
.../java/org/apache/geode/cache30/ProxyDUnitTest.java | 0
.../java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java | 0
.../java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java | 0
.../java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java | 0
.../java/org/apache/geode/cache30/QueueMsgDUnitTest.java | 0
.../java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java | 0
.../java/org/apache/geode/cache30/ReconnectDUnitTest.java | 0
.../java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java | 0
.../java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java | 0
.../java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java | 0
.../java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java | 0
.../java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java | 0
.../org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java | 0
.../java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java | 0
.../java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java | 0
.../geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java | 0
.../java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java | 0
.../java/org/apache/geode/cache30/RequiredRolesDUnitTest.java | 0
.../java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java | 0
.../java/org/apache/geode/cache30/SlowRecDUnitTest.java | 0
.../java/org/apache/geode/cache30/TXDistributedDUnitTest.java | 0
.../java/org/apache/geode/cache30/TXOrderDUnitTest.java | 0
.../java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java | 0
.../apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java | 0
.../org/apache/geode/distributed/DistributedLockServiceDUnitTest.java | 0
.../java/org/apache/geode/distributed/DistributedMemberDUnitTest.java | 0
.../java/org/apache/geode/distributed/DistributedSystemDUnitTest.java | 0
.../java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java | 0
.../java/org/apache/geode/distributed/LocatorDUnitTest.java | 0
.../java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java | 0
.../java/org/apache/geode/distributed/RoleDUnitTest.java | 0
.../java/org/apache/geode/distributed/ServerLauncherDUnitTest.java | 0
.../java/org/apache/geode/distributed/SystemAdminDUnitTest.java | 0
.../org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java | 0
.../geode/distributed/internal/ClusterDistributionManagerDUnitTest.java | 0
.../distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java | 0
.../apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java | 0
.../apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java | 0
.../org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java | 0
.../internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java | 0
.../distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java | 0
.../distributed/internal/streaming/StreamingOperationManyDUnitTest.java | 0
.../distributed/internal/streaming/StreamingOperationOneDUnitTest.java | 0
.../distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java | 0
.../java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXDebugDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXOrderDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java | 0
.../java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java | 0
.../java/org/apache/geode/disttx/PRDistTXDUnitTest.java | 0
.../java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java | 0
.../geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java | 0
.../geode/internal/BackwardCompatibilitySerializationDUnitTest.java | 0
.../java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java | 0
.../java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java | 0
.../java/org/apache/geode/internal/PdxRenameDUnitTest.java | 0
.../cache/AfterRegionCreateBeforeInitializationRegressionTest.java | 0
.../internal/cache/BrokenSerializationConsistencyRegressionTest.java | 0
.../apache/geode/internal/cache/BucketCreationCrashRegressionTest.java | 0
.../apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java | 0
.../java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java | 0
.../internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java | 0
.../cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java | 0
.../geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java | 0
.../geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java | 0
.../internal/cache/ClientDeserializationCopyOnReadRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java | 0
.../internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java | 0
.../apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java | 0
.../org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java | 0
.../geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java | 0
.../apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java | 0
.../org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java | 0
.../geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java | 0
.../geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java | 0
.../geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java | 0
.../geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java | 0
.../apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java | 0
.../apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java | 0
.../cache/InitializedDiskRegionWithIoExceptionRegressionTest.java | 0
.../org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java | 0
.../geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/InterruptsDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/IteratorDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java | 0
.../org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java | 0
.../apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java | 0
.../apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java | 0
.../apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java | 0
.../org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/PRQueryDistributedTest.java | 0
.../geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java | 0
.../org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java | 0
.../apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java | 0
.../geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java | 0
.../geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java | 0
.../internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java | 0
.../org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java | 0
.../cache/PartitionedRegionBucketCreationDistributionDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionCloseDistributedTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java | 0
.../org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java | 0
.../internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java | 0
.../internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java | 0
.../org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java | 0
.../cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java | 0
.../org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java | 0
.../org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java | 0
.../apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java | 0
.../geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java | 0
.../apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java | 0
.../org/apache/geode/internal/cache/RegionListenerDistributedTest.java | 0
.../geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java | 0
.../org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java | 0
.../geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java | 0
.../java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java | 0
.../org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java | 0
.../internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java | 0
.../org/apache/geode/internal/cache/backup/BackupDistributedTest.java | 0
.../geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java | 0
.../geode/internal/cache/backup/IncrementalBackupDistributedTest.java | 0
.../apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java | 0
.../geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java | 0
.../org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java | 0
.../apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java | 0
.../geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java | 0
.../geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java | 0
.../internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java | 0
.../apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java | 0
.../cache/execute/DistributedRegionFunctionExecutionDUnitTest.java | 0
.../internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java | 0
.../cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java | 0
.../cache/execute/FunctionExecutionWithExceptionDistributedTest.java | 0
.../internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java | 0
.../execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java | 0
.../FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java | 0
.../cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java | 0
.../internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java | 0
.../geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java | 0
.../geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java | 0
.../internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java | 0
.../internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java | 0
.../execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java | 0
.../internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java | 0
.../internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java | 0
.../geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java | 0
.../org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java | 0
.../geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java | 0
.../geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java | 0
.../geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java | 0
.../internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java | 0
.../geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java | 0
.../cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java | 0
.../cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java | 0
.../execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java | 0
.../PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java | 0
...PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java | 0
.../execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java | 0
.../org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java | 0
.../apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java | 0
.../cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java | 0
.../apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java | 0
.../apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java | 0
.../org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java | 0
.../internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java | 0
.../geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java | 0
.../geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java | 0
.../internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java | 0
.../org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java | 0
.../org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java | 0
.../apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java | 0
.../apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java | 0
.../internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java | 0
.../java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java | 0
.../apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java | 0
.../apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java | 0
.../java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java | 0
.../org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java | 0
.../cache/partitioned/BucketCreationCrashCompletesRegressionTest.java | 0
.../internal/cache/partitioned/BucketRebalanceStatRegressionTest.java | 0
.../apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java | 0
.../cache/partitioned/PRDiskConflictWithColocationDistributedTest.java | 0
.../geode/internal/cache/partitioned/PartitionResolverDUnitTest.java | 0
.../cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java | 0
.../cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java | 0
.../geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java | 0
.../cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java | 0
.../cache/partitioned/PersistentPartitionedRegionDistributedTest.java | 0
.../cache/partitioned/PersistentPartitionedRegionRegressionTest.java | 0
.../partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java | 0
.../cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java | 0
.../cache/partitioned/RegisterInterestKeysValuesDistributedTest.java | 0
.../org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java | 0
.../cache/partitioned/StreamingPartitionOperationManyDUnitTest.java | 0
.../cache/partitioned/StreamingPartitionOperationOneDUnitTest.java | 0
.../internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java | 0
.../geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java | 0
.../fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java | 0
.../geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java | 0
.../internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java | 0
.../cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java | 0
.../geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 0
.../geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java | 0
.../org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java | 0
.../geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java | 0
.../cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java | 0
.../apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java | 0
.../tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java | 0
.../internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java | 0
.../cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java | 0
.../cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java | 0
.../tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java | 0
.../geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java | 0
.../internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java | 0
.../internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java | 0
.../internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java | 0
.../cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java | 0
.../org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java | 0
.../internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java | 0
.../internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java | 0
.../internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java | 0
.../internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java | 0
.../internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java | 0
.../internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java | 0
.../internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java | 0
.../cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java | 0
.../cache/tier/sockets/GetConnectedServerCountRegressionTest.java | 0
.../org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java | 0
.../geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java | 0
.../geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java | 0
.../org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java | 0
.../cache/tier/sockets/HARegionQueueStatsCloseRegressionTest.java | 0
.../geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java | 0
.../internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java | 0
.../apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java | 0
.../internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java | 0
.../cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java | 0
.../internal/cache/tier/sockets/MessageTrackingTimeoutRegressionTest.java | 0
.../geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java | 0
.../geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java | 0
.../geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java | 0
.../apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java | 0
.../apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java | 0
.../cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java | 0
.../internal/cache/tier/sockets/RegisterInterestDistributedTest.java | 0
.../geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java | 0
.../internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java | 0
.../tier/sockets/RegisterInterestOnServerWithoutRegionRegressionTest.java | 0
.../cache/tier/sockets/RegisterInterestServerMetaDataDistributedTest.java | 0
.../geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java | 0
.../cache/tier/sockets/RootRegionsExcludesHARegionsRegressionTest.java | 0
.../geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java | 0
.../geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java | 0
.../cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java | 0
.../cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java | 0
.../apache/geode/internal/cache/tx/SetOperationJTADistributedTest.java | 0
.../java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java | 0
.../internal/cache/wan/AsyncEventQueueEntrySynchronizationDUnitTest.java | 0
.../java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java | 0
.../geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java | 0
.../internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java | 0
.../internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java | 0
.../internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java | 0
.../cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java | 0
.../internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java | 0
.../cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java | 0
.../geode/internal/compression/CompressionCacheConfigDUnitTest.java | 0
.../geode/internal/compression/CompressionCacheListenerDUnitTest.java | 0
.../internal/compression/CompressionCacheListenerOffHeapDUnitTest.java | 0
.../geode/internal/compression/CompressionRegionConfigDUnitTest.java | 0
.../geode/internal/compression/CompressionRegionFactoryDUnitTest.java | 0
.../geode/internal/compression/CompressionRegionOperationsDUnitTest.java | 0
.../internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java | 0
.../org/apache/geode/internal/compression/CompressionStatsDUnitTest.java | 0
.../geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java | 0
.../java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java | 0
.../java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java | 0
.../java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java | 0
.../java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java | 0
.../java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java | 0
.../org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java | 0
.../apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java | 0
.../java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java | 0
.../org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java | 0
.../geode/internal/process/LocalProcessLauncherDistributedTest.java | 0
.../org/apache/geode/internal/statistics/StatisticsDistributedTest.java | 0
.../java/org/apache/geode/internal/tcp/TCPConduitDUnitTest.java | 0
.../java/org/apache/geode/internal/util/PluckStacksDUnitTest.java | 0
.../java/org/apache/geode/management/CacheManagementDUnitTest.java | 0
.../java/org/apache/geode/management/ClientHealthStatsDUnitTest.java | 0
.../java/org/apache/geode/management/CompositeTypeTestDUnitTest.java | 0
.../java/org/apache/geode/management/DLockManagementDUnitTest.java | 0
.../java/org/apache/geode/management/DiskManagementDUnitTest.java | 0
.../java/org/apache/geode/management/DistributedSystemDUnitTest.java | 0
.../java/org/apache/geode/management/JMXMBeanDUnitTest.java | 0
.../java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java | 0
.../java/org/apache/geode/management/LocatorManagementDUnitTest.java | 0
.../java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java | 0
.../java/org/apache/geode/management/OffHeapManagementDUnitTest.java | 0
.../java/org/apache/geode/management/QueryDataDUnitTest.java | 0
.../java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java | 0
.../java/org/apache/geode/management/RegionManagementDUnitTest.java | 0
.../geode/management/UniversalMembershipListenerAdapterDUnitTest.java | 0
.../geode/management/bean/stats/DistributedSystemStatsDUnitTest.java | 0
.../java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java | 0
.../java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java | 0
.../internal/cli/commands/AlterAsyncEventQueueCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/AlterCompressorDUnitTest.java | 0
.../geode/management/internal/cli/commands/AlterDiskStoreDUnitTest.java | 0
.../management/internal/cli/commands/AlterRegionCommandDUnitTest.java | 0
.../management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java | 0
.../internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java | 0
.../internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java | 0
.../internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java | 0
.../management/internal/cli/commands/CreateIndexCommandDUnitTest.java | 0
.../internal/cli/commands/CreateJndiBindingCommandDUnitTest.java | 0
.../management/internal/cli/commands/CreateRegionCommandDUnitTest.java | 0
.../management/internal/cli/commands/CreateRegionSecurityDUnitTest.java | 0
.../internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java | 0
.../management/internal/cli/commands/DeployCommandRedeployDUnitTest.java | 0
.../geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java | 0
.../internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java | 0
.../management/internal/cli/commands/DescribeMembersCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/DescribeRegionDUnitTest.java | 0
.../internal/cli/commands/DestroyAsyncEventQueueCommandDUnitTest.java | 0
.../management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java | 0
.../internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java | 0
.../management/internal/cli/commands/DestroyRegionCommandDUnitTest.java | 0
.../management/internal/cli/commands/DiskStoreCommandsDUnitTest.java | 0
.../management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java | 0
.../internal/cli/commands/ExecuteFunctionCommandSecurityTest.java | 0
.../geode/management/internal/cli/commands/ExportLogsDUnitTest.java | 0
.../management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java | 0
.../geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java | 0
.../internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java | 0
.../internal/cli/commands/ExportStackTraceCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java | 0
.../apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java | 0
.../management/internal/cli/commands/GemfireDataCommandsDUnitTest.java | 0
.../internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java | 0
.../internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java | 0
.../management/internal/cli/commands/ListJndiBindingCommandDUnitTest.java | 0
.../management/internal/cli/commands/ListMembersCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/ListRegionDUnitTest.java | 0
.../geode/management/internal/cli/commands/LocateEntryDUnitTest.java | 0
.../management/internal/cli/commands/RebalanceCommandDistributedTest.java | 0
.../geode/management/internal/cli/commands/RemoveCommandDUnitTest.java | 0
.../management/internal/cli/commands/RemoveCommandJsonDUnitTest.java | 0
.../geode/management/internal/cli/commands/ShellCommandsDUnitTest.java | 0
.../geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java | 0
.../geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java | 0
.../geode/management/internal/cli/commands/ShowMetricsDUnitTest.java | 0
.../management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java | 0
.../geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java | 0
.../org/apache/geode/management/internal/cli/util/MergeLogsDUnitTest.java | 0
.../internal/configuration/ClusterConfigDeployJarDUnitTest.java | 0
.../internal/configuration/ClusterConfigDistributionDUnitTest.java | 0
.../management/internal/configuration/ClusterConfigImportDUnitTest.java | 0
.../internal/configuration/ClusterConfigLocatorRestartDUnitTest.java | 0
.../internal/configuration/ClusterConfigStartMemberDUnitTest.java | 0
.../internal/configuration/ClusterConfigWithCallbacksDUnitTest.java | 0
.../internal/configuration/ClusterConfigWithSecurityDUnitTest.java | 0
.../configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java | 0
.../management/internal/configuration/DeployJarWithSSLDUnitTest.java | 0
.../internal/configuration/ImportClusterConfigDistributedTest.java | 0
.../internal/configuration/ImportOldClusterConfigDUnitTest.java | 0
.../apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java | 0
.../apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java | 0
.../org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java | 0
.../org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java | 0
.../geode/management/internal/pulse/TestSubscriptionsDUnitTest.java | 0
.../management/internal/security/DistributedSystemMXBeanSecurityTest.java | 0
.../apache/geode/management/internal/security/MultiClientDUnitTest.java | 0
.../org/apache/geode/management/internal/security/MultiGfshDUnitTest.java | 0
.../management/internal/security/MultiUserAuthenticationDUnitTest.java | 0
.../java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java | 0
.../java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java | 0
.../java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java | 0
.../java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxClientServerDUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxSerializableDUnitTest.java | 0
.../java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java | 0
.../java/org/apache/geode/redis/RedisDistDUnitTest.java | 0
.../java/org/apache/geode/security/ClientAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientAuthenticationDUnitTest.java | 0
.../org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java | 0
.../geode/security/ClientAuthorizationLegacyConfigurationDUnitTest.java | 0
.../java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java | 0
.../security/ClientDataAuthorizationUsingLegacySecurityDUnitTest.java | 0
.../ClientDataAuthorizationUsingLegacySecurityWithFailoverDUnitTest.java | 0
.../org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java | 0
.../org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java | 0
.../apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java | 0
.../java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java | 0
.../org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java | 0
.../org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java | 0
.../java/org/apache/geode/security/ClusterConfigNotEnabledDUnitTest.java | 0
.../apache/geode/security/ClusterConfigWithEmbededLocatorDUnitTest.java | 0
.../org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java | 0
.../org/apache/geode/security/ClusterConfigurationSecurityDUnitTest.java | 0
.../java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java | 0
.../org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java | 0
.../org/apache/geode/security/IntegratedSecurityPeerAuthDUnitTest.java | 0
.../apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java | 0
.../org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java | 0
.../java/org/apache/geode/security/P2PAuthenticationDUnitTest.java | 0
.../org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java | 0
.../java/org/apache/geode/security/PDXPostProcessorDUnitTest.java | 0
.../java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java | 0
.../geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java | 0
.../apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java | 0
.../java/org/apache/geode/security/PostProcessorDUnitTest.java | 0
.../java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java | 0
.../apache/geode/security/SecurityManagerLifecycleDistributedTest.java | 0
.../org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java | 0
.../java/org/apache/geode/security/StartServerAuthorizationTest.java | 0
.../java/org/apache/geode/security/query/IndexSecurityDUnitTest.java | 0
.../apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java | 0
.../security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java | 0
...tionedQuerySecurityRestrictedButMethodsDoNotExistQueriesDUnitTest.java | 0
.../query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java | 0
.../query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java | 0
.../geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java | 0
.../geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java | 0
.../apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java | 0
.../security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java | 0
.../geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java | 0
.../query/QuerySecurityRetrictedButMethodsDoNotExistDUnitTest.java | 0
.../query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java | 0
.../java/org/apache/geode/test/dunit/DistributedTestCase.java | 0
.../apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java | 0
.../apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java | 0
.../apache/geode/test/dunit/examples/AsyncInvokeRunnableExampleTest.java | 0
.../java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java | 0
.../geode/test/dunit/examples/CatchingUnexpectedExceptionExampleTest.java | 0
.../apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java | 0
.../apache/geode/test/dunit/examples/DistributedTestRuleExampleTest.java | 0
.../test/dunit/examples/DoNotHandleUnexpectedExceptionExampleTest.java | 0
.../org/apache/geode/test/dunit/examples/FixtureOrderingExampleTest.java | 0
.../org/apache/geode/test/dunit/examples/InvokeRunnableExampleTest.java | 0
.../apache/geode/test/dunit/examples/LocatorPortClusterExampleTest.java | 0
.../apache/geode/test/dunit/examples/ReplaceTryFinallyExampleTest.java | 0
.../org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java | 0
.../geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java | 0
.../org/apache/geode/test/dunit/rules/tests/CacheRuleDistributedTest.java | 0
.../rules/tests/ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java | 0
.../rules/tests/DistributedRestoreSystemPropertiesDistributedTest.java | 0
.../geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java | 0
.../geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java | 0
.../geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java | 0
.../java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java | 0
.../org/apache/geode/test/dunit/tests/GetCurrentVmNumDistributedTest.java | 0
.../geode/test/dunit/tests/GetDefaultDiskStoreNameDistributedTest.java | 0
.../geode/test/dunit/tests/GetPidAndIdAfterBounceDistributedTest.java | 0
.../org/apache/geode/test/dunit/tests/GetPidAndIdDistributedTest.java | 0
.../apache/geode/test/dunit/tests/GetTestMethodNameDistributedTest.java | 0
.../org/apache/geode/test/dunit/tests/GetUniqueNameDistributedTest.java | 0
.../dunit/tests/OverridingGetPropertiesDisconnectsAllDistributedTest.java | 0
.../java/org/apache/geode/test/dunit/tests/VMDistributedTest.java | 0
662 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/geode-core/src/test/java/hydra/MethExecutor.java b/geode-core/src/distributedTest/java/hydra/MethExecutor.java
similarity index 100%
rename from geode-core/src/test/java/hydra/MethExecutor.java
rename to geode-core/src/distributedTest/java/hydra/MethExecutor.java
diff --git a/geode-core/src/test/java/hydra/MethExecutorResult.java b/geode-core/src/distributedTest/java/hydra/MethExecutorResult.java
similarity index 100%
rename from geode-core/src/test/java/hydra/MethExecutorResult.java
rename to geode-core/src/distributedTest/java/hydra/MethExecutorResult.java
diff --git a/geode-core/src/test/java/hydra/SchedulingOrder.java b/geode-core/src/distributedTest/java/hydra/SchedulingOrder.java
similarity index 100%
rename from geode-core/src/test/java/hydra/SchedulingOrder.java
rename to geode-core/src/distributedTest/java/hydra/SchedulingOrder.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/CreateAndLocalDestroyInTXRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerWithInterestPolicyAllDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/PRCreationTotalNumBucketsDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/RemoveAllCacheListenerClientServerRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/management/ResourceManagerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompactRangeIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CompiledInDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/CorruptedIndexIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HashIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/HelperTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/OrderByPartitionedDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxGroupByPartitionedQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/PdxStringQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/RemoteQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/MultiIndexCreationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicMultiIndexCreationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRBasicRemoveIndexDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryPortfolioDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotByteArrayDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/SnapshotPerformanceDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheCloseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml70DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml80DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml80DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml81DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CallbackArgDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckSyncOverflowRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionCompressionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/LocalRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PRBucketSynchronizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ProxyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/QueueMsgDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RRSynchronizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithCacheXMLDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RemotePRValuesAreNotDeserializedRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/SlowRecDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TXOrderDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ValuesAreLazilyDeserializedRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/RoleDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/ServerLauncherDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/SystemAdminDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerForAdminDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ValueToDataThrowsRuntimeExceptionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/PdxRenameDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BrokenSerializationConsistencyRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationCrashRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/BucketCreationGIIHARegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CacheAdvisorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/CleanupFailedInitWithDiskFilesRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringGiiOplogWithMissingCreateRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearDuringNetSearchOplogRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearGlobalDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearRvvLockingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientDeserializationCopyOnReadRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientTxCommitShouldNotHangRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConcurrentMapOpsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ConnectDisconnectDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRecoveryWithVersioningGiiRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DiskRegByteArrayDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/EntriesDoNotExpireDuringGiiRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/FixedPRSinglehopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GiiDiskAccessExceptionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GridAdvisorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InitializedDiskRegionWithIoExceptionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/MapClearGIIDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/P2PDeltaPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRAccessorWithOverflowRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRBadToDataDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRCustomPartitioningDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntryIdleExpirationDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PREntrySetIteratorRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexAndPdxDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithIndexDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithOrderByDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRQueryWithPdxDuringRebalanceRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PRWithIndexAfterRebalanceRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAPIDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAsSubregionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCloseDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionDestroyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEntryCountDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionEvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHADUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionMultipleDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPRIDDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSizeDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PersistentRegionTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllDAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PutAllGlobalDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegionListenerDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RegisterInterestWithEvictionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionCCEDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoteTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveAllDAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveDAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/RemoveGlobalDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TxCommitMessageBackwardCompatibilityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/BackupPrepareAndFinishMsgDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/IncrementalBackupDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/event/EventTrackerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionObjectSizerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/EvictionTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/eviction/OffHeapEvictionStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientFunctionTimeoutRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ColocationFailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/ExecuteFunctionInstanceRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExceptionsIncludeLocalMemberRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionExecutionWithExceptionDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceLocalRRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceMultipleOnMemberDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRMultipleMembersDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorRRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceSingleOnMemberDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationJTADUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRSetOperationTXDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithSizeOperationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRTransactionWithVersionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/extension/ExtensionClusterConfigurationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueExpiryRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PreferSerializedHARegionQueueTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/BucketRebalanceStatRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PRDiskConflictWithColocationDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistPRKRFIntegrationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationManyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/snapshot/GFSnapshotDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplClientQueueDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionNotificationRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientDestroyRegionUnregisterInterestRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyWithDeltaDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ClientWithInterestFailoverDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GetConnectedServerCountRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/GetConnectedServerCountRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GetConnectedServerCountRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/GetConnectedServerCountRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAInterestTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HARegionQueueStatsCloseRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HARegionQueueStatsCloseRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HARegionQueueStatsCloseRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HARegionQueueStatsCloseRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageTrackingTimeoutRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/MessageTrackingTimeoutRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageTrackingTimeoutRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/MessageTrackingTimeoutRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestOnServerWithoutRegionRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestOnServerWithoutRegionRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestOnServerWithoutRegionRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestOnServerWithoutRegionRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestServerMetaDataDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestServerMetaDataDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestServerMetaDataDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestServerMetaDataDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RootRegionsExcludesHARegionsRegressionTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RootRegionsExcludesHARegionsRegressionTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RootRegionsExcludesHARegionsRegressionTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/RootRegionsExcludesHARegionsRegressionTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tx/SetOperationJTADistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tx/SetOperationJTADistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tx/SetOperationJTADistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tx/SetOperationJTADistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueEntrySynchronizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueEntrySynchronizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueEntrySynchronizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueEntrySynchronizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheListenerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionFactoryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionOperationsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/compression/CompressionStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandlerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/ClientServerJTADUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/ExceptionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/IdleTimeOutDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/LoginTimeOutDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/MaxPoolSizeDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TransactionTimeOutDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/TxnTimeOutDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/process/LocalProcessLauncherDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/statistics/StatisticsDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/TCPConduitDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/tcp/TCPConduitDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/tcp/TCPConduitDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/tcp/TCPConduitDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/util/PluckStacksDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/util/PluckStacksDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/internal/util/PluckStacksDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/CacheManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/CacheManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/CacheManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/CompositeTypeTestDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/CompositeTypeTestDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/CompositeTypeTestDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/CompositeTypeTestDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DLockManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/DLockManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/DLockManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DiskManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/DiskManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/DistributedSystemDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/DistributedSystemDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/JMXMBeanDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/LocatorManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/LocatorManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/MemberMBeanAttributesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/RegionCreateDestroyDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/RegionManagementDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/RegionManagementDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterCompressorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterCompressorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterCompressorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterCompressorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateRegionSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployCommandFunctionRegistrationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeMembersCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/GcCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandsShareConfigurationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListMembersCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListRegionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListRegionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListRegionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LocateEntryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RemoveCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RemoveCommandJsonDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShellCommandsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMetricsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoresDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/util/MergeLogsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/util/MergeLogsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/util/MergeLogsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/util/MergeLogsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigDistributionDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithCallbacksDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigWithCallbacksDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithCallbacksDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigWithCallbacksDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ConfigurationPersistenceServiceUsingDirDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/DeployJarWithSSLDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/DeployJarWithSSLDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/DeployJarWithSSLDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/DeployJarWithSSLDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ImportClusterConfigDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ImportOldClusterConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestClientIdsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestHeapDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestLocatorsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestSubscriptionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestSubscriptionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/pulse/TestSubscriptionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/DistributedSystemMXBeanSecurityTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiClientDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiClientDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/MultiClientDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiClientDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiGfshDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiGfshDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/MultiGfshDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiGfshDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserAuthenticationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiUserAuthenticationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/security/MultiUserAuthenticationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/security/MultiUserAuthenticationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/DistributedSystemIdDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/JSONPdxClientServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/redis/RedisDistDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationPart2DUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationLegacyConfigurationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationLegacyConfigurationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationLegacyConfigurationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationLegacyConfigurationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientContainsKeyAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityWithFailoverDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityWithFailoverDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityWithFailoverDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientDataAuthorizationUsingLegacySecurityWithFailoverDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientDestroyInvalidateAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientDestroyRegionAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientExecuteFunctionAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientExecuteRegionFunctionAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetAllAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetEntryAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientGetPutAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientMultiUserAuthzDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientRegionClearAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientRegisterInterestAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientRemoveAllAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientUnregisterInterestAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigNotEnabledDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigNotEnabledDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClusterConfigNotEnabledDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigNotEnabledDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithEmbededLocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithEmbededLocatorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithEmbededLocatorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithEmbededLocatorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigurationSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigurationSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/ClusterConfigurationSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClusterConfigurationSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/DeltaClientAuthorizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/DeltaClientPostAuthorizationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/IntegratedSecurityPeerAuthDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/IntegratedSecurityPeerAuthDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/IntegratedSecurityPeerAuthDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/NoShowValue1PostProcessorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/P2PAuthenticationDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PDXGfshPostProcessorOnRemoteServerTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PDXPostProcessorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PeerAuthenticatorWithCachelessLocatorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/PostProcessorDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/PostProcessorDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/PostProcessorDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/SecurityManagerLifecycleDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/StartServerAuthorizationTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/StartServerAuthorizationTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/IndexSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/IndexSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/IndexSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/IndexSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedIndexSecurityDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityAllowedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedButMethodsDoNotExistQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedButMethodsDoNotExistQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedButMethodsDoNotExistQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedButMethodsDoNotExistQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PartitionedQuerySecurityRestrictedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxPartitionedQuerySecurityAllowedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxQuerySecurityAllowedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/PdxQuerySecurityRestrictedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityAllowedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityAuthorizedUserBindParameterDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityRestrictedQueriesDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityRetrictedButMethodsDoNotExistDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityRetrictedButMethodsDoNotExistDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityRetrictedButMethodsDoNotExistDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityRetrictedButMethodsDoNotExistDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityUnauthorizedUserBindParameterDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestCase.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/DistributedTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/AsyncInvokeRunnableExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/AsyncInvokeRunnableExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/AsyncInvokeRunnableExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/AsyncInvokeRunnableExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/BeforeClassExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/CatchingUnexpectedExceptionExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/CatchingUnexpectedExceptionExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/CatchingUnexpectedExceptionExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/CatchingUnexpectedExceptionExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DistributedTestCaseExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestRuleExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DistributedTestRuleExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/DistributedTestRuleExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DistributedTestRuleExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/DoNotHandleUnexpectedExceptionExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DoNotHandleUnexpectedExceptionExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/DoNotHandleUnexpectedExceptionExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/DoNotHandleUnexpectedExceptionExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/FixtureOrderingExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/FixtureOrderingExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/FixtureOrderingExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/FixtureOrderingExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/InvokeRunnableExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/InvokeRunnableExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/InvokeRunnableExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/InvokeRunnableExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/LocatorPortClusterExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/LocatorPortClusterExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/LocatorPortClusterExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/LocatorPortClusterExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/ReplaceTryFinallyExampleTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/ReplaceTryFinallyExampleTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/examples/ReplaceTryFinallyExampleTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/examples/ReplaceTryFinallyExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/CacheRuleDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/CacheRuleDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/CacheRuleDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/CacheRuleDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedRestoreSystemPropertiesDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetCurrentVmNumDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetCurrentVmNumDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetCurrentVmNumDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetCurrentVmNumDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetDefaultDiskStoreNameDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetDefaultDiskStoreNameDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetDefaultDiskStoreNameDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetDefaultDiskStoreNameDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetPidAndIdAfterBounceDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetPidAndIdAfterBounceDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetPidAndIdAfterBounceDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetPidAndIdAfterBounceDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetPidAndIdDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetPidAndIdDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetPidAndIdDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetPidAndIdDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetTestMethodNameDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetTestMethodNameDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetTestMethodNameDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetTestMethodNameDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetUniqueNameDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetUniqueNameDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/GetUniqueNameDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/GetUniqueNameDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/VMDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDistributedTest.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/tests/VMDistributedTest.java
rename to geode-core/src/distributedTest/java/org/apache/geode/test/dunit/tests/VMDistributedTest.java
[geode] 18/46: GEODE-5363: Moves geode-modules-tomcat8 tests into
new source sets.
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c90d7e7869e61d2d3d6bdf05ec183233753f9d0e
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:05:02 2018 -0700
GEODE-5363: Moves geode-modules-tomcat8 tests into new source sets.
---
extensions/geode-modules-tomcat8/build.gradle | 24 +++++++++++++++++++++-
.../geode/modules/session/EmbeddedTomcat8.java | 0
.../modules/session/TestSessionsTomcat8Base.java | 0
.../Tomcat8SessionsClientServerDUnitTest.java | 0
.../modules/session/Tomcat8SessionsDUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep | 0
.../resources/tomcat/temp}/.gitkeep | 0
8 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index b60e458..f837fc0 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -50,4 +50,26 @@ dependencies {
}
}
-disableMavenPublishing()
\ No newline at end of file
+disableMavenPublishing()
+
+configurations {
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
rename to extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
rename to extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
rename to extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java b/extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
rename to extensions/geode-modules-tomcat8/src/distributedTest/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
diff --git a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/resources/tomcat/conf/tomcat-users.xml
rename to extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/conf/tomcat-users.xml
diff --git a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/resources/tomcat/temp/.gitkeep
rename to extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/logs/.gitkeep
diff --git a/extensions/geode-modules-tomcat8/src/test/resources/tomcat/logs/.gitkeep b/extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat8/src/test/resources/tomcat/logs/.gitkeep
rename to extensions/geode-modules-tomcat8/src/distributedTest/resources/tomcat/temp/.gitkeep
[geode] 35/46: GEODE-5363: Cleanup
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 49518557c5c1726977fc27f7495d2d70d0e9d811
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Jul 9 16:53:40 2018 -0700
GEODE-5363: Cleanup
---
.../geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
index d13d4c2..5458d15 100644
--- a/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
+++ b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
@@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.Result;