You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2018/05/16 14:26:55 UTC
[geode] branch develop updated: GEODE-5002: Create geode-test
sub-module (#1867)
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 10563d6 GEODE-5002: Create geode-test sub-module (#1867)
10563d6 is described below
commit 10563d65081967da7831a06e2e74c8aec799f7ae
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Wed May 16 07:26:47 2018 -0700
GEODE-5002: Create geode-test sub-module (#1867)
* created new gradle module to hold test framework
* moved dunit test framework into geode-test
* merged geode-junit and geode-old-versions into geode-test
* modified each module's gradle build script to consider geode-test
* changes necessary to support idea and eclipse IDEs
---
extensions/geode-modules-session/build.gradle | 2 +-
extensions/geode-modules-tomcat7/build.gradle | 6 +-
extensions/geode-modules-tomcat8/build.gradle | 9 +-
extensions/geode-modules/build.gradle | 6 +-
geode-assembly/build.gradle | 28 +++--
.../geode/test/junit/rules/GfshRuleTest.java | 2 +-
geode-common/build.gradle | 2 +-
geode-connectors/build.gradle | 7 +-
geode-core/build.gradle | 33 +++---
geode-cq/build.gradle | 5 +-
geode-experimental-driver/build.gradle | 4 +-
geode-json/build.gradle | 4 +-
geode-junit/build.gradle | 39 -------
geode-lucene/build.gradle | 7 +-
geode-old-client-support/build.gradle | 6 +-
geode-old-versions/build.gradle | 100 ----------------
geode-protobuf/build.gradle | 5 +-
geode-pulse/build.gradle | 15 ++-
geode-rebalancer/build.gradle | 2 +-
geode-test/build.gradle | 128 +++++++++++++++++++++
.../java/batterytest/greplogs/ExpectedStrings.java | 0
.../java/batterytest/greplogs/LogConsumer.java | 0
.../src/main}/java/hydra/MethExecutor.java | 0
.../src/main}/java/hydra/MethExecutorResult.java | 0
.../src/main}/java/hydra/SchedulingOrder.java | 0
.../apache/geode/cache/query/QueryTestUtils.java | 0
.../apache/geode/cache/util/TxEventTestUtil.java | 0
.../geode/cache30/CacheSerializableRunnable.java | 0
.../apache/geode/cache30/ClientServerTestCase.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
.../membership/gms/MembershipManagerHelper.java | 0
.../apache/geode/internal/AvailablePortHelper.java | 0
.../cache/tier/sockets/CacheServerTestUtil.java | 0
.../management/internal/cli/HeadlessGfsh.java | 0
.../management/internal/cli/ResultHandler.java | 0
.../security/templates/UserPasswordAuthInit.java | 0
.../apache/geode/test/compiler/ClassBuilder.java | 0
.../geode/test/compiler/ClassNameExtractor.java | 0
.../geode/test/compiler/CompiledSourceCode.java | 0
.../org/apache/geode/test/compiler/JarBuilder.java | 0
.../apache/geode/test/compiler/JavaCompiler.java | 0
.../geode/test/compiler/UncompiledSourceCode.java | 0
.../test/concurrent/FileBasedCountDownLatch.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/DistributedTestCase.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
.../java/org/apache/geode/test/dunit/LocalVM.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/NetworkUtils.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
.../main}/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
.../geode/test/dunit/cache/CacheTestCase.java | 0
.../cache/examples/CacheTestCaseExampleTest.java | 0
.../dunit/cache/internal/CacheTestFixture.java | 0
.../dunit/cache/internal/JUnit4CacheTestCase.java | 0
.../examples/AsyncInvokeCallableExampleTest.java | 0
.../examples/AsyncInvokeRunnableExampleTest.java | 0
.../dunit/examples/BeforeClassExampleTest.java | 0
.../CatchingUnexpectedExceptionExampleTest.java | 0
.../examples/DistributedTestCaseExampleTest.java | 0
.../examples/DistributedTestRuleExampleTest.java | 0
.../DoNotHandleUnexpectedExceptionExampleTest.java | 0
.../dunit/examples/FixtureOrderingExampleTest.java | 0
.../dunit/examples/InvokeRunnableExampleTest.java | 0
.../examples/LocatorPortClusterExampleTest.java | 0
.../examples/ReplaceTryFinallyExampleTest.java | 0
.../dunit/internal/DUnitBlackboardDUnitTest.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
.../apache/geode/test/dunit/rules/CacheRule.java | 0
.../test/dunit/rules/CleanupDUnitVMsRule.java | 0
.../geode/test/dunit/rules/ClientCacheRule.java | 0
.../apache/geode/test/dunit/rules/ClientVM.java | 0
.../geode/test/dunit/rules/ClusterStartupRule.java | 0
.../test/dunit/rules/DistributedDiskDirRule.java | 0
.../dunit/rules/DistributedExternalResource.java | 0
.../rules/DistributedRestoreSystemProperties.java | 0
.../test/dunit/rules/DistributedTestRule.java | 2 -
.../DistributedUseJacksonForJsonPathRule.java | 0
.../apache/geode/test/dunit/rules/MemberVM.java | 0
.../geode/test/dunit/rules/RemoteInvoker.java | 0
.../geode/test/dunit/rules/SharedCountersRule.java | 0
.../test/dunit/rules/SharedErrorCollector.java | 0
.../tests/CacheRuleBuilderDistributedTest.java | 0
.../rules/tests/CacheRuleDistributedTest.java | 0
...tartupRuleCanSpecifyOlderVersionsDUnitTest.java | 0
...utedRestoreSystemPropertiesDistributedTest.java | 0
.../tests/DistributedTestRuleDistributedTest.java | 0
.../dunit/rules/tests/MemberStarterRuleTest.java | 0
.../tests/SharedCountersRuleDistributedTest.java | 0
.../tests/SharedErrorCollectorDistributedTest.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
.../test/dunit/standalone/VersionManager.java | 0
.../test/dunit/tests/BasicDistributedTest.java | 0
.../tests/GetCurrentVmNumDistributedTest.java | 0
.../GetDefaultDiskStoreNameDistributedTest.java | 0
.../GetPidAndIdAfterBounceDistributedTest.java | 0
.../dunit/tests/GetPidAndIdDistributedTest.java | 0
.../tests/GetTestMethodNameDistributedTest.java | 0
.../dunit/tests/GetUniqueNameDistributedTest.java | 0
...GetPropertiesDisconnectsAllDistributedTest.java | 0
.../geode/test/dunit/tests/VMDistributedTest.java | 0
.../apache/geode/test/junit/ConditionalIgnore.java | 0
.../apache/geode/test/junit/IgnoreCondition.java | 0
.../org/apache/geode/test/junit/IgnoreUntil.java | 0
.../java/org/apache/geode/test/junit/Repeat.java | 0
.../org/apache/geode/test/junit/ResultCaptor.java | 0
.../java/org/apache/geode/test/junit/Retry.java | 0
.../test/junit/assertions/CommandResultAssert.java | 0
.../junit/assertions/CommandResultExecution.java | 0
.../geode/test/junit/categories/AEQTest.java | 0
.../test/junit/categories/AcceptanceTest.java | 0
.../categories/BackwardCompatibilityTest.java | 0
.../test/junit/categories/ClientServerTest.java | 0
.../junit/categories/ClientSubscriptionTest.java | 0
.../geode/test/junit/categories/ContainerTest.java | 0
.../geode/test/junit/categories/DLockTest.java | 0
.../test/junit/categories/DistributedTest.java | 0
.../categories/DistributedTransactionsTest.java | 0
.../geode/test/junit/categories/FlakyTest.java | 0
.../test/junit/categories/FunctionServiceTest.java | 0
.../geode/test/junit/categories/GfshTest.java | 0
.../geode/test/junit/categories/HydraTest.java | 0
.../test/junit/categories/IntegrationTest.java | 0
.../geode/test/junit/categories/LuceneTest.java | 0
.../test/junit/categories/ManagementTest.java | 0
.../test/junit/categories/MembershipTest.java | 0
.../geode/test/junit/categories/OQLIndexTest.java | 0
.../geode/test/junit/categories/OQLQueryTest.java | 0
.../test/junit/categories/PerformanceTest.java | 0
.../geode/test/junit/categories/PulseTest.java | 0
.../geode/test/junit/categories/RedisTest.java | 0
.../geode/test/junit/categories/RestAPITest.java | 0
.../geode/test/junit/categories/SecurityTest.java | 0
.../test/junit/categories/SerializationTest.java | 0
.../geode/test/junit/categories/SessionTest.java | 0
.../apache/geode/test/junit/categories/UITest.java | 0
.../geode/test/junit/categories/UnitTest.java | 0
.../geode/test/junit/categories/WanTest.java | 0
.../geode/test/junit/rules/ClientCacheRule.java | 0
.../test/junit/rules/ConditionalIgnoreRule.java | 0
.../test/junit/rules/ConnectionConfiguration.java | 0
.../junit/rules/DescribedExternalResource.java | 0
.../apache/geode/test/junit/rules/DiskDirRule.java | 0
.../test/junit/rules/ExecutorServiceRule.java | 0
.../test/junit/rules/ExpectedTimeoutRule.java | 0
.../geode/test/junit/rules/GfshCommandRule.java | 0
.../geode/test/junit/rules/GfshParserRule.java | 0
.../geode/test/junit/rules/IgnoreUntilRule.java | 0
.../apache/geode/test/junit/rules/JarFileRule.java | 0
.../org/apache/geode/test/junit/rules/Locator.java | 0
.../geode/test/junit/rules/LocatorStarterRule.java | 0
.../junit/rules/MBeanServerConnectionRule.java | 0
.../org/apache/geode/test/junit/rules/Member.java | 0
.../geode/test/junit/rules/MemberStarterRule.java | 0
.../apache/geode/test/junit/rules/RepeatRule.java | 0
.../geode/test/junit/rules/RequiresGeodeHome.java | 0
.../geode/test/junit/rules/RestoreLocaleRule.java | 0
.../geode/test/junit/rules/RestoreTCCLRule.java | 0
.../apache/geode/test/junit/rules/RetryRule.java | 0
.../apache/geode/test/junit/rules/RuleList.java | 0
.../org/apache/geode/test/junit/rules/Server.java | 0
.../geode/test/junit/rules/ServerStarterRule.java | 0
.../geode/test/junit/rules/TemporaryFileRule.java | 0
.../junit/rules/UseJacksonForJsonPathRule.java | 0
.../apache/geode/test/junit/rules/VMProvider.java | 0
.../AccessibleRestoreSystemProperties.java | 0
.../geode/test/junit/rules/gfsh/GfshExecution.java | 0
.../geode/test/junit/rules/gfsh/GfshRule.java | 0
.../geode/test/junit/rules/gfsh/GfshScript.java | 0
.../test/junit/rules/gfsh/internal/OutputLine.java | 0
.../junit/rules/gfsh/internal/ProcessLogger.java | 0
.../junit/rules/gfsh/internal/StreamGobbler.java | 0
.../serializable/FieldSerializationUtils.java | 0
.../serializable/FieldsOfTemporaryFolder.java | 0
.../junit/rules/serializable/FieldsOfTestName.java | 0
.../junit/rules/serializable/FieldsOfTimeout.java | 0
.../serializable/SerializableErrorCollector.java | 0
.../serializable/SerializableExternalResource.java | 0
.../rules/serializable/SerializableRuleList.java | 0
.../rules/serializable/SerializableStatement.java | 0
.../serializable/SerializableTemporaryFolder.java | 0
.../rules/serializable/SerializableTestName.java | 0
.../rules/serializable/SerializableTestRule.java | 0
.../serializable/SerializableTestWatcher.java | 0
.../rules/serializable/SerializableTimeout.java | 0
.../runners/CategoryWithParameterizedRunner.java | 0
.../CategoryWithParameterizedRunnerFactory.java | 0
.../test/junit/runners/ExposedGetAnnotations.java | 0
.../geode/test/junit/runners/SuiteBlockRunner.java | 0
.../geode/test/junit/runners/SuiteRunner.java | 0
.../geode/test/junit/runners/TestRunner.java | 0
.../test/junit/support/DefaultIgnoreCondition.java | 0
.../IgnoreConditionEvaluationException.java | 0
.../test/compiler/ClassNameExtractorTest.java | 0
.../apache/geode/test/compiler/JarBuilderTest.java | 0
.../geode/test/compiler/JavaCompilerTest.java | 0
.../test/compiler/UncompiledSourceCodeTest.java | 0
.../concurrent/FileBasedCountDownLatchTest.java | 0
.../dunit/standalone/VersionManagerJUnitTest.java | 0
.../geode/test/junit/categories/CategoryOne.java | 0
.../geode/test/junit/categories/CategoryTest.java | 0
.../geode/test/junit/categories/CategoryTwo.java | 0
.../rules/ExecutorServiceRuleIntegrationTest.java | 0
.../test/junit/rules/ExecutorServiceRuleTest.java | 0
.../test/junit/rules/ExpectedTimeoutRuleTest.java | 0
.../test/junit/rules/IgnoreUntilRuleTest.java | 0
.../geode/test/junit/rules/RepeatRuleTest.java | 0
.../test/junit/rules/RestoreLocaleRuleTest.java | 0
.../junit/rules/RetryRuleGlobalWithErrorTest.java | 0
.../rules/RetryRuleGlobalWithExceptionTest.java | 0
.../junit/rules/RetryRuleLocalWithErrorTest.java | 0
.../rules/RetryRuleLocalWithExceptionTest.java | 0
.../geode/test/junit/rules/RuleListTest.java | 0
.../test/junit/rules/TemporaryFileRuleTest.java | 0
.../examples/RepeatingTestCasesExampleTest.java | 0
.../junit/rules/examples/RetryRuleExampleTest.java | 0
.../junit/rules/examples/RuleAndClassRuleTest.java | 0
.../SerializableExternalResourceTest.java | 0
.../serializable/SerializableRuleListTest.java | 0
.../SerializableTemporaryFolderTest.java | 0
.../serializable/SerializableTestNameTest.java | 0
.../serializable/SerializableTestWatcherTest.java | 0
.../serializable/SerializableTimeoutTest.java | 0
...CategoryWithParameterizedRunnerFactoryTest.java | 0
.../apache/geode/test/compiler/AbstractClass.java | 0
.../apache/geode/test/compiler/ConcreteClass.java | 0
geode-wan/build.gradle | 5 +-
geode-web-api/build.gradle | 4 +-
geode-web/build.gradle | 10 +-
settings.gradle | 3 +-
264 files changed, 204 insertions(+), 230 deletions(-)
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
index 0469070..2158962 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -31,7 +31,7 @@ dependencies {
exclude group: 'javax.servlet'
}
- testCompile project(path: ':geode-junit')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
jar {
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index 21096f9..75fc2eb 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -37,9 +37,9 @@ dependencies {
testRuntime 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
- testCompile project(path: ':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':extensions/geode-modules').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
+ testCompile project(path: ':extensions/geode-modules', configuration: 'testOutput')
eclipse.classpath.file {
whenMerged { classpath ->
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index b60e458..ffe4b4a 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -38,10 +38,9 @@ dependencies {
testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
testCompile 'javax.security.auth.message:javax.security.auth.message-api:' + '1.1'
- testCompile project(path: ':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':extensions/geode-modules').sourceSets.test.output)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
+ testCompile project(path: ':geode-core', configuration: 'testOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
+ testCompile project(path: ':extensions/geode-modules', configuration: 'testOutput')
eclipse.classpath.file {
whenMerged { classpath ->
@@ -50,4 +49,4 @@ dependencies {
}
}
-disableMavenPublishing()
\ No newline at end of file
+disableMavenPublishing()
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 9796096..7491f43 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -17,7 +17,7 @@
dependencies {
compile project(':geode-core')
-
+
compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
compile ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
exclude module: 'annotations-api'
@@ -30,8 +30,8 @@ dependencies {
testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
testRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
- testCompile project(path: ':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
disableMavenPublishing()
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 6cc68c1..9d165c1 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -69,10 +69,10 @@ dependencies {
archives project(':geode-cq')
archives project(':geode-rebalancer')
- testCompile project(':geode-junit')
testCompile project(':geode-pulse')
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':geode-pulse').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
+ testCompile project(path: ':geode-pulse', configuration: 'testClassesOutput')
testCompile ('org.springframework:spring-web:' + project.'springframework.version') {
exclude module: 'aopalliance'
exclude module: 'spring-aop'
@@ -108,8 +108,6 @@ dependencies {
exclude module: 'spring-core'
exclude module: 'commons-logging'
}
-
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
sourceSets {
@@ -133,7 +131,7 @@ task defaultDistributionConfig(type: JavaExec, dependsOn: classes) {
main 'org.apache.geode.distributed.internal.DefaultPropertiesGenerator'
classpath project(':geode-core').sourceSets.main.runtimeClasspath
workingDir buildDir
-
+
doFirst {
buildDir.mkdirs()
}
@@ -231,7 +229,7 @@ task depsJar (type: Jar, dependsOn: ':geode-core:classes') {
description 'Assembles the jar archive that defines the gemfire classpath.'
archiveName 'geode-dependencies.jar'
doFirst {
- manifest {
+ manifest {
attributes("Class-Path": cp())
}
}
@@ -244,7 +242,7 @@ task gfshDepsJar (type: Jar, dependsOn: ':geode-core:classes') {
archiveName 'gfsh-dependencies.jar'
doFirst {
manifest {
- attributes("Class-Path": cp() +
+ attributes("Class-Path": cp() +
' ' + project(':geode-core').webJar.archiveName +
' ' + configurations.gfshDependencies.collect{ it.getName() }.flatten().join(' ')
)
@@ -340,7 +338,7 @@ distributions {
contents {
duplicatesStrategy 'exclude'
exclude '*.asc'
-
+
exclude '*.asc'
exclude '*-sources.jar'
exclude '*-javadoc.jar'
@@ -351,10 +349,10 @@ distributions {
from defaultCacheConfig
from defaultDistributionConfig
from (project(':geode-core').sourceSets.main.resources.files.find {
- it.name == 'log4j2.xml'
+ it.name == 'log4j2.xml'
})
}
-
+
into ('lib') {
from project(":geode-common").configurations.runtime
from project(":geode-common").configurations.archives.allArtifacts.files
@@ -373,10 +371,10 @@ distributions {
from project(":geode-lucene").configurations.runtime
from project(":geode-lucene").configurations.archives.allArtifacts.files
-
+
from project(":geode-connectors").configurations.runtime
from project(":geode-connectors").configurations.archives.allArtifacts.files
-
+
from project(":geode-old-client-support").configurations.runtime
from project(":geode-old-client-support").configurations.archives.allArtifacts.files
@@ -459,11 +457,11 @@ build.dependsOn installDist
installDist.dependsOn ':extensions/geode-modules-assembly:dist'
distributedTest.dependsOn ':extensions/session-testing-war:war'
-distributedTest.dependsOn ':geode-old-versions:build'
+distributedTest.dependsOn ':geode-test:build'
/**Print the names of all jar files in a fileTree */
def printJars(tree) {
- tree.matching {include("**/*.jar")}.visit{ file ->
+ tree.matching {include("**/*.jar")}.visit{ file ->
if(!file.isDirectory()) {
println file.name
}
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 8b17e2e..da4cd5b 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
@@ -44,7 +44,7 @@ public class GfshRuleTest {
@Test
public void checkGfsh130() {
assertThat(gfsh130.getGfshPath().toString())
- .contains("geode-old-versions/build/apache-geode-1.3.0/bin/gfsh");
+ .contains("geode-test/build/apache-geode-1.3.0/bin/gfsh");
}
}
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
index 45a2aad..37c7275 100755
--- a/geode-common/build.gradle
+++ b/geode-common/build.gradle
@@ -16,5 +16,5 @@
*/
dependencies {
- testCompile project(':geode-junit')
+ testCompile project(':geode-test')
}
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index c5423b9..93d48c2 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -27,9 +27,6 @@ dependencies {
compile project(':geode-common')
compile group: 'com.zaxxer', name: 'HikariCP', version: project.'HikariCP.version'
-
- testCompile project(':geode-junit')
-
//Connectors test framework.
testRuntime 'org.apache.derby:derby:' + project.'derby.version'
testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
@@ -37,8 +34,8 @@ dependencies {
testCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.31.1'
testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
integrationTest.forkEvery 0
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 3adeebb..5365dac 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -26,11 +26,17 @@ sourceSets {
}
}
-
-
configurations {
//declaring new configuration that will be used to associate with artifacts
archives
+ classesOutput {
+ extendsFrom compile
+ description 'a dependency that exposes the compiled classes'
+ }
+ testClassesOutput {
+ extendsFrom compile
+ description 'a dependency that exposes the compiled test classes'
+ }
}
dependencies {
@@ -130,11 +136,11 @@ dependencies {
jcaCompile sourceSets.main.output
- testCompile project(':geode-junit')
-
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
-
// Test Dependencies
+ testCompile(project(path: ':geode-test')) {
+ transitive = false
+ }
+
// External
testCompile 'com.jayway.jsonpath:json-path-assert:' + project.'json-path-assert.version'
testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
@@ -155,6 +161,9 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
+
+ classesOutput sourceSets.main.output
+ testClassesOutput sourceSets.test.output
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -229,16 +238,4 @@ task jcaJar (type: Jar, dependsOn: raJar) {
from raJar.archivePath
}
-configurations {
- classesOutput {
- extendsFrom compile
- description 'a dependency that exposes the compiled classes'
- }
-}
-
-dependencies {
- classesOutput sourceSets.main.output
-}
-
tasks.eclipse.dependsOn(generateGrammarSource)
-
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 3fcf817..f0f0df7 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -18,7 +18,6 @@
dependencies {
provided project(':geode-core')
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
- testCompile project(':geode-junit')
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
index 1a4badc..7a5affe 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -21,7 +21,7 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
testCompile project(':geode-core')
- testCompile project(':geode-junit')
+ testCompile project(':geode-test')
testCompile project(':geode-protobuf')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
}
diff --git a/geode-json/build.gradle b/geode-json/build.gradle
index 722244a..a463a5b 100644
--- a/geode-json/build.gradle
+++ b/geode-json/build.gradle
@@ -16,5 +16,5 @@
*/
dependencies {
- testCompile project(':geode-junit')
-}
\ No newline at end of file
+ testCompile project(':geode-test')
+}
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
deleted file mode 100755
index d467f0a..0000000
--- a/geode-junit/build.gradle
+++ /dev/null
@@ -1,39 +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.
- */
-
-dependencies {
- compile ('com.github.stefanbirkner:system-rules:' + project.'system-rules.version') {
- exclude module: 'junit-dep'
- }
- compile 'com.jayway.jsonpath:json-path:' + project.'json-path.version'
- testCompile 'commons-lang:commons-lang:' + project.'commons-lang.version'
- testCompile 'com.google.guava:guava:' + project.'guava.version'
- compile 'org.assertj:assertj-core:' + project.'assertj-core.version'
- compile 'commons-io:commons-io:' + project.'commons-io.version'
- compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
- compile 'com.google.guava:guava:' + project.'guava.version'
- compile 'org.mockito:mockito-core:' + project.'mockito-core.version'
- compile 'org.awaitility:awaitility:' + project.'awaitility.version'
- compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
- compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
-
- compile('junit:junit:' + project.'junit.version') {
- exclude module: 'hamcrest-core'
- }
- compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
- compile project(":geode-old-versions")
-}
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index f86eb5d..5c7e645 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -27,17 +27,14 @@ dependencies {
exclude module: 'lucene-sandbox'
}
- testCompile project(':geode-junit')
-
//Lucene test framework.
testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
testCompile 'org.apache.lucene:lucene-codecs:' + project.'lucene.version'
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'
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
-
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
//The lucene integration tests don't have any issues that requiring forking
diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
index f5d967a..1af65d7 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -19,8 +19,6 @@ dependencies {
compile project(':geode-core')
compile project(':geode-common')
- testCompile project(':geode-junit')
-
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
deleted file mode 100644
index e01a048..0000000
--- a/geode-old-versions/build.gradle
+++ /dev/null
@@ -1,100 +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.
- */
-
-
-disableMavenPublishing()
-
-project.ext.installs = new Properties();
-
-dependencies {
- testCompile project(":geode-junit")
-}
-
-def addOldVersion(def source, def geodeVersion, def downloadInstall) {
- sourceSets.create(source, {
- compileClasspath += configurations.provided
- runtimeClasspath += configurations.provided
- })
-
- dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion"
- dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion"
-
- if (downloadInstall) {
- configurations.create("${source}OldInstall")
-
- dependencies.add "${source}OldInstall", "org.apache.geode:apache-geode:$geodeVersion"
-
- project.ext.installs.setProperty(source, "$buildDir/apache-geode-${geodeVersion}")
- task "downloadAndUnzipFile${geodeVersion}"(type: Copy) {
- from zipTree(configurations["${source}OldInstall"].singleFile)
- into buildDir
- }
-
- createGeodeClasspathsFile.dependsOn tasks["downloadAndUnzipFile${geodeVersion}"]
- }
-}
-
-
-def generatedResources = "$buildDir/generated-resources/main"
-
-sourceSets {
- main {
- output.dir(generatedResources, builtBy: 'createGeodeClasspathsFile')
- }
-}
-
-task createGeodeClasspathsFile {
- File classpathsFile = file("$generatedResources/geodeOldVersionClasspaths.txt")
- File installsFile = file("$generatedResources/geodeOldVersionInstalls.txt")
- outputs.file(classpathsFile)
- outputs.file(installsFile)
-
- doLast {
- Properties versions = new Properties();
- project(':geode-old-versions').sourceSets.each {
- versions.setProperty(it.name,it.runtimeClasspath.getAsPath())
- }
-
- classpathsFile.getParentFile().mkdirs();
-
- new FileOutputStream(classpathsFile).withStream { fos ->
- versions.store(fos, '')
- }
-
- installsFile.getParentFile().mkdirs();
-
- new FileOutputStream(installsFile).withStream { fos ->
- project.ext.installs.store(fos, '')
- }
- }
-
- // Add sourceSets for backwards compatibility, rolling upgrade, and
- // pdx testing.
- addOldVersion('test100', '1.0.0-incubating', false)
- addOldVersion('test110', '1.1.0', false)
- addOldVersion('test111', '1.1.1', false)
- addOldVersion('test120', '1.2.0', true)
- addOldVersion('test130', '1.3.0', true)
- addOldVersion('test140', '1.4.0', true)
- addOldVersion('test150', '1.5.0', true)
- addOldVersion('test160', '1.6.0', true)
-}
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 52f67bf..da9b575 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -19,13 +19,12 @@ dependencies {
provided project(':geode-core')
compile project(':geode-protobuf-messages')
- testCompile project(':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
testCompile 'org.powermock:powermock-core:' + project.'powermock.version'
testCompile 'org.powermock:powermock-module-junit4:' + project.'powermock.version'
testCompile 'org.powermock:powermock-api-mockito:' + project.'powermock.version'
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 2d6dd18..b04cdc5 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -27,6 +27,13 @@ sourceSets {
}
}
+configurations {
+ testClassesOutput {
+ extendsFrom compile
+ description 'a dependency that exposes the compiled test classes'
+ }
+}
+
dependencies {
compile 'org.springframework:spring-beans:' + project.'springframework.version'
@@ -75,9 +82,8 @@ dependencies {
provided 'org.mortbay.jetty:servlet-api:' + project.'mortbay-jetty-servlet-api.version'
provided 'com.google.guava:guava:' + project.'guava.version'
- testCompile project(':geode-junit')
- testCompile project(':geode-core')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
testCompile 'org.seleniumhq.selenium:selenium-api:' + project.'selenium.version'
testCompile 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
@@ -88,6 +94,8 @@ dependencies {
testRuntime 'com.google.code.gson:gson:' + project.'google-gson.version'
testRuntime 'org.apache.commons:commons-exec:' + project.'commons-exec.version'
testRuntime 'com.jayway.jsonpath:json-path:' + project.'json-path.version'
+
+ testClassesOutput sourceSets.test.output
}
def generatedResources = "$buildDir/generated-resources/main"
@@ -145,4 +153,3 @@ task uiTest(type:Test) {
uiTest.dependsOn war
uiTest.finalizedBy rootProject.combineReports
rootProject.combineReports.mustRunAfter uiTest
-
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index cf129a5..181ad8f 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -24,5 +24,5 @@ dependencies {
exclude module: 'spring-expression'
exclude module: 'spring-aop'
}
- testCompile project(':geode-junit')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
diff --git a/geode-test/build.gradle b/geode-test/build.gradle
new file mode 100755
index 0000000..ccb6655
--- /dev/null
+++ b/geode-test/build.gradle
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+project.ext.installs = new Properties();
+
+dependencies {
+ compile project(path: ':geode-core', configuration: 'runtime')
+ compile project(':geode-json')
+
+ compile 'com.jayway.jsonpath:json-path:' + project.'json-path.version'
+ compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
+ compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
+ compile 'commons-io:commons-io:' + project.'commons-io.version'
+ compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
+ compile ('org.springframework.shell:spring-shell:' + project.'spring-shell.version') {
+ exclude module: 'aopalliance'
+ exclude module: 'asm'
+ exclude module: 'cglib'
+ exclude module: 'guava'
+ exclude module: 'spring-aop'
+ exclude module: 'spring-context-support'
+ ext.optional = true
+ }
+ compile 'com.google.guava:guava:' + project.'guava.version'
+ compile ('com.github.stefanbirkner:system-rules:' + project.'system-rules.version') {
+ exclude module: 'junit-dep'
+ }
+
+ compile 'org.assertj:assertj-core:' + project.'assertj-core.version'
+ compile 'org.mockito:mockito-core:' + project.'mockito-core.version'
+ compile 'org.awaitility:awaitility:' + project.'awaitility.version'
+
+ compile 'eu.codearte.catch-exception:catch-exception:' + project.'catch-exception.version'
+ compile 'eu.codearte.catch-exception:catch-throwable:' + project.'catch-throwable.version'
+
+ compile('junit:junit:' + project.'junit.version') {
+ exclude module: 'hamcrest-core'
+ }
+}
+
+def addOldVersion(def source, def geodeVersion, def downloadInstall) {
+ sourceSets.create(source, {
+ compileClasspath += configurations.provided
+ runtimeClasspath += configurations.provided
+ })
+
+ dependencies.add "${source}Compile", "org.apache.geode:geode-common:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-core:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-lucene:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-old-client-support:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-wan:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-cq:$geodeVersion"
+ dependencies.add "${source}Compile", "org.apache.geode:geode-rebalancer:$geodeVersion"
+
+ if (downloadInstall) {
+ configurations.create("${source}OldInstall")
+
+ dependencies.add "${source}OldInstall", "org.apache.geode:apache-geode:$geodeVersion"
+
+ project.ext.installs.setProperty(source, "$buildDir/apache-geode-${geodeVersion}")
+ task "downloadAndUnzipFile${geodeVersion}"(type: Copy) {
+ from zipTree(configurations["${source}OldInstall"].singleFile)
+ into buildDir
+ }
+
+ createGeodeClasspathsFile.dependsOn tasks["downloadAndUnzipFile${geodeVersion}"]
+ }
+}
+
+
+def generatedResources = "$buildDir/generated-resources/main"
+
+sourceSets {
+ main {
+ output.dir(generatedResources, builtBy: 'createGeodeClasspathsFile')
+ }
+}
+
+task createGeodeClasspathsFile {
+ File classpathsFile = file("$generatedResources/geodeOldVersionClasspaths.txt")
+ File installsFile = file("$generatedResources/geodeOldVersionInstalls.txt")
+ outputs.file(classpathsFile)
+ outputs.file(installsFile)
+
+ doLast {
+ Properties versions = new Properties();
+ project.sourceSets.each {
+ versions.setProperty(it.name,it.runtimeClasspath.getAsPath())
+ }
+
+ classpathsFile.getParentFile().mkdirs();
+
+ new FileOutputStream(classpathsFile).withStream { fos ->
+ versions.store(fos, '')
+ }
+
+ installsFile.getParentFile().mkdirs();
+
+ new FileOutputStream(installsFile).withStream { fos ->
+ project.ext.installs.store(fos, '')
+ }
+ }
+
+ // Add sourceSets for backwards compatibility, rolling upgrade, and
+ // pdx testing.
+ addOldVersion('test100', '1.0.0-incubating', false)
+ addOldVersion('test110', '1.1.0', false)
+ addOldVersion('test111', '1.1.1', false)
+ addOldVersion('test120', '1.2.0', true)
+ addOldVersion('test130', '1.3.0', true)
+ addOldVersion('test140', '1.4.0', true)
+ addOldVersion('test150', '1.5.0', true)
+ addOldVersion('test160', '1.6.0', true)
+}
diff --git a/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java b/geode-test/src/main/java/batterytest/greplogs/ExpectedStrings.java
similarity index 100%
rename from geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
rename to geode-test/src/main/java/batterytest/greplogs/ExpectedStrings.java
diff --git a/geode-core/src/test/java/batterytest/greplogs/LogConsumer.java b/geode-test/src/main/java/batterytest/greplogs/LogConsumer.java
similarity index 100%
rename from geode-core/src/test/java/batterytest/greplogs/LogConsumer.java
rename to geode-test/src/main/java/batterytest/greplogs/LogConsumer.java
diff --git a/geode-core/src/test/java/hydra/MethExecutor.java b/geode-test/src/main/java/hydra/MethExecutor.java
similarity index 100%
rename from geode-core/src/test/java/hydra/MethExecutor.java
rename to geode-test/src/main/java/hydra/MethExecutor.java
diff --git a/geode-core/src/test/java/hydra/MethExecutorResult.java b/geode-test/src/main/java/hydra/MethExecutorResult.java
similarity index 100%
rename from geode-core/src/test/java/hydra/MethExecutorResult.java
rename to geode-test/src/main/java/hydra/MethExecutorResult.java
diff --git a/geode-core/src/test/java/hydra/SchedulingOrder.java b/geode-test/src/main/java/hydra/SchedulingOrder.java
similarity index 100%
rename from geode-core/src/test/java/hydra/SchedulingOrder.java
rename to geode-test/src/main/java/hydra/SchedulingOrder.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache/query/QueryTestUtils.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java b/geode-test/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache/util/TxEventTestUtil.java
rename to geode-test/src/main/java/org/apache/geode/cache/util/TxEventTestUtil.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/CacheSerializableRunnable.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/ClientServerTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/RegionTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/TestCacheCallback.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/TestCacheListener.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/TestCacheLoader.java
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/cache30/TestCacheWriter.java
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java b/geode-test/src/main/java/org/apache/geode/internal/AvailablePortHelper.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/AvailablePortHelper.java
rename to geode-test/src/main/java/org/apache/geode/internal/AvailablePortHelper.java
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java b/geode-test/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
rename to geode-test/src/main/java/org/apache/geode/management/internal/cli/HeadlessGfsh.java
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/ResultHandler.java b/geode-test/src/main/java/org/apache/geode/management/internal/cli/ResultHandler.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/ResultHandler.java
rename to geode-test/src/main/java/org/apache/geode/management/internal/cli/ResultHandler.java
diff --git a/geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java b/geode-test/src/main/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
rename to geode-test/src/main/java/org/apache/geode/security/templates/UserPasswordAuthInit.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java b/geode-test/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/ClassBuilder.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/ClassNameExtractor.java b/geode-test/src/main/java/org/apache/geode/test/compiler/ClassNameExtractor.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/ClassNameExtractor.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/ClassNameExtractor.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/CompiledSourceCode.java b/geode-test/src/main/java/org/apache/geode/test/compiler/CompiledSourceCode.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/CompiledSourceCode.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/CompiledSourceCode.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/JarBuilder.java b/geode-test/src/main/java/org/apache/geode/test/compiler/JarBuilder.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/JarBuilder.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/JarBuilder.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/JavaCompiler.java b/geode-test/src/main/java/org/apache/geode/test/compiler/JavaCompiler.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/JavaCompiler.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/JavaCompiler.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/compiler/UncompiledSourceCode.java b/geode-test/src/main/java/org/apache/geode/test/compiler/UncompiledSourceCode.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/compiler/UncompiledSourceCode.java
rename to geode-test/src/main/java/org/apache/geode/test/compiler/UncompiledSourceCode.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/concurrent/FileBasedCountDownLatch.java b/geode-test/src/main/java/org/apache/geode/test/concurrent/FileBasedCountDownLatch.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/concurrent/FileBasedCountDownLatch.java
rename to geode-test/src/main/java/org/apache/geode/test/concurrent/FileBasedCountDownLatch.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Assert.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/Disconnect.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestCase.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/DistributedTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/SerializableCallableIF.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/SerializableRunnable.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/cache/CacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/cache/examples/CacheTestCaseExampleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/CacheTestFixture.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/examples/AsyncInvokeCallableExampleTest.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/internal/DUnitBlackboardDUnitTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/DistributedTestFixture.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
similarity index 98%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
rename to geode-test/src/main/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
index c8af8a9..e01e1f3 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java
+++ b/geode-test/src/main/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/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedUseJacksonForJsonPathRule.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/rules/SharedErrorCollector.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/CacheRuleBuilderDistributedTest.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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/MemberStarterRuleTest.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/rules/tests/MemberStarterRuleTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/SharedCountersRuleDistributedTest.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/rules/tests/SharedErrorCollectorDistributedTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/BounceResult.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/standalone/StandAloneDUnitEnv.java
diff --git a/geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java b/geode-test/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
similarity index 100%
rename from geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
rename to geode-test/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/tests/BasicDistributedTest.java b/geode-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/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-test/src/main/java/org/apache/geode/test/dunit/tests/VMDistributedTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/ConditionalIgnore.java b/geode-test/src/main/java/org/apache/geode/test/junit/ConditionalIgnore.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/ConditionalIgnore.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/ConditionalIgnore.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/IgnoreCondition.java b/geode-test/src/main/java/org/apache/geode/test/junit/IgnoreCondition.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/IgnoreCondition.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/IgnoreCondition.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/IgnoreUntil.java b/geode-test/src/main/java/org/apache/geode/test/junit/IgnoreUntil.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/IgnoreUntil.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/IgnoreUntil.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java b/geode-test/src/main/java/org/apache/geode/test/junit/Repeat.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/Repeat.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/Repeat.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/ResultCaptor.java b/geode-test/src/main/java/org/apache/geode/test/junit/ResultCaptor.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/ResultCaptor.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/ResultCaptor.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java b/geode-test/src/main/java/org/apache/geode/test/junit/Retry.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/Retry.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/Retry.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java b/geode-test/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/assertions/CommandResultExecution.java b/geode-test/src/main/java/org/apache/geode/test/junit/assertions/CommandResultExecution.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/assertions/CommandResultExecution.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/assertions/CommandResultExecution.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AEQTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/AEQTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/AEQTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/AEQTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/BackwardCompatibilityTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/BackwardCompatibilityTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/BackwardCompatibilityTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/BackwardCompatibilityTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ContainerTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/ContainerTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/ContainerTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/ContainerTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DistributedTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/DistributedTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/DistributedTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/DistributedTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DistributedTransactionsTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/DistributedTransactionsTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/DistributedTransactionsTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/DistributedTransactionsTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/FunctionServiceTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/GfshTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/GfshTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/GfshTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/GfshTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/HydraTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/HydraTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/HydraTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/HydraTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/IntegrationTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/IntegrationTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/IntegrationTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/IntegrationTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/LuceneTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/LuceneTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/LuceneTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/LuceneTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ManagementTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/ManagementTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/ManagementTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/ManagementTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/OQLIndexTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/OQLQueryTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/PerformanceTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/PerformanceTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/PerformanceTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/PerformanceTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/PulseTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/PulseTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/PulseTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/PulseTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SecurityTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/SecurityTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/SecurityTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/SecurityTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/SessionTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/UITest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/UITest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/UITest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/UnitTest.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/WanTest.java b/geode-test/src/main/java/org/apache/geode/test/junit/categories/WanTest.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/categories/WanTest.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/categories/WanTest.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/ClientCacheRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/ClientCacheRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/ClientCacheRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/ClientCacheRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/ConditionalIgnoreRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/ConnectionConfiguration.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/ConnectionConfiguration.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/ConnectionConfiguration.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/ConnectionConfiguration.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/DescribedExternalResource.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/DiskDirRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/DiskDirRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/DiskDirRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ExecutorServiceRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/ExecutorServiceRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/ExecutorServiceRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/ExecutorServiceRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/junit/rules/GfshCommandRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshParserRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshParserRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/IgnoreUntilRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/JarFileRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/JarFileRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/JarFileRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/JarFileRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/Locator.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/Locator.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/Locator.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/Locator.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/MBeanServerConnectionRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/MBeanServerConnectionRule.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/MBeanServerConnectionRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/MBeanServerConnectionRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/Member.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/Member.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/Member.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/Member.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/MemberStarterRule.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/junit/rules/MemberStarterRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RepeatRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RequiresGeodeHome.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RequiresGeodeHome.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RequiresGeodeHome.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RequiresGeodeHome.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RestoreLocaleRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreTCCLRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RestoreTCCLRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RestoreTCCLRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RestoreTCCLRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RetryRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/RuleList.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/Server.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/Server.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/Server.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/Server.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/ServerStarterRule.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/junit/rules/ServerStarterRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/UseJacksonForJsonPathRule.java
diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/VMProvider.java b/geode-test/src/main/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-test/src/main/java/org/apache/geode/test/junit/rules/VMProvider.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/accessible/AccessibleRestoreSystemProperties.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/accessible/AccessibleRestoreSystemProperties.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/accessible/AccessibleRestoreSystemProperties.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/accessible/AccessibleRestoreSystemProperties.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshExecution.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshExecution.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshExecution.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshExecution.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/GfshScript.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/OutputLine.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/OutputLine.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/OutputLine.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/OutputLine.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/ProcessLogger.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/ProcessLogger.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/ProcessLogger.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/ProcessLogger.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/StreamGobbler.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/StreamGobbler.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/StreamGobbler.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/gfsh/internal/StreamGobbler.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldSerializationUtils.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldSerializationUtils.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldSerializationUtils.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldSerializationUtils.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTemporaryFolder.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTestName.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/FieldsOfTimeout.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableErrorCollector.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResource.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleList.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableStatement.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolder.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestName.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestRule.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestRule.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestRule.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestRule.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcher.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcher.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcher.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcher.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java b/geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeout.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunner.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunner.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunner.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunner.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactory.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactory.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactory.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactory.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/ExposedGetAnnotations.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/ExposedGetAnnotations.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/ExposedGetAnnotations.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/ExposedGetAnnotations.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/SuiteBlockRunner.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/SuiteRunner.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java b/geode-test/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/runners/TestRunner.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java b/geode-test/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/support/DefaultIgnoreCondition.java
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/support/IgnoreConditionEvaluationException.java b/geode-test/src/main/java/org/apache/geode/test/junit/support/IgnoreConditionEvaluationException.java
similarity index 100%
rename from geode-junit/src/main/java/org/apache/geode/test/junit/support/IgnoreConditionEvaluationException.java
rename to geode-test/src/main/java/org/apache/geode/test/junit/support/IgnoreConditionEvaluationException.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java b/geode-test/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
rename to geode-test/src/test/java/org/apache/geode/test/compiler/ClassNameExtractorTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java b/geode-test/src/test/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-test/src/test/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-test/src/test/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-test/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java b/geode-test/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
rename to geode-test/src/test/java/org/apache/geode/test/compiler/UncompiledSourceCodeTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java b/geode-test/src/test/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-test/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java
diff --git a/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-test/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
similarity index 100%
rename from geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
rename to geode-test/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryOne.java b/geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryOne.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryOne.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryOne.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTwo.java b/geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryTwo.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/categories/CategoryTwo.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/categories/CategoryTwo.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-test/src/test/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-test/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/IgnoreUntilRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RepeatRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RestoreLocaleRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithErrorTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleGlobalWithExceptionTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithErrorTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RetryRuleLocalWithExceptionTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/RuleListTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java b/geode-test/src/test/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-test/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RepeatingTestCasesExampleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RetryRuleExampleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/examples/RuleAndClassRuleTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableExternalResourceTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableRuleListTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTemporaryFolderTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestNameTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTestWatcherTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/rules/serializable/SerializableTimeoutTest.java
diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java b/geode-test/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
similarity index 100%
rename from geode-junit/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
rename to geode-test/src/test/java/org/apache/geode/test/junit/runners/CategoryWithParameterizedRunnerFactoryTest.java
diff --git a/geode-junit/src/test/resources/org/apache/geode/test/compiler/AbstractClass.java b/geode-test/src/test/resources/org/apache/geode/test/compiler/AbstractClass.java
similarity index 100%
rename from geode-junit/src/test/resources/org/apache/geode/test/compiler/AbstractClass.java
rename to geode-test/src/test/resources/org/apache/geode/test/compiler/AbstractClass.java
diff --git a/geode-junit/src/test/resources/org/apache/geode/test/compiler/ConcreteClass.java b/geode-test/src/test/resources/org/apache/geode/test/compiler/ConcreteClass.java
similarity index 100%
rename from geode-junit/src/test/resources/org/apache/geode/test/compiler/ConcreteClass.java
rename to geode-test/src/test/resources/org/apache/geode/test/compiler/ConcreteClass.java
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index abdb95a..f0f0df7 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -18,7 +18,6 @@
dependencies {
provided project(':geode-core')
- testCompile files(project(':geode-core').sourceSets.test.output)
- testCompile project(':geode-junit')
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
}
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 9a6d592..c27dd31 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -56,8 +56,8 @@ dependencies {
exclude module: 'spring-beans'
}
- testCompile project(':geode-junit')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
provided 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
provided project(':geode-core')
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index f21d7c8..07fa4ff 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -45,21 +45,19 @@ dependencies {
}
provided 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
-
+
// have to use output since we exclude the dependent classes from jar :(
provided project(path: ':geode-core', configuration: 'classesOutput')
-
- testCompile project(':geode-junit')
+
testRuntime project(':geode-common')
- testRuntime project(':geode-core')
- testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile project(path: ':geode-core', configuration: 'testClassesOutput')
+ testCompile project(path: ':geode-test', configuration: 'runtime')
testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
testCompile 'com.pholser:junit-quickcheck-guava:' + project.'junit-quickcheck.version'
testRuntime files(war.destinationDir)
- testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
//Remove the gradle output directories from the eclipse classpath. These
diff --git a/settings.gradle b/settings.gradle
index 74c1811..ab01d47 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,10 +16,9 @@
*/
rootProject.name = 'geode'
-include 'geode-old-versions'
include 'geode-common'
+include 'geode-test'
include 'geode-json'
-include 'geode-junit'
include 'geode-core'
include 'geode-web'
include 'geode-web-api'
--
To stop receiving notification emails like this one, please contact
sai_boorlagadda@apache.org.