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:26 UTC
[geode] 19/46: GEODE-5363: Moves geode-modules-session 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 3fd9c3fc4bdf92cfc654936e7a9304b2a79162a6
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Jul 3 07:07:44 2018 -0700
GEODE-5363: Moves geode-modules-session tests into new source sets.
---
extensions/geode-modules-session/build.gradle | 21 +++++++++++++++++++++
.../session/installer/InstallerJUnitTest.java | 0
.../session/internal/filter/AbstractListener.java | 0
.../session/internal/filter/BasicServlet.java | 0
.../modules/session/internal/filter/Callback.java | 0
.../session/internal/filter/CallbackServlet.java | 0
.../session/internal/filter/CommonTests.java | 0
.../filter/HttpSessionAttributeListenerImpl.java | 0
.../filter/HttpSessionBindingListenerImpl.java | 0
.../session/internal/filter/MyServletTester.java | 0
.../session/internal/filter/RendezvousManager.java | 0
.../filter/ServletRequestAttributeListenerImpl.java | 0
.../internal/filter/ServletRequestListenerImpl.java | 0
.../SessionReplicationIntegrationJUnitTest.java | 0
.../filter/SessionReplicationJUnitTest.java | 0
.../SessionReplicationLocalCacheJUnitTest.java | 0
.../session/junit/ChildFirstClassLoader.java | 0
.../geode/modules/session/junit/NamedRunner.java | 0
.../session/junit/PerTestClassLoaderRunner.java | 0
.../resources/log4j.properties | 0
.../session/installer/InstallerJUnitTest.web.xml | 0
.../installer/InstallerJUnitTest.web.xml.expected | 0
22 files changed, 21 insertions(+)
diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
index 0469070..81adfea 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -42,3 +42,24 @@ jar {
}
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-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/Callback.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/NamedRunner.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/NamedRunner.java
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java b/extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
similarity index 100%
rename from extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
rename to extensions/geode-modules-session/src/integrationTest/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
diff --git a/extensions/geode-modules-session/src/test/resources/log4j.properties b/extensions/geode-modules-session/src/integrationTest/resources/log4j.properties
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/log4j.properties
rename to extensions/geode-modules-session/src/integrationTest/resources/log4j.properties
diff --git a/extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml b/extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
rename to extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml
diff --git a/extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected b/extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected
similarity index 100%
rename from extensions/geode-modules-session/src/test/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected
rename to extensions/geode-modules-session/src/integrationTest/resources/org/apache/geode/modules/session/installer/InstallerJUnitTest.web.xml.expected