From 96dc1ccbfbe208e1a1d0cbf565730bfb93cb6f84 Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Thu, 28 Sep 2023 13:02:55 -0700
Subject: [PATCH] build.gradle: apply test configuration to all tasks withType
 Test

---
 build.gradle           | 2 +-
 omnij-cli/build.gradle | 2 --
 omnij-rpc/build.gradle | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 19eb741a..743e0ea7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ subprojects {
         reproducibleFileOrder = true
     }
 
-    test {
+    tasks.withType(Test).configureEach {
         useJUnitPlatform()
         testLogging.showStandardStreams = true
     }
diff --git a/omnij-cli/build.gradle b/omnij-cli/build.gradle
index eb3e958d..33706907 100644
--- a/omnij-cli/build.gradle
+++ b/omnij-cli/build.gradle
@@ -95,11 +95,9 @@ sourceSets {
 }
 
 tasks.register('regTest', Test) {
-    useJUnitPlatform()
     testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
     classpath = project.sourceSets.integrationTest.runtimeClasspath
     outputs.upToDateWhen { false }
-    testLogging.showStandardStreams = true
     beforeSuite { descriptor ->
         if (descriptor.getClassName() != null) {
             logger.lifecycle('\033[1m' + descriptor.getName() + "\033[0m") // bold
diff --git a/omnij-rpc/build.gradle b/omnij-rpc/build.gradle
index 330639c4..77ad77c0 100644
--- a/omnij-rpc/build.gradle
+++ b/omnij-rpc/build.gradle
@@ -57,12 +57,10 @@ sourceSets {
  */
 class IntegrationTest extends Test {
     public IntegrationTest() {
-        useJUnitPlatform()
         testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
         classpath = project.sourceSets.integrationTest.runtimeClasspath
         outputs.upToDateWhen { false }
         testLogging {
-            showStandardStreams = true
             exceptionFormat = 'full'
             displayGranularity = -1
         }