Skip to content

Avoid adding empty configParams map to prevent invalid runnerArgs #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mannodermaus merged 1 commit into from
Sep 19, 2026
Merged

Avoid adding empty configParams map to prevent invalid runnerArgs #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...n/runner/src/main/kotlin/de/mannodermaus/junit5/internal/runners/AndroidJUnitFramework.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package de.mannodermaus.junit5.internal.runners

import android.util.Log
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import de.mannodermaus.junit5.internal.LOG_TAG
import de.mannodermaus.junit5.internal.discovery.EmptyTestPlan
import de.mannodermaus.junit5.internal.runners.notification.ParallelRunNotifier
import org.junit.platform.commons.JUnitException
Expand Down Expand Up @@ -36,6 +38,7 @@ internal class AndroidJUnitFramework(

override fun run(notifier: RunNotifier) {
testTree?.let { tree ->
Log.v(LOG_TAG, "run($testClass)")
launcher.execute(
tree.testPlan,
AndroidJUnitPlatformRunnerListener(tree, tree.createNotifier(notifier)),
Expand Down
2 changes: 1 addition & 1 deletion ...unit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class AndroidJUnitPlatformPlugin : Plugin<Project> {
whenAndroidPluginAdded { plugin ->
PluginConfig.find(this, plugin)?.let { config ->
require(config.currentAgpVersion >= MIN_REQUIRED_AGP_VERSION) {
"android-junit5 plugin requires Android Gradle Plugin $MIN_REQUIRED_AGP_VERSION or later"
"android-junit plugin requires Android Gradle Plugin $MIN_REQUIRED_AGP_VERSION or later"
}

configureJUnitFramework(config)
Expand Down
4 changes: 2 additions & 2 deletions ...junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/config/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ internal val MIN_REQUIRED_AGP_VERSION = AndroidPluginVersion(8, 2)

internal const val EXTENSION_NAME = "junitPlatform"

internal const val ANDROID_JUNIT5_RUNNER_BUILDER_CLASS =
"de.mannodermaus.junit5.AndroidJUnit5Builder"
internal const val ANDROID_JUNIT_RUNNER_BUILDER_CLASS =
"de.mannodermaus.junit5.AndroidJUnitFrameworkBuilder"
internal const val INSTRUMENTATION_RUNNER_LIBRARY_GROUP = "de.mannodermaus.junit5"
internal const val INSTRUMENTATION_RUNNER_LIBRARY_ARTIFACT = "android-test-runner"

Expand Down
8 changes: 5 additions & 3 deletions ...ndroid-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/internal/configure.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import com.android.builder.core.ComponentType.Companion.UNIT_TEST_SUFFIX
import de.mannodermaus.Libraries
import de.mannodermaus.Libraries.Instrumentation
import de.mannodermaus.gradle.plugins.junit5.dsl.AndroidJUnitPlatformExtension
import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT5_RUNNER_BUILDER_CLASS
import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT_RUNNER_BUILDER_CLASS
import de.mannodermaus.gradle.plugins.junit5.internal.config.EXTENSION_NAME
import de.mannodermaus.gradle.plugins.junit5.internal.config.JUnitPlatformTaskConfig
import de.mannodermaus.gradle.plugins.junit5.internal.config.PluginConfig
Expand Down Expand Up @@ -118,11 +118,11 @@ private fun AndroidJUnitPlatformExtension.prepareInstrumentationTests(

// Attach the JUnit 5 RunnerBuilder to the list, unless it's already added
val runnerBuilders = runnerArgs.getAsList("runnerBuilder")
if (ANDROID_JUNIT5_RUNNER_BUILDER_CLASS !in runnerBuilders) {
if (ANDROID_JUNIT_RUNNER_BUILDER_CLASS !in runnerBuilders) {
runnerArgs["runnerBuilder"] =
runnerBuilders
.toMutableList()
.also { it.add(ANDROID_JUNIT5_RUNNER_BUILDER_CLASS) }
.also { it.add(ANDROID_JUNIT_RUNNER_BUILDER_CLASS) }
.joinToString(",")
}

Expand All @@ -141,6 +141,8 @@ private fun AndroidJUnitPlatformExtension.prepareInstrumentationTests(
}

private fun MutableMap<String, String>.addConfigurationParameters(values: Map<String, String>) {
if (values.isEmpty()) return

val instrumentationParams = this.getAsList("configurationParameters").toMutableList()
values.forEach { (key, value) -> instrumentationParams.add("$key=$value") }
this["configurationParameters"] = instrumentationParams.joinToString(",")
Expand Down
6 changes: 3 additions & 3 deletions ...c/test/kotlin/de/mannodermaus/gradle/plugins/junit5/plugin/InstrumentationSupportTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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
import de.mannodermaus.gradle.plugins.junit5.internal.config.ANDROID_JUNIT_RUNNER_BUILDER_CLASS
import de.mannodermaus.gradle.plugins.junit5.internal.extensions.junitPlatform
import de.mannodermaus.gradle.plugins.junit5.util.assertThat
import de.mannodermaus.gradle.plugins.junit5.util.evaluate
Expand Down Expand Up @@ -40,7 +40,7 @@ internal class InstrumentationSupportTests {
assertThat(
project.android.defaultConfig.testInstrumentationRunnerArguments["runnerBuilder"]
)
.isEqualTo(ANDROID_JUNIT5_RUNNER_BUILDER_CLASS)
.isEqualTo(ANDROID_JUNIT_RUNNER_BUILDER_CLASS)
}

@Test
Expand All @@ -53,7 +53,7 @@ internal class InstrumentationSupportTests {
assertThat(
project.android.defaultConfig.testInstrumentationRunnerArguments["runnerBuilder"]
)
.isEqualTo("something.else,$ANDROID_JUNIT5_RUNNER_BUILDER_CLASS")
.isEqualTo("something.else,$ANDROID_JUNIT_RUNNER_BUILDER_CLASS")
}

@Test
Expand Down
Loading