This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76ad7b43890863669fda0a53d692086093227041 Author: Jacob Barrett <[email protected]> AuthorDate: Mon Jul 2 22:37:03 2018 -0700 GEODE-5363: Moves geode-assembly tests into new source sets. --- geode-assembly/build.gradle | 56 ++++++++++++++++++++++ .../cli/commands/ConfigureEvictionThroughGfsh.java | 0 .../cli/commands/ConnectCommandAcceptanceTest.java | 0 .../cli/commands/DeployWithLargeJarTest.java | 0 .../cli/commands/DestroyIndexIfExistsTest.java | 0 .../cli/commands/GfshStartLocatorLogTest.java | 0 .../cli/commands/ImportClusterConfigTest.java | 0 ...scribeConfigAreFullyRedactedAcceptanceTest.java | 0 .../cli/commands/PutCommandWithJsonTest.java | 0 .../cli/commands/StartLocatorAcceptanceTest.java | 0 .../cli/commands/StatusLocatorRealGfshTest.java | 0 .../cli/commands/StopServerAcceptanceTest.java | 0 .../StopServerWithSecurityAcceptanceTest.java | 0 .../cli/shell/GfshDisconnectWithinScript.java | 0 .../shell/StatusLocatorExitCodeAcceptanceTest.java | 0 .../shell/StatusServerExitCodeAcceptanceTest.java | 0 .../LauncherLifecycleCommandsDUnitTest.java | 0 .../internal/web/RestFunctionExecuteDUnitTest.java | 0 .../RestAPIOnRegionFunctionExecutionDUnitTest.java | 0 .../internal/web/controllers/RestAPITestBase.java | 0 .../controllers/RestAPIsAndInterOpsDUnitTest.java | 0 ...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 0 ...estAPIsOnMembersFunctionExecutionDUnitTest.java | 0 .../web/controllers/RestAPIsWithSSLDUnitTest.java | 0 .../apache/geode/session/tests/CargoTestBase.java | 0 .../tests/GenericAppServerClientServerTest.java | 0 .../tests/Jetty9CachingClientServerTest.java | 0 .../session/tests/Jetty9ClientServerTest.java | 0 .../org/apache/geode/session/tests/Jetty9Test.java | 0 .../session/tests/Tomcat6ClientServerTest.java | 0 .../apache/geode/session/tests/Tomcat6Test.java | 0 .../session/tests/Tomcat7ClientServerTest.java | 0 .../apache/geode/session/tests/Tomcat7Test.java | 0 .../session/tests/Tomcat8ClientServerTest.java | 0 .../apache/geode/session/tests/Tomcat8Test.java | 0 .../session/tests/TomcatClientServerTest.java | 0 .../TomcatSessionBackwardsCompatibilityTest.java | 0 .../org/apache/geode/BundledJarsJUnitTest.java | 0 .../management/internal/AgentUtilJUnitTest.java | 0 .../cli/commands/GemfireCoreClasspathTest.java | 0 .../StartLocatorCommandIntegrationTest.java | 0 .../StartServerCommandIntegrationTest.java | 0 .../internal/web/RestInterfaceIntegrationTest.java | 0 .../internal/web/RestSecurityIntegrationTest.java | 0 .../web/RestSecurityPostProcessorTest.java | 0 .../rest/internal/web/RestSecurityWithSSLTest.java | 0 .../internal/web/RestServersIntegrationTest.java | 0 .../web/SwaggerVerificationIntegrationTest.java | 0 .../PdxBasedCrudControllerIntegrationTest.java | 0 .../RestQueryAndFunctionIntegrationTest.java | 0 .../geode/tools/pulse/PulseConnectivityTest.java | 0 .../geode/tools/pulse/PulseDataExportTest.java | 0 .../tools/pulse/PulseJmxPasswordFileTest.java | 0 .../tools/pulse/PulseSecurityIntegrationTest.java | 0 .../geode/tools/pulse/PulseSecurityTest.java | 0 .../tools/pulse/PulseSecurityWithSSLTest.java | 0 .../tools/pulse/ui/PulseAcceptanceAuthTest.java | 0 .../tools/pulse/ui/PulseAcceptanceNoAuthTest.java | 0 58 files changed, 56 insertions(+) diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index 8609535..3d3f469 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -490,3 +490,59 @@ task dumpInstalledJars(dependsOn: installDist) { }; } } + +configurations { + integrationTestCompile.extendsFrom testCompile + integrationTestRuntime.extendsFrom testRuntime + distributedTestCompile.extendsFrom testCompile + distributedTestRuntime.extendsFrom testRuntime + acceptanceTestCompile.extendsFrom testCompile + acceptanceTestRuntime.extendsFrom testRuntime + uiTestCompile.extendsFrom testCompile + uiTestRuntime.extendsFrom testRuntime +} + +sourceSets { + integrationTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/integrationTest/java') + } + resources.srcDir file('src/integrationTest/resources') + } + distributedTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/distributedTest/java') + } + resources.srcDir file('src/distributedTest/resources') + } + acceptanceTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/acceptanceTest/java') + } + resources.srcDir file('src/acceptanceTest/resources') + } + uiTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/uiTest/java') + } + resources.srcDir file('src/uiTest/resources') + } +} + +dependencies { + // TODO build - move dunit framework to shared module. + integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output) + distributedTestCompile files(project(':geode-core').sourceSets.distributedTest.output) + distributedTestCompile files(project(':geode-core').sourceSets.integrationTest.output) + acceptanceTestCompile files(project(':geode-core').sourceSets.distributedTest.output) + uiTestCompile files(project(':geode-core').sourceSets.distributedTest.output) + uiTestCompile files(project(':geode-core').sourceSets.integrationTest.output) +} diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java rename to geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/RestFunctionExecuteDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/CargoTestBase.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9CachingClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9ClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9Test.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Jetty9Test.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Jetty9Test.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat6Test.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat7Test.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/Tomcat8Test.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatClientServerTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java rename to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartServerCommandIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestInterfaceIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityPostProcessorTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestSecurityWithSSLTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/RestServersIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/SwaggerVerificationIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudControllerIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestQueryAndFunctionIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseConnectivityTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseDataExportTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseDataExportTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseJmxPasswordFileTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityIntegrationTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java rename to geode-assembly/src/integrationTest/java/org/apache/geode/tools/pulse/PulseSecurityWithSSLTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java rename to geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceAuthTest.java diff --git a/geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java b/geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java similarity index 100% rename from geode-assembly/src/test/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java rename to geode-assembly/src/uiTest/java/org/apache/geode/tools/pulse/ui/PulseAcceptanceNoAuthTest.java
