This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new db5636a GEODE-5363: Use nebula.facet plugin to simplify test modules.
(#2154)
db5636a is described below
commit db5636a5fecb6a26c3468ce112666a214c00f2c3
Author: Jacob Barrett <[email protected]>
AuthorDate: Wed Jul 18 12:52:45 2018 -0700
GEODE-5363: Use nebula.facet plugin to simplify test modules. (#2154)
* Fixes IJ integration with Antlr
---
build.gradle | 5 +
extensions/geode-modules-session/build.gradle | 24 +----
extensions/geode-modules-tomcat7/build.gradle | 24 +----
extensions/geode-modules-tomcat8/build.gradle | 26 +----
extensions/geode-modules/build.gradle | 22 +---
geode-assembly/build.gradle | 64 ++---------
geode-connectors/build.gradle | 38 -------
geode-core/build.gradle | 38 ++-----
geode-cq/build.gradle | 28 -----
geode-experimental-driver/build.gradle | 18 ----
geode-junit/build.gradle | 16 ---
geode-lucene/build.gradle | 39 -------
geode-old-client-support/build.gradle | 18 ----
geode-protobuf/build.gradle | 28 -----
geode-pulse/build.gradle | 26 -----
geode-rebalancer/build.gradle | 18 ----
geode-wan/build.gradle | 28 -----
geode-web-api/build.gradle | 38 +------
geode-web/build.gradle | 40 ++-----
gradle/test.gradle | 147 +++++++-------------------
20 files changed, 81 insertions(+), 604 deletions(-)
diff --git a/build.gradle b/build.gradle
index 765d5b7..0ad19a9 100755
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,13 @@ buildscript {
}
}
+plugins {
+ id "nebula.facet" version "4.0.1"
+}
+
apply plugin: 'wrapper'
apply plugin: 'com.gradle.build-scan'
+apply plugin: 'nebula.facet'
wrapper {
gradleVersion = minimumGradleVersion
diff --git a/extensions/geode-modules-session/build.gradle
b/extensions/geode-modules-session/build.gradle
index 5d455ef..ab3f13f 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -34,6 +34,9 @@ dependencies {
}
testCompile project(path: ':geode-junit')
+
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
}
jar {
@@ -44,24 +47,3 @@ 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-tomcat7/build.gradle
b/extensions/geode-modules-tomcat7/build.gradle
index 7e5b411..8d80034 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -43,6 +43,9 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile
files(project(':extensions/geode-modules').sourceSets.test.output)
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+
eclipse.classpath.file {
whenMerged { classpath ->
classpath.entries.removeAll { entry ->
entry.path.contains('geode-modules/build')}
@@ -51,24 +54,3 @@ 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-tomcat8/build.gradle
b/extensions/geode-modules-tomcat8/build.gradle
index 0b82b5b..929e688 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -44,6 +44,10 @@ dependencies {
testCompile
files(project(':extensions/geode-modules').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
+ // TODO build - move dunit framework to shared module.
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+
eclipse.classpath.file {
whenMerged { classpath ->
classpath.entries.removeAll { entry ->
entry.path.contains('geode-modules/build')}
@@ -52,25 +56,3 @@ dependencies {
}
disableMavenPublishing()
-
-configurations {
- distributedTestCompile.extendsFrom testCompile
- distributedTestRuntime.extendsFrom testRuntime
-}
-
-sourceSets {
- 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.
- distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
- distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
-}
diff --git a/extensions/geode-modules/build.gradle
b/extensions/geode-modules/build.gradle
index ed007a4..cf16303 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -35,27 +35,9 @@ dependencies {
testCompile project(path: ':geode-junit')
// TODO build - move shared source to common library.
testCompile files(project(':geode-core').sourceSets.test.output)
-}
-
-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)
}
+
+disableMavenPublishing()
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 2dbf7f4..a3ea857 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -114,6 +114,14 @@ dependencies {
}
testCompile files(project(':geode-old-versions').sourceSets.main.output)
+
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ acceptanceTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ uiTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
+ uiTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
}
sourceSets {
@@ -485,59 +493,3 @@ task dumpInstalledJars(dependsOn: installDist) {
};
}
}
-
-configurations {
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
- distributedTestCompile.extendsFrom testCompile
- distributedTestRuntime.extendsFrom testRuntime
- acceptanceTestCompile.extendsFrom testCompile
- acceptanceTestRuntime.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')
- }
- distributedTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/distributedTest/java')
- }
- resources.srcDir file('src/distributedTest/resources')
- }
- acceptanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/acceptanceTest/java')
- }
- resources.srcDir file('src/acceptanceTest/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 {
- // TODO build - move dunit framework to shared module.
- integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
- distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
- distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
- acceptanceTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
- uiTestCompile files(project(':geode-core').sourceSets.distributedTest.output)
- uiTestCompile files(project(':geode-core').sourceSets.integrationTest.output)
-}
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index 22a265f..b2cbd12 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -41,45 +41,7 @@ dependencies {
testCompile 'com.pholser:junit-quickcheck-generators:' +
project.'junit-quickcheck.version'
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
-}
-
-configurations {
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
- distributedTestCompile.extendsFrom testCompile
- distributedTestRuntime.extendsFrom testRuntime
- acceptanceTestCompile.extendsFrom testCompile
- acceptanceTestRuntime.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')
- }
- acceptanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/acceptanceTest/java')
- }
- resources.srcDir file('src/acceptanceTest/resources')
- }
-}
-
-dependencies {
// TODO build - move dunit framework to shared module.
integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index c288046..b79c5c6 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -26,17 +26,17 @@ sourceSets {
}
}
-
+idea {
+ module {
+ testSourceDirs +=
project.tasks.generateIntegrationTestGrammarSource.outputs.files
+ testSourceDirs +=
project.tasks.generateDistributedTestGrammarSource.outputs.files
+ testSourceDirs +=
project.tasks.generatePerformanceTestGrammarSource.outputs.files
+ }
+}
configurations {
//declaring new configuration that will be used to associate with artifacts
archives
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
- distributedTestCompile.extendsFrom integrationTestCompile
- distributedTestRuntime.extendsFrom integrationTestRuntime
- performanceTestCompile.extendsFrom testCompile
- performanceTestRuntime.extendsFrom testRuntime
}
dependencies {
@@ -179,30 +179,6 @@ sourceSets {
test {
output.dir(generatedResources, builtBy: 'createVersionPropertiesFile')
}
- 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')
- }
- performanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/performanceTest/java')
- }
- resources.srcDir file('src/performanceTest/resources')
- }
}
jmh {
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 2c48067..2d43329 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -23,35 +23,7 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
testCompile project(':geode-junit')
-}
-
-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)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
diff --git a/geode-experimental-driver/build.gradle
b/geode-experimental-driver/build.gradle
index e8dcdb7..158e89b 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -24,25 +24,7 @@ dependencies {
testCompile project(':geode-junit')
testCompile project(':geode-protobuf')
testCompile files(project(':geode-core').sourceSets.test.output)
-}
-
-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/geode-junit/build.gradle b/geode-junit/build.gradle
index e3c2268..69971ad 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -38,22 +38,6 @@ dependencies {
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')
- }
-}
-
test {
// Some tests have inner tests that should be ignored
exclude "**/*\$*.class"
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 95c7416..1594434 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -39,45 +39,6 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
-}
-
-configurations {
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
- distributedTestCompile.extendsFrom testCompile
- distributedTestRuntime.extendsFrom testRuntime
- performanceTestCompile.extendsFrom testCompile
- performanceTestRuntime.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')
- }
- performanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/performanceTest/java')
- }
- resources.srcDir file('src/performanceTest/resources')
- }
-}
-
-dependencies {
// TODO build - move dunit framework to shared module.
integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
diff --git a/geode-old-client-support/build.gradle
b/geode-old-client-support/build.gradle
index 02b6d2a..ee72dd9 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -23,25 +23,7 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
-}
-
-configurations {
- distributedTestCompile.extendsFrom testCompile
- distributedTestRuntime.extendsFrom testRuntime
-}
-sourceSets {
- 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.
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index da7f6fe..ae159e9 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -29,35 +29,7 @@ dependencies {
compile 'com.google.protobuf:protobuf-java:' +
project.'protobuf-java.version'
testCompile files(project(':geode-old-versions').sourceSets.main.output)
-}
-
-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)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index c9d17b2..bc1f207 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -18,32 +18,6 @@ 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-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index a99ac89..76bbdb1 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -27,25 +27,7 @@ dependencies {
exclude module: 'spring-aop'
}
testCompile project(':geode-junit')
-}
-
-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/geode-wan/build.gradle b/geode-wan/build.gradle
index 1bfef94..bae19ef 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -23,35 +23,7 @@ dependencies {
testCompile files(project(':geode-core').sourceSets.test.output)
testCompile project(':geode-junit')
testCompile files(project(':geode-old-versions').sourceSets.main.output)
-}
-
-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)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index c3d5bb2..90f290c 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -63,6 +63,11 @@ dependencies {
testCompile 'javax.servlet:javax.servlet-api:' +
project.'javax.servlet-api.version'
compileOnly project(':geode-core')
testCompile project(':geode-core')
+
+ // TODO build - move dunit framework to shared module.
+ integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
}
war {
@@ -72,36 +77,3 @@ war {
// from the runtime classpath
classpath configurations.runtime
}
-
-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)
- distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
- distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
-}
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index d931535..61ddbec 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -61,6 +61,12 @@ dependencies {
testRuntime files(war.destinationDir)
testCompile files(project(':geode-old-versions').sourceSets.main.output)
+
+ // 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)
}
//Remove the gradle output directories from the eclipse classpath. These
@@ -78,40 +84,6 @@ 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
}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index a1be69c..da47c11 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -84,107 +84,36 @@ subprojects {
}
}
- sourceSets {
+ apply plugin: 'nebula.facet'
+ facets {
integrationTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/integrationTest/java')
- }
- resources.srcDir file('src/integrationTest/resources')
- apply plugin: 'idea'
- idea {
- module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.integrationTestCompile ]
- }
- }
+ parentSourceSet = 'test'
+ testTaskName = 'integrationTest'
+ includeInCheckLifecycle = false
}
-
distributedTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/distributedTest/java')
- }
- resources.srcDir file('src/distributedTest/resources')
- apply plugin: 'idea'
- idea {
- module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.distributedTestCompile ]
- }
- }
+ parentSourceSet = 'test'
+ testTaskName = 'distributedTest'
+ includeInCheckLifecycle = false
}
-
performanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/performanceTest/java')
- }
- resources.srcDir file('src/performanceTest/resources')
- apply plugin: 'idea'
- idea {
- module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.performanceTestCompile ]
- }
- }
+ parentSourceSet = 'test'
+ testTaskName = 'performanceTest'
+ includeInCheckLifecycle = false
}
-
acceptanceTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/acceptanceTest/java')
- }
- resources.srcDir file('src/acceptanceTest/resources')
- apply plugin: 'idea'
- idea {
- module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.acceptanceTestCompile ]
- }
- }
+ parentSourceSet = 'test'
+ testTaskName = 'acceptanceTest'
+ includeInCheckLifecycle = false
}
-
uiTest {
- java {
- compileClasspath += main.output + test.output
- runtimeClasspath += main.output + test.output
- srcDir file('src/uiTest/java')
- }
- resources.srcDir file('src/uiTest/resources')
- apply plugin: 'idea'
- idea {
- module {
- sourceDirs -= java
- resourceDirs -= resources
- testSourceDirs += java
- testResourceDirs += resources
- scopes.TEST.plus += [ configurations.uiTestCompile ]
- }
- }
+ parentSourceSet = 'test'
+ testTaskName = 'uiTest'
+ includeInCheckLifecycle = false
}
}
- task integrationTest(type:Test) {
- testClassesDirs = sourceSets.integrationTest.output.classesDirs
- classpath = sourceSets.integrationTest.runtimeClasspath
-
+ integrationTest {
useJUnit {
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
@@ -197,46 +126,46 @@ subprojects {
outputs.upToDateWhen{false}
}
- task distributedTest(type:Test) {
- testClassesDirs = sourceSets.distributedTest.output.classesDirs
- classpath = sourceSets.distributedTest.runtimeClasspath
-
+ integrationTest {
useJUnit {
excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
forkEvery 1
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
outputs.upToDateWhen{false}
}
- task repeatTest(type:RepeatTest) {
- times= Integer.parseInt(repeat)
-
- useJUnit {}
+ distributedTest {
+ useJUnit {
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ forkEvery 1
outputs.upToDateWhen{false}
}
- task acceptanceTest(type:Test) {
- testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
- classpath = sourceSets.acceptanceTest.runtimeClasspath
-
- forkEvery 1
-
- outputs.upToDateWhen{false}
+ acceptanceTest {
+ forkEvery 1
+ outputs.upToDateWhen{false}
}
- task uiTest(type:Test) {
- testClassesDirs = sourceSets.uiTest.output.classesDirs
- classpath = sourceSets.uiTest.runtimeClasspath
-
+ uiTest {
forkEvery 1
-
outputs.upToDateWhen{false}
}
+ task repeatTest(type:RepeatTest) {
+ times= Integer.parseInt(repeat)
+
+ useJUnit {}
+
+ outputs.upToDateWhen{false}
+ }
task flakyTest(type:Test) {
useJUnit {
