[geode] 41/46: GEODE-5363: Run acceptanceTest from new source set.

[jbarrett]

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 2cd9583c46e813b9fecce058f932c0831e4bc68b
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Wed Jul 11 07:35:43 2018 -0700

    GEODE-5363: Run acceptanceTest from new source set.
---
 gradle/test.gradle | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/gradle/test.gradle b/gradle/test.gradle
index 20a4d1c..7ec5ced 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -101,6 +101,15 @@ subprojects {
       }
       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')
+    }
   }
 
   task integrationTest(type:Test) {
@@ -142,6 +151,25 @@ subprojects {
     outputs.upToDateWhen{false}
   }
 
+  task acceptanceTest(type:Test) {
+    testClassesDirs = sourceSets.acceptanceTest.output.classesDirs
+    classpath = sourceSets.acceptanceTest.runtimeClasspath
+
+
+    useJUnit {
+      includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
+    }
+
+    forkEvery 1
+
+    if (project.hasProperty('maxParallelForks'))
+      maxParallelForks = project.maxParallelForks as int
+    if (project.hasProperty('forkEvery'))
+      forkEvery = project.forkEvery as int
+
+    outputs.upToDateWhen{false}
+  }
+
   task flakyTest(type:Test) {
     useJUnit {
       includeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
@@ -352,14 +380,6 @@ subprojects {
     forkEvery 30
   }
 
-  task acceptanceTest(type:Test) {
-    useJUnit {
-      includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
-    }
-    forkEvery 1
-    outputs.upToDateWhen{false}
-  }
-
   // apply common test configuration
   gradle.taskGraph.whenReady( { graph ->
     tasks.withType(Test).each { test ->