Merge branch 'main' into marc/5098-package-private-hidden-methods

marcphilipp · web-flow · commit fa4b78afa401 · 2025-10-28T15:40:59.000+01:00
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc
@@ -45,6 +45,8 @@ repository on GitHub.
   to avoid conflicts with other control characters.
 * Fix `IllegalAccessError` thrown when using the Kotlin-specific `assertDoesNotThrow`
   assertion.
+* Stop reporting discovery issues for synthetic methods, particularly in conjunction with
+  Kotlin suspend functions.
 * Fix support for test methods with the same signature as a package-private methods
   declared in super classes in different packages.
 
diff --git a/documentation/src/docs/asciidoc/user-guide/running-tests.adoc b/documentation/src/docs/asciidoc/user-guide/running-tests.adoc
@@ -748,10 +748,12 @@ include::{consoleLauncherDiscoverOptionsFile}[]
 ===== Executing tests
 
 .Exit Code
-NOTE: The `{ConsoleLauncher}` exits with a status code of `1` if any containers or tests
-failed. If no tests are discovered and the `--fail-if-no-tests` command-line option is
-supplied, the `ConsoleLauncher` exits with a status code of `2`. Otherwise, the exit code
-is `0`.
+NOTE: On successful runs, the `{ConsoleLauncher}` exits with a status code of `0`.
+All non-zero codes indicate an error of some sort. For example, status code `1`
+is returned if any containers or tests failed. If no tests are discovered and the
+`--fail-if-no-tests` command-line option is supplied, the `ConsoleLauncher` exits
+with a status code of `2`. Unexpected or invalid user input yields a status code
+of `3`. An exit code of `-1` indicates an unspecified error condition.
 
 ----
 include::{consoleLauncherExecuteOptionsFile}[]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,14 +32,16 @@ bndlib = { module = "biz.aQute.bnd:biz.aQute.bndlib", version.ref = "bnd" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
 classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.184" }
 commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
-error-prone-contrib = { module = "tech.picnic.error-prone-support:error-prone-contrib", version = "0.25.0" }
+error-prone-contrib = { module = "tech.picnic.error-prone-support:error-prone-contrib", version = "0.26.0" }
 error-prone-core = { module = "com.google.errorprone:error_prone_core", version = "2.43.0" }
 fastcsv = { module = "de.siegmar:fastcsv", version = "4.1.0" }
 groovy = { module = "org.apache.groovy:groovy", version = "5.0.2" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "3.0" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jaxb-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version = "4.0.4" }
+jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version = "4.0.6" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.1" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
@@ -72,6 +74,7 @@ snapshotTests-xml = { module = "de.skuzzle.test:snapshot-tests-xml", version.ref
 spock1 = { module = "org.spockframework:spock-core", version = "1.3-groovy-2.5" }
 xmlunit-assertj = { module = "org.xmlunit:xmlunit-assertj3", version.ref = "xmlunit" }
 xmlunit-placeholders = { module = "org.xmlunit:xmlunit-placeholders", version.ref = "xmlunit" }
+xmlunit-jakarta-jaxb-impl = { module = "org.xmlunit:xmlunit-jakarta-jaxb-impl", version.ref = "xmlunit" }
 testingAnnotations = { module = "com.gradle:develocity-testing-annotations", version = "2.0.1" }
 woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version = "7.1.1" }
 
@@ -87,7 +90,7 @@ ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint
 [bundles]
 ant = ["ant", "ant-junit", "ant-junitlauncher"]
 log4j = ["log4j-core", "log4j-jul"]
-xmlunit = ["xmlunit-assertj", "xmlunit-placeholders"]
+xmlunit = ["xmlunit-assertj", "xmlunit-placeholders", "xmlunit-jakarta-jaxb-impl", "jaxb-api", "jaxb-runtime"]
 
 [plugins]
 asciidoctorConvert = { id = "org.asciidoctor.jvm.convert", version.ref = "asciidoctor-plugins" }
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-nohttp.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.checkstyle-nohttp.gradle.kts
@@ -15,9 +15,9 @@ dependencies {
 		}
 		checkstyle("ch.qos.logback:logback-classic") {
 			version {
-				require("1.5.18")
+				require("1.5.19")
 			}
-			because("Workaround for CVE-2024-12798 and CVE-2024-12801")
+			because("Workaround for CVE-2025-11226")
 		}
 	}
 }
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/IsTestableMethod.java
@@ -45,7 +45,7 @@ abstract class IsTestableMethod implements Predicate<Method> {
 
 	@Override
 	public boolean test(Method candidate) {
-		if (isAnnotated(candidate, this.annotationType)) {
+		if (!candidate.isSynthetic() && isAnnotated(candidate, this.annotationType)) {
 			return condition.check(candidate) && isNotAbstract(candidate);
 		}
 		return false;
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/KotlinReflectionUtils.java
@@ -67,7 +67,7 @@ private static Try<Class<? extends Annotation>> tryToLoadKotlinMetadataClass() {
 	 */
 	@API(status = INTERNAL, since = "6.0")
 	public static boolean isKotlinSuspendingFunction(Method method) {
-		if (kotlinCoroutineContinuation != null && isKotlinType(method.getDeclaringClass())) {
+		if (!method.isSynthetic() && kotlinCoroutineContinuation != null && isKotlinType(method.getDeclaringClass())) {
 			int parameterCount = method.getParameterCount();
 			return parameterCount > 0 //
 					&& method.getParameterTypes()[parameterCount - 1] == kotlinCoroutineContinuation;
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/BaseCommand.java
@@ -59,14 +59,14 @@ static CommandLine initialize(CommandLine commandLine) {
 		return commandLine //
 				.setParameterExceptionHandler((ex, args) -> {
 					defaultParameterExceptionHandler.handleParseException(ex, args);
-					return CommandResult.FAILURE;
+					return ExitCode.ANY_ERROR;
 				}) //
 				.setExecutionExceptionHandler((ex, cmd, __) -> {
 					commandLine.getErr().println(cmd.getColorScheme().richStackTraceString(ex));
 					commandLine.getErr().println();
 					commandLine.getErr().flush();
 					cmd.usage(commandLine.getOut());
-					return CommandResult.FAILURE;
+					return ExitCode.ANY_ERROR;
 				}) //
 				.setCaseInsensitiveEnumValuesAllowed(true) //
 				.setAtFileCommentChar(null);
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/CommandResult.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/CommandResult.java
@@ -22,23 +22,8 @@
  */
 @API(status = INTERNAL, since = "1.10")
 public class CommandResult<T> {
-
-	/**
-	 * Exit code indicating successful execution.
-	 */
-	public static final int SUCCESS = 0;
-
-	/**
-	 * Exit code indicating any failure(s).
-	 */
-	protected static final int FAILURE = -1;
-
 	public static <T> CommandResult<T> success() {
-		return create(SUCCESS, null);
-	}
-
-	public static <T> CommandResult<T> failure() {
-		return create(FAILURE, null);
+		return create(ExitCode.SUCCESS, null);
 	}
 
 	public static <T> CommandResult<T> create(int exitCode, @Nullable T value) {
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/ExecuteTestsCommand.java
@@ -10,7 +10,9 @@
 
 package org.junit.platform.console.command;
 
-import static org.junit.platform.console.command.CommandResult.SUCCESS;
+import static org.junit.platform.console.command.ExitCode.NO_TESTS_FOUND;
+import static org.junit.platform.console.command.ExitCode.SUCCESS;
+import static org.junit.platform.console.command.ExitCode.TEST_FAILED;
 
 import java.io.PrintWriter;
 import java.nio.file.Path;
@@ -34,17 +36,6 @@
 		description = "Execute tests" //
 )
 class ExecuteTestsCommand extends BaseCommand<TestExecutionSummary> implements CommandLine.IExitCodeGenerator {
-
-	/**
-	 * Exit code indicating test failure(s)
-	 */
-	private static final int TEST_FAILED = 1;
-
-	/**
-	 * Exit code indicating no tests found
-	 */
-	private static final int NO_TESTS_FOUND = 2;
-
 	private final ConsoleTestExecutor.Factory consoleTestExecutorFactory;
 
 	@Mixin
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/ExitCode.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/ExitCode.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015-2025 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.platform.console.command;
+
+/**
+ * Well-known exit codes of the {@code junit} tool.
+ *
+ * @since 6.0.1
+ */
+final class ExitCode {
+	/**
+	 * Exit code indicating a successful tool run.
+	 */
+	public static final int SUCCESS = 0;
+
+	/**
+	 * Exit code indicating an unsuccessful run.
+	 */
+	public static final int ANY_ERROR = -1;
+
+	/**
+	 * Exit code indicating test failure(s).
+	 */
+	public static final int TEST_FAILED = 1;
+
+	/**
+	 * Exit code indicating no tests found.
+	 */
+	public static final int NO_TESTS_FOUND = 2;
+
+	/**
+	 * Exit code indicating invalid user input.
+	 */
+	public static final int INVALID_INPUT = 3;
+
+	private ExitCode() {
+	}
+}
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java b/junit-platform-console/src/main/java/org/junit/platform/console/command/MainCommand.java
@@ -39,8 +39,8 @@
 		footer = "For more information, please refer to the JUnit User Guide at%n" //
 				+ "@|underline https://docs.junit.org/${junit.docs.version}/user-guide/|@", //
 		scope = CommandLine.ScopeType.INHERIT, //
-		exitCodeOnInvalidInput = CommandResult.FAILURE, //
-		exitCodeOnExecutionException = CommandResult.FAILURE, //
+		exitCodeOnInvalidInput = ExitCode.INVALID_INPUT, //
+		exitCodeOnExecutionException = ExitCode.ANY_ERROR, //
 		versionProvider = ManifestVersionProvider.class //
 )
 class MainCommand implements Runnable, IExitCodeGenerator {
diff --git a/jupiter-tests/src/test/kotlin/org/junit/jupiter/api/kotlin/KotlinSuspendFunctionsTests.kt b/jupiter-tests/src/test/kotlin/org/junit/jupiter/api/kotlin/KotlinSuspendFunctionsTests.kt
@@ -41,6 +41,13 @@ class KotlinSuspendFunctionsTests : AbstractJupiterTestEngineTests() {
         assertThat(getPublishedEvents(results)).containsExactly("test")
     }
 
+    @Test
+    fun suspendingOpenTestMethodsAreSupported() {
+        val results = executeTestsForClass(OpenTestMethodTestCase::class)
+        assertAllTestsPassed(results, 1)
+        assertThat(getPublishedEvents(results)).containsExactly("test")
+    }
+
     @Test
     fun suspendingTestTemplateMethodsAreSupported() {
         val results = executeTestsForClass(TestTemplateTestCase::class)
@@ -187,6 +194,14 @@ class KotlinSuspendFunctionsTests : AbstractJupiterTestEngineTests() {
         }
     }
 
+    @Suppress("JUnitMalformedDeclaration")
+    open class OpenTestMethodTestCase {
+        @Test // https://github.com/junit-team/junit-framework/issues/5102
+        open suspend fun `check getRandomPositiveInt`(reporter: TestReporter) {
+            suspendingPublish(reporter, "test")
+        }
+    }
+
     @Suppress("RedundantSuspendModifier")
     companion object {
         suspend fun suspendingPublish(
diff --git a/platform-tests/platform-tests.gradle.kts b/platform-tests/platform-tests.gradle.kts
@@ -5,7 +5,7 @@ import org.gradle.plugins.ide.eclipse.model.Classpath
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
 plugins {
-	id("junitbuild.java-library-conventions")
+	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.junit4-compatibility")
 	id("junitbuild.testing-conventions")
 	id("junitbuild.jmh-conventions")
@@ -54,6 +54,7 @@ dependencies {
 	testImplementation(libs.openTestReporting.tooling.core)
 	testImplementation(libs.picocli)
 	testImplementation(libs.bundles.xmlunit)
+	testImplementation(kotlin("stdlib"))
 	testImplementation(testFixtures(projects.junitJupiterApi))
 	testImplementation(testFixtures(projects.junitPlatformReporting))
 	testImplementation(projects.platformTests) {
diff --git a/platform-tests/src/test/kotlin/org/junit/platform/commons/util/KotlinReflectionUtilsTests.kt b/platform-tests/src/test/kotlin/org/junit/platform/commons/util/KotlinReflectionUtilsTests.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015-2025 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+package org.junit.platform.commons.util
+
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.junit.platform.commons.support.ModifierSupport
+import kotlin.coroutines.Continuation
+
+class KotlinReflectionUtilsTests {
+    @Test
+    fun recognizesSuspendFunction() {
+        val method =
+            OpenTestMethodTestCase::class.java.getDeclaredMethod(
+                "test",
+                Continuation::class.java
+            )
+
+        assertFalse(ModifierSupport.isStatic(method))
+        assertFalse(method.isSynthetic)
+
+        assertTrue(KotlinReflectionUtils.isKotlinSuspendingFunction(method))
+    }
+
+    @Test
+    fun doesNotRecognizeSyntheticMethodAsSuspendFunction() {
+        val method =
+            OpenTestMethodTestCase::class.java.getDeclaredMethod(
+                "test\$suspendImpl",
+                OpenTestMethodTestCase::class.java,
+                Continuation::class.java
+            )
+
+        assertTrue(ModifierSupport.isStatic(method))
+        assertTrue(method.isSynthetic)
+
+        assertFalse(KotlinReflectionUtils.isKotlinSuspendingFunction(method))
+    }
+
+    @Suppress("JUnitMalformedDeclaration")
+    open class OpenTestMethodTestCase {
+        @Test
+        open suspend fun test() {
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ dependencies {`
`15`	`15`	`}`
`16`	`16`	`checkstyle("ch.qos.logback:logback-classic") {`
`17`	`17`	`version {`
`18`		`- require("1.5.18")`
	`18`	`+ require("1.5.19")`
`19`	`19`	`}`
`20`		`- because("Workaround for CVE-2024-12798 and CVE-2024-12801")`
	`20`	`+ because("Workaround for CVE-2025-11226")`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ abstract class IsTestableMethod implements Predicate<Method> {`
`45`	`45`
`46`	`46`	`@Override`
`47`	`47`	`public boolean test(Method candidate) {`
`48`		`- if (isAnnotated(candidate, this.annotationType)) {`
	`48`	`+ if (!candidate.isSynthetic() && isAnnotated(candidate, this.annotationType)) {`
`49`	`49`	`return condition.check(candidate) && isNotAbstract(candidate);`
`50`	`50`	`}`
`51`	`51`	`return false;`