Add le tests for the new config param

Author: mannodermaus

instrumentation/runner/src/main/kotlin/de/mannodermaus/junit5/AndroidJUnitFrameworkBuilder.kt

@@ -48,12 +48,13 @@ public open class AndroidJUnitFrameworkBuilder internal constructor() : RunnerBu
     }
 
     // One-time parsing setup for runner params, taken from instrumentation arguments
-    private val params =
+    private val params by lazy {
         JUnitFrameworkRunnerParams.create().also { params ->
             // Apply all environment variables & system properties to the running process
             params.registerEnvironmentVariables()
             params.registerSystemProperties()
         }
+    }
 
     @Throws(Throwable::class)
     override fun runnerForClass(testClass: Class<*>): Runner? {

instrumentation/runner/src/test/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFrameworkTests.kt

@@ -81,7 +81,11 @@ class AndroidJUnitFrameworkTests {
         val resultRef = AtomicReference<CollectingRunListener.Results>()
         val args = buildArgs(shardingConfig)
         withMockedInstrumentation(args) {
-            val runner = AndroidJUnitFramework(Sample_NormalTests::class.java)
+            val runner =
+                AndroidJUnitFramework(
+                    testClass = Sample_NormalTests::class.java,
+                    params = JUnitFrameworkRunnerParams(),
+                )
             val listener = CollectingRunListener()
             val notifier = RunNotifier().also { it.addListener(listener) }
             runner.run(notifier)

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt

@@ -4,6 +4,7 @@ import com.google.common.truth.Truth.assertThat
 import de.mannodermaus.Libraries.Instrumentation
 import de.mannodermaus.Libraries.JUnit
 import de.mannodermaus.Libraries.JUnit.JUnit5
+import de.mannodermaus.gradle.plugins.junit5.dsl.UnsupportedDeviceBehavior
 import de.mannodermaus.gradle.plugins.junit5.extensions.android
 import de.mannodermaus.gradle.plugins.junit5.internal.artifact
 import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT5_RUNNER_BUILDER_CLASS
@@ -79,6 +80,31 @@ internal class InstrumentationSupportTests {
 
     /* Configuration parameters */
 
+    @Test
+    fun `always includes config param for unsupported device behavior`() {
+        project.addJUnit(JUnit5, "androidTest")
+        project.evaluate()
+
+        val runnerArgs =
+            project.android.defaultConfig.testInstrumentationRunnerArguments[
+                    "configurationParameters"]
+        assertThat(runnerArgs).contains("de.mannodermaus.junit.unsupported.behavior=skip")
+    }
+
+    @Test
+    fun `can configure the unsupported device behavior via dsl`() {
+        project.addJUnit(JUnit5, "androidTest")
+        project.junitPlatform.instrumentationTests.behaviorForUnsupportedDevices.set(
+            UnsupportedDeviceBehavior.Fail
+        )
+        project.evaluate()
+
+        val runnerArgs =
+            project.android.defaultConfig.testInstrumentationRunnerArguments[
+                    "configurationParameters"]
+        assertThat(runnerArgs).contains("de.mannodermaus.junit.unsupported.behavior=fail")
+    }
+
     @Test
     fun `copy configuration parameters to test runner arguments`() {
         project.addJUnit(JUnit5, "androidTest")
@@ -88,11 +114,11 @@ internal class InstrumentationSupportTests {
         }
         project.evaluate()
 
-        assertThat(
-                project.android.defaultConfig.testInstrumentationRunnerArguments[
-                        "configurationParameters"]
-            )
-            .isEqualTo("my.parameter1=true,my.parameter2=1234")
+        val runnerArgs =
+            project.android.defaultConfig.testInstrumentationRunnerArguments[
+                    "configurationParameters"]
+        assertThat(runnerArgs).contains("my.parameter1=true")
+        assertThat(runnerArgs).contains("my.parameter2=1234")
     }
 
     @Test
@@ -105,11 +131,11 @@ internal class InstrumentationSupportTests {
         }
         project.evaluate()
 
-        assertThat(
-                project.android.defaultConfig.testInstrumentationRunnerArguments[
-                        "configurationParameters"]
-            )
-            .isNull()
+        val runnerArgs =
+            project.android.defaultConfig.testInstrumentationRunnerArguments[
+                    "configurationParameters"]
+        assertThat(runnerArgs).doesNotContain("my.parameter1=true")
+        assertThat(runnerArgs).doesNotContain("my.parameter2=1234")
     }
 
     /* Dependencies */