Update instrumentation deps + gracefully ignore unloadable classes during test discovery

Author: mannodermaus

build-logic/src/main/kotlin/Dependencies.kt

@@ -8,23 +8,25 @@ object libs {
         const val junitPlatform = "1.10.2"
 
         const val composeBom = "2024.04.00"
-        const val androidXTest = "1.5.0"
+        const val androidXTest = "1.6.1"
+        const val androidXTestAnnotation = "1.0.1"
+        const val androidXTestMonitor = "1.7.1"
         const val composeCompiler = "1.5.11"
 
-        const val activityCompose = "1.8.2"
+        const val activityCompose = "1.9.0"
         const val apiGuardian = "1.1.2"
-        const val coroutines = "1.8.0"
+        const val coroutines = "1.8.1"
         const val dokka = "1.9.20"
-        const val espresso = "3.5.1"
+        const val espresso = "3.6.1"
         const val javaSemver = "0.10.2"
         const val junit4 = "4.13.2"
         const val konfToml = "1.1.2"
         const val korte = "2.4.12"
-        const val mockitoCore = "5.11.0"
-        const val mockitoKotlin = "5.2.1"
-        const val robolectric = "4.12"
+        const val mockitoCore = "5.12.0"
+        const val mockitoKotlin = "5.4.0"
+        const val robolectric = "4.13"
         const val shadow = "8.1.1"
-        const val truth = "1.4.2"
+        const val truth = "1.4.4"
     }
 
     object plugins {
@@ -72,9 +74,10 @@ object libs {
     const val truthJava8Extensions = "com.google.truth.extensions:truth-java8-extension:${versions.truth}"
     const val robolectric = "org.robolectric:robolectric:${versions.robolectric}"
 
+    const val androidXTestAnnotation = "androidx.test:annotation:${versions.androidXTestAnnotation}"
     const val androidXTestCore = "androidx.test:core:${versions.androidXTest}"
     const val androidXTestRunner = "androidx.test:runner:${versions.androidXTest}"
-    const val androidXTestMonitor = "androidx.test:monitor:${versions.androidXTest}"
+    const val androidXTestMonitor = "androidx.test:monitor:${versions.androidXTestMonitor}"
     const val espressoCore = "androidx.test.espresso:espresso-core:${versions.espresso}"
 
     const val composeUiTest = "androidx.compose.ui:ui-test"

build-logic/src/main/kotlin/Environment.kt

@@ -102,7 +102,7 @@ object Artifacts {
         const val latestStableVersion = "1.4.0"
 
         val Core = Deployed(
-            platform = Android(minSdk = 14),
+            platform = Android(minSdk = 19),
             groupId = groupId,
             artifactId = "android-test-core",
             currentVersion = currentVersion,
@@ -112,7 +112,7 @@ object Artifacts {
         )
 
         val Extensions = Deployed(
-            platform = Android(minSdk = 14),
+            platform = Android(minSdk = 19),
             groupId = groupId,
             artifactId = "android-test-extensions",
             currentVersion = currentVersion,
@@ -122,7 +122,7 @@ object Artifacts {
         )
 
         val Runner = Deployed(
-            platform = Android(minSdk = 14),
+            platform = Android(minSdk = 19),
             groupId = groupId,
             artifactId = "android-test-runner",
             currentVersion = currentVersion,

instrumentation/.idea/runConfigurations/Compose__Run_Instrumentation_Tests.xml

@@ -9,6 +9,8 @@ Change Log
 - Prevent test methods incorrectly defined as Kotlin top-level functions from messing up Android's internal test counting, causing issues like "Expected N+1 tests, received N" (#316)
 - Prevent test classes ignored by a tag from being considered for test execution, causing issues like "Expected N+1 tests, received N" (#298)
 - Improve integration with Android Test Orchestrator and remove the need for `@UseTechnicalNames` (#337)
+- Raise minimum supported API level of `core`, `extensions` and `runner` modules from 14 to 19
+- Gracefully ignore unloadable classes during test discovery, e.g. those that access JVM-only APIs like `sun.*`
 
 ## 1.4.0 (2023-11-05)
 

instrumentation/.idea/runConfigurations/Core__Run_Instrumentation_Tests.xml

@@ -85,6 +85,7 @@ configurations.all {
 }
 
 dependencies {
+  implementation(libs.androidXTestAnnotation)
   implementation(libs.androidXTestRunner)
   implementation(libs.junitJupiterApi)
 

instrumentation/.idea/runConfigurations/Sample__Run_Instrumentation_Tests.xml

@@ -3,7 +3,6 @@ package de.mannodermaus.junit5.extensions
 import android.Manifest
 import android.annotation.SuppressLint
 import android.os.Build
-import androidx.annotation.VisibleForTesting
 import androidx.test.annotation.ExperimentalTestApi
 import androidx.test.internal.platform.ServiceLoaderWrapper.loadSingleService
 import androidx.test.internal.platform.content.PermissionGranter

instrumentation/CHANGELOG.md

@@ -42,15 +42,8 @@ public class AndroidJUnit5Builder : RunnerBuilder() {
             // AND that integration with applications NOT using JUnit 5 for UI tests still works.
             //
             // First, verify the existence of junit-jupiter-api on the classpath.
-            // Then, verify that the JUnitPlatform Runner is available on the classpath.
-            // It is VERY important to perform this check BEFORE verifying the existence
-            // of the AndroidJUnit5 Runner, which inherits from JUnitPlatform. If this is omitted,
-            // an uncatchable verification error will be raised, rendering instrumentation testing
-            // for applications without the desire to include JUnit 5 effectively useless.
-            // The simple Class.forName() check however will catch this allowed inconsistency,
-            // and gracefully abort.
+            // Then, verify that the Android JUnit 5 Runner is available.
             Class.forName("org.junit.jupiter.api.Test")
-            Class.forName("org.junit.platform.runner.JUnitPlatform")
             Class.forName("de.mannodermaus.junit5.internal.runners.AndroidJUnit5")
             true
         } catch (e: Throwable) {
@@ -69,7 +62,7 @@ public class AndroidJUnit5Builder : RunnerBuilder() {
 
     @Throws(Throwable::class)
     override fun runnerForClass(testClass: Class<*>): Runner? {
-        // Ignore a bunch of class in internal packages
+        // Ignore a bunch of classes in internal packages
         if (testClass.isInIgnorablePackage) return null
 
         try {
@@ -99,6 +92,7 @@ public class AndroidJUnit5Builder : RunnerBuilder() {
         "androidx.",
         "com.android.",
         "kotlin.",
+        "kotlinx.",
     )
 
     private val Class<*>.isInIgnorablePackage: Boolean get() {

instrumentation/extensions/build.gradle.kts

@@ -1,12 +1,16 @@
 package de.mannodermaus.junit5.internal.runners
 
-import android.annotation.SuppressLint
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import de.mannodermaus.junit5.internal.runners.notification.ParallelRunNotifier
+import org.junit.platform.commons.JUnitException
+import org.junit.platform.engine.ConfigurationParameters
 import org.junit.platform.engine.discovery.MethodSelector
+import org.junit.platform.launcher.TestPlan
 import org.junit.platform.launcher.core.LauncherFactory
 import org.junit.runner.Runner
 import org.junit.runner.notification.RunNotifier
+import java.util.Optional
 
 /**
  * JUnit Runner implementation using the JUnit Platform as its backbone.
@@ -15,18 +19,29 @@ import org.junit.runner.notification.RunNotifier
  *
  * @see org.junit.platform.runner.JUnitPlatform
  */
-@SuppressLint("NewApi")
+@RequiresApi(26)
 @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
 internal class AndroidJUnit5(
     private val testClass: Class<*>,
     paramsSupplier: () -> AndroidJUnit5RunnerParams = AndroidJUnit5RunnerParams.Companion::create,
 ) : Runner() {
+    private companion object {
+        private val emptyConfigurationParameters = object : 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
+        }
+
+        private val emptyTestPlan = TestPlan.from(emptyList(), emptyConfigurationParameters)
+    }
 
     private val launcher = LauncherFactory.create()
     private val testTree by lazy { generateTestTree(paramsSupplier()) }
 
-    override fun getDescription() =
-        testTree.suiteDescription
+    override fun getDescription() = testTree.suiteDescription
 
     override fun run(notifier: RunNotifier) {
         // Finally, launch the test plan on the JUnit Platform
@@ -56,8 +71,20 @@ internal class AndroidJUnit5(
             )
         }
 
+        val testPlan = try {
+            launcher.discover(request)
+        } catch (e: JUnitException) {
+            // Each class in scope is given to the runner,
+            // but some may fail to be loaded by the class loader
+            // (e.g. when they are tailored to JVM work and reference sun.* classes
+            // or anything else not present in the Android runtime).
+            // Log those to console, but discard them from being considered at all
+            e.printStackTrace()
+            emptyTestPlan
+        }
+
         return AndroidJUnitPlatformTestTree(
-            testPlan = launcher.discover(request),
+            testPlan = testPlan,
             testClass = testClass,
             needLegacyFormat = isIsolatedMethodRun || isUsingOrchestrator,
             isParallelExecutionEnabled = params.isParallelExecutionEnabled,