Merge branch 'main' into experiments/junit-onramp

Author: sormuras

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/TestInstantiationAwareExtension.java

@@ -21,7 +21,7 @@
  * Interface for {@link Extension Extensions} that are aware and can influence
  * the instantiation of test instances.
  *
- * <p>This interface is not indented to be implemented directly. Instead, extend
+ * <p>This interface is not intended to be implemented directly. Instead, extend
  * one of its sub-interfaces.
  *
  * @since 5.12

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationContextProvider.java

@@ -37,19 +37,18 @@ protected Stream<T> provideInvocationContexts(ExtensionContext extensionContext,
 			declarationContext);
 		AtomicLong invocationCount = new AtomicLong(0);
 
-		// @formatter:off
-		return argumentsSources
-				.stream()
-				.map(ArgumentsSource::value)
-				.map(clazz -> ParameterizedTestSpiInstantiator.instantiate(ArgumentsProvider.class, clazz, extensionContext))
-				.map(provider -> AnnotationConsumerInitializer.initialize(declarationContext.getAnnotatedElement(), provider))
-				.flatMap(provider -> arguments(provider, parameters, extensionContext))
+		return argumentsSources.stream() //
+				.map(ArgumentsSource::value) //
+				.map(clazz -> ParameterizedTestSpiInstantiator.instantiate(ArgumentsProvider.class, clazz,
+					extensionContext)) //
+				.map(provider -> AnnotationConsumerInitializer.initialize(declarationContext.getAnnotatedElement(),
+					provider)) //
+				.flatMap(provider -> arguments(provider, parameters, extensionContext)) //
 				.map(arguments -> {
 					invocationCount.incrementAndGet();
 					return declarationContext.createInvocationContext(formatter, arguments, invocationCount.intValue());
-				})
-				.onClose(() -> validateInvokedAtLeastOnce(invocationCount.get(),declarationContext ));
-		// @formatter:on
+				}) //
+				.onClose(() -> validateInvokedAtLeastOnce(invocationCount.get(), declarationContext));
 	}
 
 	private static <T> void validateInvokedAtLeastOnce(long invocationCount,

platform-tests/src/test/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListenerTests.java

@@ -191,7 +191,7 @@ void includesGitInfoWhenEnabled(String originUrl, @TempDir Path tempDirectory) t
 
 		execGit(tempDirectory, "config", "user.name", "Alice");
 		execGit(tempDirectory, "config", "user.email", "[email protected]");
-		execGit(tempDirectory, "commit", "-m", "Initial commit");
+		execGit(tempDirectory, "commit", "--no-gpg-sign", "-m", "Initial commit");
 
 		var engine = new DemoHierarchicalTestEngine("dummy");
 
@@ -280,6 +280,7 @@ private static ProcessResult tryExecGit(Path workingDir, String... arguments) th
 		System.out.println("$ git " + String.join(" ", arguments));
 		return new ProcessStarter() //
 				.executable(Path.of("git")) //
+				.putEnvironment("GIT_CONFIG_GLOBAL", "/dev/null") // https://git-scm.com/docs/git#Documentation/git.txt-GITCONFIGGLOBAL
 				.workingDir(workingDir) //
 				.addArguments(arguments) //
 				.startAndWait();