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 4dc60865a08abfaba4f65f1b1272df79b242d43a Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Mon Jul 2 21:42:34 2018 -0700 GEODE-5363: Moves geode-junit tests into new source sets. --- geode-junit/build.gradle | 16 ++++++++++++++++ .../org/apache/geode/test/compiler/JarBuilderTest.java | 0 .../org/apache/geode/test/compiler/JavaCompilerTest.java | 0 .../test/concurrent/FileBasedCountDownLatchTest.java | 0 .../junit/rules/ExecutorServiceRuleIntegrationTest.java | 0 .../geode/test/junit/rules/TemporaryFileRuleTest.java | 0 6 files changed, 16 insertions(+) diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle index d467f0a..65517e9 100755 --- a/geode-junit/build.gradle +++ b/geode-junit/build.gradle @@ -37,3 +37,19 @@ dependencies { compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version' compile project(":geode-old-versions") } + +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') + } +} diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java similarity index 100% rename from geode-junit/src/test/java/org/apache/geode/test/compiler/JarBuilderTest.java rename to geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JarBuilderTest.java diff --git a/geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java similarity index 100% rename from geode-junit/src/test/java/org/apache/geode/test/compiler/JavaCompilerTest.java rename to geode-junit/src/integrationTest/java/org/apache/geode/test/compiler/JavaCompilerTest.java diff --git a/geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java similarity index 100% rename from geode-junit/src/test/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java rename to geode-junit/src/integrationTest/java/org/apache/geode/test/concurrent/FileBasedCountDownLatchTest.java diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java similarity index 100% rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java rename to geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/ExecutorServiceRuleIntegrationTest.java diff --git a/geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java b/geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java similarity index 100% rename from geode-junit/src/test/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java rename to geode-junit/src/integrationTest/java/org/apache/geode/test/junit/rules/TemporaryFileRuleTest.java