You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/07/11 16:13:24 UTC
[geode] 17/46: GEODE-5363: Moves geode-modules-tomcat7 tests into
new source sets.
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 c391aa6cd71a88d74b313aaa31aa6e4f28e46909
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 06:59:53 2018 -0700
GEODE-5363: Moves geode-modules-tomcat7 tests into new source sets.
---
extensions/geode-modules-tomcat7/build.gradle | 21 +++++++++++++++++++++
.../modules/session/Tomcat7SessionsJUnitTest.java | 0
.../resources/tomcat/conf/tomcat-users.xml | 0
.../resources/tomcat/logs}/.gitkeep | 0
.../resources/tomcat/temp}/.gitkeep | 0
5 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index 21096f9..63ebdd9 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -49,3 +49,24 @@ dependencies {
}
disableMavenPublishing()
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.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')
+ }
+}
+
+dependencies {
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
+}
diff --git a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
rename to extensions/geode-modules-tomcat7/src/integrationTest/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/conf/tomcat-users.xml
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/conf/tomcat-users.xml
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/temp/.gitkeep
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/logs/.gitkeep
diff --git a/extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep b/extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep
similarity index 100%
rename from extensions/geode-modules-tomcat7/src/test/resources/tomcat/logs/.gitkeep
rename to extensions/geode-modules-tomcat7/src/integrationTest/resources/tomcat/temp/.gitkeep