From b9e3aa93499a3bd9ca718edd608c4dbc16aeb632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Basl=C3=A9?= <sbasle@pivotal.io>
Date: Thu, 4 Jan 2018 17:55:34 +0100
Subject: [PATCH] see #325 [build] Improve build configuration for tests
 (#1007)

 - better common configuration
 - clearer sequencing of events
 - additional tests are more clearly segregated
   and will still run when explicitly called
 - testNG is only exluded from check when
   building on Travis
 - loops is always excluded from check when
   building a SNAPSHOT
 - Travis fast_finish: do not wait for JDK9
   job to finish before setting the build status
---
 .travis.yml  |  1 +
 build.gradle | 62 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a695524aa7..2da4350290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ jdk:
   - oraclejdk9
 
 matrix:
+    fast_finish: true
     allow_failures:
     - jdk: oraclejdk9
 
diff --git a/build.gradle b/build.gradle
index 228cbab12b..252bc9749a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,27 +169,28 @@ configure(subprojects) { p ->
 	}
   }
 
+  //includes for base test task (see below for additional common configurations)
   test {
+	include '**/*Tests.*'
+	include '**/*Test.*'
+	include '**/*Spec.*'
+
+  }
+
+  //all test tasks will show FAILED/PASSED for each test method,
+  // common exclusions, no scanning
+  p.tasks.withType(Test).all {
 	testLogging {
 	  events "passed", "failed"
 	  showExceptions true
 	  exceptionFormat "full"
 	  maxGranularity 3
 	}
-  }
-
-  p.tasks.withType(Test).all {
 	systemProperty("java.awt.headless", "true")
 	systemProperty("reactor.trace.cancel", "true")
 	systemProperty("reactor.trace.nocapacity", "true")
 	systemProperty("testGroups", p.properties.get("testGroups"))
 	scanForTestClasses = false
-	include '**/*Tests.*'
-	include '**/*Test.*'
-	include '**/*Spec.*'
-	if (!version.contains("SNAPSHOT")) {
-	  include '**/*Loop.*'
-	}
 	exclude '**/*Abstract*.*'
 	exclude '**/*OperatorTest*.*'
   }
@@ -334,8 +335,16 @@ project('reactor-core') {
 	from("${project.buildDir}/docs/kdoc")
   }
 
+  task testStaticInit(type: Test, group: 'verification') {
+	systemProperty 'reactor.trace.operatorStacktrace', 'true'
+	include '**/*TestStaticInit.*'
+	doFirst {
+	  println "Additional tests from `testStaticInit` ($includes)"
+	}
+  }
+
   task loops(type: Test, group: 'verification') {
-	includes.clear()
+	mustRunAfter testStaticInit
 	include '**/*Loop.*'
 	doFirst {
 	  println "Additional tests from `loops` ($includes)"
@@ -343,23 +352,24 @@ project('reactor-core') {
   }
 
   task testNG(type: Test, group: 'verification') {
-
-	if (!version.endsWith('BUILD-SNAPSHOT')) {
-	  includes.clear()
-	  useTestNG()
-	  include '**/*Verification.*'
-	  doFirst {
-		println "Additional tests from `testNG` ($includes)"
-	  }
+	mustRunAfter testStaticInit
+	useTestNG()
+	include '**/*Verification.*'
+	doFirst {
+	  println "Additional tests from `testNG` ($includes)"
 	}
   }
 
-  task testStaticInit(type: Test, group: 'verification') {
-	systemProperty 'reactor.trace.operatorStacktrace', 'true'
-	includes.clear()
-	include '**/*TestStaticInit.*'
-	doFirst {
-	  println "Additional tests from `testStaticInit` ($includes)"
+  //inherit basic test task + common configuration in root
+  //always depend on testStaticInit, skip testNG on Travis, skip loops when not releasing
+  //note that this way the tasks can be run individually
+  test {
+	dependsOn testStaticInit
+	if (System.env.TRAVIS != "true") {
+	  dependsOn testNG
+	}
+	if (!version.endsWith('BUILD-SNAPSHOT')) {
+	  dependsOn loops
 	}
   }
 
@@ -387,9 +397,7 @@ project('reactor-core') {
 	  archives kdocZip
   }
 
-  test.dependsOn testStaticInit
-  jacocoTestReport.dependsOn testNG
-
+  jacocoTestReport.dependsOn test
   check.dependsOn jacocoTestReport
   jar.finalizedBy(japicmp)
 }