This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ad28899f9c7cac0a67ca46610640b2fa9bc25ddb
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Tue Jul 3 07:15:58 2018 -0700
GEODE-5363: Moves geode-web tests into new source sets.
---
geode-web/build.gradle | 35 ++++++++++++++++++++++
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 0
.../commands/ClusterConfigurationDUnitTest.java | 0
.../cli/commands/CommandOverHttpDUnitTest.java | 0
.../cli/commands/ConnectCommandWithSSLTest.java | 0
.../commands/DescribeConfigCommandDUnitTest.java | 0
...xecuteFunctionCommandWithSecurityDUnitTest.java | 0
.../cli/commands/ExportConfigCommandDUnitTest.java | 0
.../commands/ExportLogsStatsOverHttpDUnitTest.java | 0
.../FunctionCommandsOverHttpDUnitTest.java | 0
.../ListIndexCommandOverHttpDUnitTest.java | 0
.../RebalanceCommandOverHttpDistributedTest.java | 0
.../commands/ShutdownCommandOverHttpDUnitTest.java | 0
.../internal/cli/commands/CommandOverHttpTest.java | 0
.../commands/ConnectCommandIntegrationTest.java | 0
.../commands/ConnectCommandWithSecurityTest.java | 0
.../ExportLogsOverHttpIntegrationTest.java | 0
.../cli/commands/IndexCommandOverHttpTest.java | 0
.../cli/commands/QueryCommandOverHttpTest.java | 0
.../security/GfshCommandsOverHttpSecurityTest.java | 0
.../internal/security/LogNoPasswordTest.java | 0
.../HttpOperationInvokerMBeanOperationTest.java | 0
.../shell/HttpOperationInvokerSecurityTest.java | 0
23 files changed, 35 insertions(+)
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 736fd00..d931535 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -78,6 +78,40 @@ idea.module.iml {
}
}
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+ distributedTestCompile.extendsFrom testCompile
+ distributedTestRuntime.extendsFrom testRuntime
+}
+
+sourceSets {
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ resources.srcDir file('src/integrationTest/resources')
+ }
+ distributedTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/distributedTest/java')
+ }
+ resources.srcDir file('src/distributedTest/resources')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ integrationTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+}
+
distributedTest {
dependsOn war
}
@@ -92,3 +126,4 @@ war {
classpath configurations.runtime
classpath project(':geode-core').webJar.archivePath
}
+
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeCommandDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ClusterConfigurationDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSSLTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommandDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommandWithSecurityDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommandDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsStatsOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/FunctionCommandsOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/RebalanceCommandOverHttpDistributedTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
b/geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
rename to
geode-web/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShutdownCommandOverHttpDUnitTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandIntegrationTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandWithSecurityTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpIntegrationTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/IndexCommandOverHttpTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/QueryCommandOverHttpTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/security/LogNoPasswordTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerMBeanOperationTest.java
diff --git
a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
b/geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
similarity index 100%
rename from
geode-web/src/test/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
rename to
geode-web/src/integrationTest/java/org/apache/geode/management/internal/web/shell/HttpOperationInvokerSecurityTest.java
