refactor: Simplify test jvm enablement code

Author: bric3

buildSrc/src/main/kotlin/datadog.test-jvm-contraints.gradle.kts

@@ -1,19 +1,16 @@
 import datadog.gradle.plugin.testJvmConstraints.ProvideJvmArgsOnJvmLauncherVersion
 import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension
-import datadog.gradle.plugin.testJvmConstraints.TestJvmJavaLauncher
-import datadog.gradle.plugin.testJvmConstraints.isJavaLauncherAllowed
+import datadog.gradle.plugin.testJvmConstraints.TestJvmSpec
 import datadog.gradle.plugin.testJvmConstraints.isJavaVersionAllowed
-import datadog.gradle.plugin.testJvmConstraints.isJdkExcluded
-import datadog.gradle.plugin.testJvmConstraints.isJdkIncluded
-import datadog.gradle.plugin.testJvmConstraints.isJdkForced
+import datadog.gradle.plugin.testJvmConstraints.isTestJvmAllowed
 
 plugins {
   java
 }
 
 val projectExtension = extensions.create<TestJvmConstraintsExtension>(TestJvmConstraintsExtension.NAME)
 
-val testJvmJavaLauncher = TestJvmJavaLauncher(project)
+val testJvmSpec = TestJvmSpec(project)
 
 tasks.withType<Test>().configureEach {
   if (extensions.findByName(TestJvmConstraintsExtension.NAME) != null) {
@@ -62,13 +59,10 @@ fun Test.configureJvmArgs(
  * can be run with the test task launcher.
  */
 fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
-  if (testJvmJavaLauncher.javaTestLauncher.isPresent) {
-    javaLauncher = testJvmJavaLauncher.javaTestLauncher
+  if (testJvmSpec.javaTestLauncher.isPresent) {
+    javaLauncher = testJvmSpec.javaTestLauncher
     onlyIf("Allowed or forced JDK") {
-      extension.isJdkIncluded(testJvmJavaLauncher.normalizedTestJvm.get()) &&
-      !extension.isJdkExcluded(testJvmJavaLauncher.normalizedTestJvm.get()) &&
-        (extension.isJavaLauncherAllowed(testJvmJavaLauncher.javaTestLauncher.get()) ||
-          extension.isJdkForced(testJvmJavaLauncher.normalizedTestJvm.get()))
+      extension.isTestJvmAllowed(testJvmSpec)
     }
   } else {
     onlyIf("Is current Daemon JVM  allowed") {
@@ -91,7 +85,7 @@ fun Test.configureTestJvm(extension: TestJvmConstraintsExtension) {
 pluginManager.withPlugin("org.gradle.jacoco") {
   tasks.withType<Test>().configureEach {
     // Disable jacoco for additional 'testJvm' tests to speed things up a bit
-    if (testJvmJavaLauncher.javaTestLauncher.isPresent) {
+    if (testJvmSpec.javaTestLauncher.isPresent) {
       extensions.configure<JacocoTaskExtension> {
         isEnabled = false
       }

buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsUtils.kt

@@ -6,7 +6,32 @@ import org.gradle.jvm.toolchain.JavaLauncher
 
 private val logger = Logging.getLogger("TestJvmConstraintsUtils")
 
-private fun TestJvmConstraintsExtension.isJavaVersionAllowedForProperty(currentJvmVersion: JavaVersion): Boolean {
+internal fun TestJvmConstraintsExtension.isJavaVersionAllowed(version: JavaVersion): Boolean {
+  return isWithinAllowedRange(version)
+}
+
+internal fun TestJvmConstraintsExtension.isTestJvmAllowed(testJvmSpec: TestJvmSpec): Boolean {
+  val testJvmName = testJvmSpec.normalizedTestJvm.get()
+
+  val included = includeJdk.get()
+  if (included.isNotEmpty() && included.none { it.equals(testJvmName, ignoreCase = true) }) {
+    return false
+  }
+
+  val excluded = excludeJdk.get()
+  if (excluded.isNotEmpty() && excluded.any { it.equals(testJvmName, ignoreCase = true) }) {
+    return false
+  }
+
+  val launcherVersion = JavaVersion.toVersion(testJvmSpec.javaTestLauncher.get().metadata.languageVersion.asInt())
+  if (!isWithinAllowedRange(launcherVersion) && forceJdk.get().none { it.equals(testJvmName, ignoreCase = true) }) {
+    return false
+  }
+
+  return true
+}
+
+private fun TestJvmConstraintsExtension.isWithinAllowedRange(currentJvmVersion: JavaVersion): Boolean {
   val definedMin = minJavaVersionForTests.isPresent
   val definedMax = maxJavaVersionForTests.isPresent
 
@@ -22,31 +47,3 @@ private fun TestJvmConstraintsExtension.isJavaVersionAllowedForProperty(currentJ
 
   return true
 }
-
-internal fun TestJvmConstraintsExtension.isJavaVersionAllowed(version: JavaVersion): Boolean {
-  return isJavaVersionAllowedForProperty(version)
-}
-
-/**
- * Convenience method to call [isJavaVersionAllowed]
- */
-internal fun TestJvmConstraintsExtension.isJavaLauncherAllowed(javaLauncher: JavaLauncher): Boolean {
-  val launcherVersion = JavaVersion.toVersion(javaLauncher.metadata.languageVersion.asInt())
-  return isJavaVersionAllowed(launcherVersion)
-}
-
-internal fun TestJvmConstraintsExtension.isJdkForced(javaName: String): Boolean {
-  return forceJdk.orNull?.any { it.equals(javaName, ignoreCase = true) } ?: false
-}
-
-internal fun TestJvmConstraintsExtension.isJdkExcluded(javaName: String): Boolean {
-  return excludeJdk.get().any { it.equals(javaName, ignoreCase = true) }
-}
-
-internal fun TestJvmConstraintsExtension.isJdkIncluded(javaName: String): Boolean {
-  val included = includeJdk.get()
-  return when {
-      included.isEmpty() -> true
-      else -> included.any { it.equals(javaName, ignoreCase = true) }
-  }
-}

…estJvmConstraints/TestJvmJavaLauncher.kt …plugin/testJvmConstraints/TestJvmSpec.ktbuildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmJavaLauncher.kt renamed to buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmJavaLauncher.kt renamed to buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt

@@ -9,7 +9,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
-class TestJvmJavaLauncher(val project: Project) {
+class TestJvmSpec(val project: Project) {
   private val currentJavaHomePath = project.providers.systemProperty("java.home").map { it.normalizeToJDKJavaHome() }
   val normalizedTestJvm = project.providers.gradleProperty("testJvm").map { testJvm ->
     if (testJvm.isBlank()) {