Latest build conventions (#206)

creek-service · Aug 8, 2023 · f6b2368 · f6b2368
1 parent cb58cba
commit f6b2368
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 85 deletions.
diff --git a/annotation/src/test/resources/junit-platform.properties b/annotation/src/test/resources/junit-platform.properties
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -14,3 +14,6 @@
  * limitations under the License.
  */
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+}
diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
@@ -19,7 +19,8 @@
  *
  * <p>Apply to all java modules, usually excluding the root project in multi-module sets.
  *
- * <p>Version: 1.7
+ * <p>Version: 1.8
+ *  - 1.8: Tweak test config to reduce build speed.
  *  - 1.7: Switch to setting Java version via toolchain
  *  - 1.6: Remove GitHub packages for snapshots
  *  - 1.5: Add filters to exclude generated sources
@@ -70,8 +71,8 @@ tasks.withType<JavaCompile> {
 
 tasks.test {
     useJUnitPlatform()
-    setForkEvery(1)
-    maxParallelForks = 4
+    setForkEvery(5)
+    maxParallelForks = Runtime.getRuntime().availableProcessors()
     testLogging {
         showStandardStreams = true
         exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
@@ -117,17 +118,23 @@ if (rootProject.name != project.name) {
     }
 }
 
-tasks.register("format") {
+val format = tasks.register("format") {
     group = "creek"
     description = "Format the code"
 
     dependsOn("spotlessCheck", "spotlessApply")
 }
 
-tasks.register("static") {
+val static = tasks.register("static") {
     group = "creek"
     description = "Run static code analysis"
 
     dependsOn("checkstyleMain", "checkstyleTest", "spotbugsMain", "spotbugsTest")
+
+    shouldRunAfter(format)
+}
+
+tasks.test {
+    shouldRunAfter(static)
 }
 
diff --git a/schema/src/test/resources/junit-platform.properties b/schema/src/test/resources/junit-platform.properties
diff --git a/type/src/test/java/org/creekservice/api/base/type/config/SystemEnvTest.java b/type/src/test/java/org/creekservice/api/base/type/config/SystemEnvTest.java
@@ -24,17 +24,12 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.parallel.ExecutionMode.SAME_THREAD;
 
 import java.lang.reflect.InvocationTargetException;
 import java.time.Duration;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.Isolated;
 import org.junitpioneer.jupiter.SetEnvironmentVariable;
 
-@Isolated // This test uses @SetEnvironmentVariable, which modifies global env
-@Execution(SAME_THREAD) // ...this isn't thread-safe. So isolate from other tests.
 class SystemEnvTest {
 
     @SetEnvironmentVariable(key = "a-key", value = "-109")

diff --git a/type/src/test/resources/junit-platform.properties b/type/src/test/resources/junit-platform.properties