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