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 9a02153bb89edc18199f4e1ef878eac9fb0dcd88 Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Mon Jul 2 21:37:52 2018 -0700 GEODE-5363: Moves pulse tests into new source sets. --- geode-core/build.gradle | 6 ----- geode-pulse/build.gradle | 26 ++++++++++++++++++++++ .../controllers/PulseControllerJUnitTest.java | 0 .../tools/pulse/tests/junit/BaseServiceTest.java | 0 .../junit/ClusterSelectedRegionServiceTest.java | 0 .../ClusterSelectedRegionsMemberServiceTest.java | 0 .../tests/junit/MemberGatewayHubServiceTest.java | 0 .../pulse/tests/ui/PulseAnonymousUserTest.java | 0 .../geode/tools/pulse/tests/ui/PulseAuthTest.java | 0 .../tools/pulse/tests/ui/PulseAutomatedTest.java | 0 .../tools/pulse/tests/ui/PulseNoAuthTest.java | 0 11 files changed, 26 insertions(+), 6 deletions(-) diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 4314da7..499611d 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -287,9 +287,3 @@ dependencies { tasks.eclipse.dependsOn(generateGrammarSource) -task integrationTestx(type: Test) { - useJUnit() - testClassesDirs = sourceSets.integrationTest.output.classesDirs - classpath = sourceSets.integrationTest.runtimeClasspath -} - diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index 21e8df2..605aab7 100755 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -18,6 +18,32 @@ import org.apache.geode.gradle.TestPropertiesWriter */ apply plugin: 'war' +configurations { + integrationTestCompile.extendsFrom testCompile + integrationTestRuntime.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') + } + uiTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/uiTest/java') + } + resources.srcDir file('src/uiTest/resources') + } +} + dependencies { compile 'org.springframework:spring-beans:' + project.'springframework.version' diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java rename to geode-pulse/src/integrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/BaseServiceTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionServiceTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/ClusterSelectedRegionsMemberServiceTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/junit/MemberGatewayHubServiceTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAuthTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseAutomatedTest.java diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java b/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java similarity index 100% rename from geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java rename to geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseNoAuthTest.java