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 <jbarr...@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