Merge branch 'refs/heads/main' into #3102_allow_to_inherit_resource_locks

vdmitrienko · vdmitrienko · commit 291ee07d503c · 2024-11-25T12:21:36.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -31,5 +31,6 @@ gradle-app.setting
 coverage.db*
 .metadata
 /.sdkmanrc
+/.tool-versions
 
 checksums*
diff --git a/documentation/documentation.gradle.kts b/documentation/documentation.gradle.kts
@@ -176,6 +176,7 @@ tasks {
 
 	generateOpenTestHtmlReport {
 		mustRunAfter(consoleLauncherTest)
+		inputs.files(consoleLauncherTestEventXmlFiles).withPathSensitivity(RELATIVE).skipWhenEmpty()
 		argumentProviders += CommandLineArgumentProvider {
 			consoleLauncherTestEventXmlFiles.files.map { it.absolutePath }.toList()
 		}
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc
@@ -85,8 +85,8 @@ JUnit repository on GitHub.
 * Extensions based on `TestTemplateInvocationContextProvider` can now allow returning zero
   invocation contexts by overriding the new `mayReturnZeroTestTemplateInvocationContexts`
   method.
-* The new `@ParameterizedTest(requireArguments = false)` attribute allows to specify that
-  the absence of arguments is expected in some cases and should not cause a test failure.
+* The new `@ParameterizedTest(allowZeroInvocations = true)` attribute allows to specify that
+  the absence of invocations is expected in some cases and should not cause a test failure.
 * Allow determining "shared resources" at runtime via the new `@ResourceLock#providers`
   attribute that accepts implementations of `ResourceLocksProvider`.
 * Allow declaring "shared resources" for _direct_ child nodes via the new
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ ktlint = "1.4.1"
 log4j = "2.24.2"
 mockito = "5.14.2"
 opentest4j = "1.3.0"
-openTestReporting = "0.1.0-SNAPSHOT"
+openTestReporting = "0.2.0-SNAPSHOT"
 surefire = "3.5.2"
 xmlunit = "2.10.0"
 
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts
@@ -1,7 +1,7 @@
 
 import com.gradle.develocity.agent.gradle.internal.test.PredictiveTestSelectionConfigurationInternal
 import com.gradle.develocity.agent.gradle.test.PredictiveTestSelectionMode
-import org.gradle.api.tasks.PathSensitivity.NONE
+import org.gradle.api.tasks.PathSensitivity.RELATIVE
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.internal.os.OperatingSystem
@@ -41,7 +41,8 @@ val generateOpenTestHtmlReport by tasks.registering(JavaExec::class) {
 abstract class HtmlReportParameters : CommandLineArgumentProvider {
 
 	@get:InputFiles
-	@get:PathSensitive(NONE)
+	@get:PathSensitive(RELATIVE)
+	@get:SkipWhenEmpty
 	abstract val eventXmlFiles: ConfigurableFileCollection
 
 	@get:OutputFile
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTest.java
@@ -293,18 +293,18 @@
 	boolean autoCloseArguments() default true;
 
 	/**
-	 * Configure whether at least one set of arguments is required for this
+	 * Configure whether zero invocations are allowed for this
 	 * parameterized test.
 	 *
-	 * <p>Set this attribute to {@code false} if the absence of arguments is
+	 * <p>Set this attribute to {@code true} if the absence of invocations is
 	 * expected in some cases and should not cause a test failure.
 	 *
-	 * <p>Defaults to {@code true}.
+	 * <p>Defaults to {@code false}.
 	 *
 	 * @since 5.12
 	 */
 	@API(status = EXPERIMENTAL, since = "5.12")
-	boolean requireArguments() default true;
+	boolean allowZeroInvocations() default false;
 
 	/**
 	 * Configure how the number of arguments provided by an {@link ArgumentsSource} are validated.
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -86,15 +86,15 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 					return createInvocationContext(formatter, methodContext, arguments, invocationCount.intValue());
 				})
 				.onClose(() ->
-						Preconditions.condition(invocationCount.get() > 0 || !methodContext.annotation.requireArguments(),
+						Preconditions.condition(invocationCount.get() > 0 || methodContext.annotation.allowZeroInvocations(),
 								"Configuration error: You must configure at least one set of arguments for this @ParameterizedTest"));
 		// @formatter:on
 	}
 
 	@Override
 	public boolean mayReturnZeroTestTemplateInvocationContexts(ExtensionContext extensionContext) {
 		ParameterizedTestMethodContext methodContext = getMethodContext(extensionContext);
-		return !methodContext.annotation.requireArguments();
+		return methodContext.annotation.allowZeroInvocations();
 	}
 
 	private ParameterizedTestMethodContext getMethodContext(ExtensionContext extensionContext) {
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java
@@ -325,7 +325,7 @@ void method() {
 
 	static class TestCaseAllowNoArgumentsMethod {
 
-		@ParameterizedTest(requireArguments = false)
+		@ParameterizedTest(allowZeroInvocations = true)
 		void method() {
 		}
 	}
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -2422,7 +2422,7 @@ void testThatRequiresArguments(String argument) {
 			fail("This test should not be executed, because no arguments are provided.");
 		}
 
-		@ParameterizedTest(requireArguments = false)
+		@ParameterizedTest(allowZeroInvocations = true)
 		@MethodSource("zeroArgumentsProvider")
 		void testThatDoesNotRequireArguments(String argument) {
 			fail("This test should not be executed, because no arguments are provided.");
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/JUnitContributorTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/JUnitContributorTests.java
@@ -26,7 +26,7 @@ public class JUnitContributorTests {
 	void contributesJUnitSpecificMetadata(@TempDir Path tempDir) throws Exception {
 		var xmlFile = Files.writeString(tempDir.resolve("report.xml"),
 			"""
-					<e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.1.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.1.0" xmlns:java="https://schemas.opentest4j.org/reporting/java/0.1.0"
+					<e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.2.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.2.0" xmlns:java="https://schemas.opentest4j.org/reporting/java/0.2.0"
 					          xmlns:junit="https://schemas.junit.org/open-test-reporting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					          xsi:schemaLocation="https://schemas.junit.org/open-test-reporting https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd">
 					    <e:started id="1" name="dummy" time="2024-11-10T16:31:35.000Z">
diff --git a/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java b/platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java
@@ -24,6 +24,7 @@
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -61,9 +62,9 @@ void writesValidXmlReport() throws Exception {
 		assertThat(validate(xmlFile)).isEmpty();
 
 		var expected = """
-				<e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.1.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.1.0"
-				          xmlns:git="https://schemas.opentest4j.org/reporting/git/0.1.0"
-				          xmlns:java="https://schemas.opentest4j.org/reporting/java/0.1.0"
+				<e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.2.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.2.0"
+				          xmlns:git="https://schemas.opentest4j.org/reporting/git/0.2.0"
+				          xmlns:java="https://schemas.opentest4j.org/reporting/java/0.2.0"
 				          xmlns:junit="https://schemas.junit.org/open-test-reporting"
 				          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				          xsi:schemaLocation="https://schemas.junit.org/open-test-reporting https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd">
@@ -75,9 +76,9 @@ void writesValidXmlReport() throws Exception {
 				        <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
 				        <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
 				        <java:heapSize max="${xmlunit.isNumber}"/>
-				        <git:repository originUrl="${xmlunit.matchesRegex(https://.+)}"/>
+				        <git:repository originUrl="${xmlunit.matchesRegex#(git@|https://).+#}"/>
 				        <git:branch>${xmlunit.ignore}</git:branch>
-				        <git:commit>${xmlunit.matchesRegex([0-9a-f]{40})}</git:commit>
+				        <git:commit>${xmlunit.matchesRegex#[0-9a-f]{40}#}</git:commit>
 				        <git:status clean="${xmlunit.ignore}">${xmlunit.ignore}</git:status>
 				    </infrastructure>
 				    <e:started id="1" name="dummy" time="${xmlunit.isDateTime}">
@@ -104,7 +105,7 @@ void writesValidXmlReport() throws Exception {
 				    <e:finished id="2" time="${xmlunit.isDateTime}">
 				        <result status="FAILED">
 				            <java:throwable assertionError="true" type="org.opentest4j.AssertionFailedError">
-				                ${xmlunit.matchesRegex(org\\.opentest4j\\.AssertionFailedError: failure message)}
+				                ${xmlunit.matchesRegex#org\\.opentest4j\\.AssertionFailedError: failure message#}
 				            </java:throwable>
 				        </result>
 				    </e:finished>
@@ -115,7 +116,8 @@ void writesValidXmlReport() throws Exception {
 				""";
 
 		XmlAssert.assertThat(xmlFile).and(expected) //
-				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator(Pattern.quote("${"), Pattern.quote("}"),
+					Pattern.quote("#"), Pattern.quote("#"), ",")) //
 				.ignoreWhitespace() //
 				.areIdentical();
 	}
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -140,6 +140,7 @@ tasks.test {
 		dependsOn(normalizeMavenRepo)
 		jvmArgumentProviders += MavenRepo(project, normalizeMavenRepo.map { it.destinationDir })
 	}
+	environment.remove("JAVA_TOOL_OPTIONS")
 
 	jvmArgumentProviders += JarPath(project, thirdPartyJarsClasspath.get(), "thirdPartyJars")
 	jvmArgumentProviders += JarPath(project, antJarsClasspath.get(), "antJars")
diff --git a/platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts b/platform-tooling-support-tests/projects/graalvm-starter/settings.gradle.kts
@@ -8,4 +8,8 @@ pluginManagement {
 	}
 }
 
+plugins {
+	id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "graalvm-starter"
diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/settings.gradle.kts b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "gradle-kotlin-extensions"
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/settings.gradle.kts b/platform-tooling-support-tests/projects/gradle-missing-engine/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "gradle-missing-engine"
diff --git a/platform-tooling-support-tests/projects/gradle-starter/settings.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "gradle-starter"
diff --git a/platform-tooling-support-tests/projects/reflection-tests/settings.gradle.kts b/platform-tooling-support-tests/projects/reflection-tests/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "reflection-tests"
diff --git a/platform-tooling-support-tests/projects/vintage/settings.gradle.kts b/platform-tooling-support-tests/projects/vintage/settings.gradle.kts
@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "vintage"
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/XmlAssertions.java
@@ -14,6 +14,7 @@
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.regex.Pattern;
 
 import org.xmlunit.assertj3.XmlAssert;
 import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator;
@@ -34,8 +35,8 @@ static void verifyContainsExpectedStartedOpenTestReport(Path testResultsDir) {
 
 	private static void verifyContent(Path xmlFile) {
 		var expected = """
-				        <e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.1.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.1.0" xmlns:git="https://schemas.opentest4j.org/reporting/git/0.1.0"
-				                  xmlns:java="https://schemas.opentest4j.org/reporting/java/0.1.0"
+				        <e:events xmlns="https://schemas.opentest4j.org/reporting/core/0.2.0" xmlns:e="https://schemas.opentest4j.org/reporting/events/0.2.0" xmlns:git="https://schemas.opentest4j.org/reporting/git/0.2.0"
+				                  xmlns:java="https://schemas.opentest4j.org/reporting/java/0.2.0"
 				                  xmlns:junit="https://schemas.junit.org/open-test-reporting" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				                  xsi:schemaLocation="https://schemas.junit.org/open-test-reporting https://junit.org/junit5/schemas/open-test-reporting/junit-1.9.xsd">
 				          <infrastructure>
@@ -46,9 +47,9 @@ private static void verifyContent(Path xmlFile) {
 				            <java:javaVersion>${xmlunit.ignore}</java:javaVersion>
 				            <java:fileEncoding>${xmlunit.ignore}</java:fileEncoding>
 				            <java:heapSize max="${xmlunit.isNumber}"/>
-				            <git:repository originUrl="${xmlunit.matchesRegex(https://.+)}"/>
+				            <git:repository originUrl="${xmlunit.matchesRegex#(git@|https://).+#}"/>
 				            <git:branch>${xmlunit.ignore}</git:branch>
-				            <git:commit>${xmlunit.matchesRegex([0-9a-f]{40})}</git:commit>
+				            <git:commit>${xmlunit.matchesRegex#[0-9a-f]{40}#}</git:commit>
 				            <git:status clean="${xmlunit.ignore}">${xmlunit.ignore}</git:status>
 				          </infrastructure>
 				          <e:started id="1" name="JUnit Jupiter" time="${xmlunit.isDateTime}">
@@ -156,7 +157,8 @@ private static void verifyContent(Path xmlFile) {
 				""";
 
 		XmlAssert.assertThat(xmlFile).and(expected) //
-				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator()) //
+				.withDifferenceEvaluator(new PlaceholderDifferenceEvaluator(Pattern.quote("${"), Pattern.quote("}"),
+					Pattern.quote("#"), Pattern.quote("#"), ",")) //
 				.ignoreWhitespace() //
 				.areIdentical();
 	}

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ tasks {`
`176`	`176`
`177`	`177`	`generateOpenTestHtmlReport {`
`178`	`178`	`mustRunAfter(consoleLauncherTest)`
	`179`	`+ inputs.files(consoleLauncherTestEventXmlFiles).withPathSensitivity(RELATIVE).skipWhenEmpty()`
`179`	`180`	`argumentProviders += CommandLineArgumentProvider {`
`180`	`181`	`consoleLauncherTestEventXmlFiles.files.map { it.absolutePath }.toList()`
`181`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ void method() {`
`325`	`325`
`326`	`326`	`static class TestCaseAllowNoArgumentsMethod {`
`327`	`327`
`328`		`- @ParameterizedTest(requireArguments = false)`
	`328`	`+ @ParameterizedTest(allowZeroInvocations = true)`
`329`	`329`	`void method() {`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2422,7 +2422,7 @@ void testThatRequiresArguments(String argument) {`
`2422`	`2422`	`fail("This test should not be executed, because no arguments are provided.");`
`2423`	`2423`	`}`
`2424`	`2424`
`2425`		`- @ParameterizedTest(requireArguments = false)`
	`2425`	`+ @ParameterizedTest(allowZeroInvocations = true)`
`2426`	`2426`	`@MethodSource("zeroArgumentsProvider")`
`2427`	`2427`	`void testThatDoesNotRequireArguments(String argument) {`
`2428`	`2428`	`fail("This test should not be executed, because no arguments are provided.");`