Implement JU5&6 backbones for instrumentation modules

A few bridge APIs were needed to overcome incompatibilities between the versions

Author: mannodermaus

build-logic/gradle/libs.versions.toml

@@ -66,7 +66,7 @@ junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
 junit-platform-commons = { module = "org.junit.platform:junit-platform-commons" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
-junit-platform-runner = { module = "org.junit.platform:junit-platform-runner" }
+junit-platform-suiteapi = { module = "org.junit.platform:junit-platform-suite-api" }
 junit-vintage-api = { module = "junit:junit", version.ref = "junit4" }
 junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" }
 konftoml = { module = "com.uchuhimo:konf-toml", version.ref = "konftoml" }

instrumentation/build.gradle.kts

@@ -35,15 +35,14 @@ subprojects {
 
     val jvmTarget = JvmTarget.JVM_21
     val javaVersion = JavaVersion.toVersion(jvmTarget.target)
-    
+
     // Configure Kotlin
     plugins.withType<KotlinBasePlugin> {
         tasks.withType<KotlinCompilationTask<*>>().configureEach {
             compilerOptions {
                 this.progressiveMode.set(true)
                 if (this is KotlinJvmCompilerOptions) {
                     this.jvmTarget.set(jvmTarget)
-                    this.freeCompilerArgs.add("-Xjvm-default=all")
                 }
             }
         }

instrumentation/core/build.gradle.kts

@@ -41,7 +41,8 @@ dependencies {
     // This is required by the "instrumentation-runner" companion library,
     // since it can't provide any JUnit 5 runtime libraries itself
     // due to fear of prematurely incrementing the minSdkVersion requirement.
-    runtimeOnly(libs.junit.platform.runner)
+    runtimeOnly(libs.junit.platform.launcher)
+    runtimeOnly(libs.junit.platform.suiteapi)
     runtimeOnly(libs.junit.jupiter.engine)
 
     // This transitive dependency of JUnit 5 is required to be on the runtime classpath,

instrumentation/core/src/five/kotlin/de/mannodermaus/junit5/internal/compat/ExtensionContextCompat.kt

@@ -0,0 +1,18 @@
+package de.mannodermaus.junit5.internal.compat
+
+import org.junit.jupiter.api.extension.ExtensionContext
+import kotlin.reflect.KClass
+
+// JUnit 5 facade of ExtensionContext.Store APIs
+// that were deprecated/removed in subsequent versions of the framework.
+
+internal fun <K : Any, V : Any> ExtensionContext.Store.computeIfAbsentCompat(
+    key: K,
+    defaultCreator: (K) -> V
+): Any = getOrComputeIfAbsent(key, defaultCreator)
+
+internal fun <K : Any, V : Any> ExtensionContext.Store.computeIfAbsentCompat(
+    key: K,
+    defaultCreator: (K) -> V,
+    requiredType: KClass<V>
+): V = getOrComputeIfAbsent(key, defaultCreator, requiredType.java)

instrumentation/core/src/main/java/de/mannodermaus/junit5/ActivityScenarioExtension.kt

@@ -8,6 +8,7 @@ import android.util.Log
 import androidx.test.core.app.ActivityScenario
 import de.mannodermaus.junit5.ActivityScenarioExtension.Companion.launch
 import de.mannodermaus.junit5.internal.LOG_TAG
+import de.mannodermaus.junit5.internal.compat.computeIfAbsentCompat
 import org.junit.jupiter.api.extension.AfterEachCallback
 import org.junit.jupiter.api.extension.BeforeEachCallback
 import org.junit.jupiter.api.extension.ExtensionContext
@@ -209,10 +210,10 @@ private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : B
         // Create a global lock for restricting test execution to one-by-one;
         // this is necessary to ensure that only one ActivityScenario is ever active at a time,
         // preventing violations of Android's instrumentation and Espresso
-        val lock = store.getOrComputeIfAbsent(
-            /* key = */ LOCK_KEY,
-            /* defaultCreator = */ { ReentrantLock() },
-            /* requiredType = */ ReentrantLock::class.java,
+        val lock = store.computeIfAbsentCompat(
+            key = LOCK_KEY,
+            defaultCreator = { ReentrantLock() },
+            requiredType = ReentrantLock::class,
         )
 
         if (state) {
@@ -223,7 +224,7 @@ private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : B
     }
 
     private fun logConcurrentExecutionWarningOnce(store: ExtensionContext.Store) {
-        store.getOrComputeIfAbsent(WARNING_KEY) {
+        store.computeIfAbsentCompat(WARNING_KEY) {
             setOf(
                 "  [WARNING!] UI tests using ActivityScenarioExtension should not be executed in CONCURRENT mode.",
                 "  We will try to disable parallelism for Espresso tests, but this may be error-prone",

instrumentation/core/src/six/kotlin/de/mannodermaus/junit5/internal/compat/ExtensionContextCompat.kt

@@ -0,0 +1,18 @@
+package de.mannodermaus.junit5.internal.compat
+
+import org.junit.jupiter.api.extension.ExtensionContext
+import kotlin.reflect.KClass
+
+// JUnit 6 facade of ExtensionContext.Store APIs
+// that didn't exist in previous versions of the framework.
+
+internal fun <K : Any, V : Any> ExtensionContext.Store.computeIfAbsentCompat(
+    key: K,
+    defaultCreator: (K) -> V
+): Any = computeIfAbsent(key, defaultCreator)
+
+internal fun <K : Any, V : Any> ExtensionContext.Store.computeIfAbsentCompat(
+    key: K,
+    defaultCreator: (K) -> V,
+    requiredType: KClass<V>
+): V = computeIfAbsent(key, defaultCreator, requiredType.java)

instrumentation/extensions/src/main/kotlin/de/mannodermaus/junit5/extensions/GrantPermissionExtension.kt

@@ -66,7 +66,7 @@ internal constructor(private val permissionGranter: PermissionGranter) : BeforeE
 
     /* BeforeEachCallback */
 
-    override fun beforeEach(context: ExtensionContext?) {
+    override fun beforeEach(context: ExtensionContext) {
         permissionGranter.requestPermissions()
     }
 }

instrumentation/extensions/src/test/kotlin/de/mannodermaus/junit5/extensions/GrantPermissionExtensionTests.kt

@@ -9,6 +9,8 @@ import org.junit.jupiter.api.DynamicTest
 import org.junit.jupiter.api.DynamicTest.dynamicTest
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestFactory
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.mockito.Mockito.mock
 import java.lang.reflect.Modifier
 
 class GrantPermissionExtensionTests {
@@ -81,8 +83,10 @@ class GrantPermissionExtensionTests {
 
     private fun runExtension(vararg permissions: String) {
         val extension = GrantPermissionExtension(granter)
+        val context = mock<ExtensionContext>()
+
         extension.grantPermissions(permissions)
-        extension.beforeEach(null)
+        extension.beforeEach(context)
     }
 
     private class TestPermissionGranter : PermissionGranter {

instrumentation/runner/build.gradle.kts

@@ -34,7 +34,8 @@ dependencies {
     // by the "instrumentation" companion library instead.
     compileOnly(libs.junit.jupiter.api)
     compileOnly(libs.junit.jupiter.params)
-    compileOnly(libs.junit.platform.runner)
+    compileOnly(libs.junit.platform.launcher)
+    compileOnly(libs.junit.platform.suiteapi)
 
     testImplementation(project(":testutil"))
     testImplementation(libs.robolectric)

instrumentation/runner/src/five/kotlin/de/mannodermaus/junit5/internal/discovery/EmptyConfigurationParameters.kt

@@ -0,0 +1,19 @@
+package de.mannodermaus.junit5.internal.discovery
+
+import androidx.annotation.RequiresApi
+import org.junit.platform.engine.ConfigurationParameters
+import java.util.Optional
+
+/**
+ * JUnit 5 version of the [ConfigurationParameters] interface,
+ * including the deprecated APIs that were removed in subsequent versions of the framework.
+ */
+@RequiresApi(26)
+internal object EmptyConfigurationParameters : ConfigurationParameters {
+    override fun get(key: String) = Optional.empty<String>()
+    override fun getBoolean(key: String) = Optional.empty<Boolean>()
+    override fun keySet() = emptySet<String>()
+
+    @Deprecated("Deprecated in Java", ReplaceWith("keySet().size"))
+    override fun size() = 0
+}