Close all arguments, not just consumed ones

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-5.13.0-M1.adoc

@@ -35,7 +35,11 @@ repository on GitHub.
 [[release-notes-5.13.0-M1-junit-jupiter-bug-fixes]]
 ==== Bug Fixes
 
-* ❓
+* If `@ParameterizedTest(autoCloseArguments = true)`, all arguments returned by the used
+  `ArgumentsProvider` implementations are now closed even if the test method declares
+  fewer parameters.
+* `AutoCloseable` arguments returned by an `ArgumentsProvider` are now closed even if they
+  are wrapped with `Named`.
 
 [[release-notes-5.13.0-M1-junit-jupiter-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes

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

@@ -95,7 +95,7 @@ public void afterTestExecution(ExtensionContext context) {
 		Store store = context.getStore(NAMESPACE);
 		AtomicInteger argumentIndex = new AtomicInteger();
 
-		Arrays.stream(this.arguments.getConsumedPayloads()) //
+		Arrays.stream(this.arguments.getAllPayloads()) //
 				.filter(AutoCloseable.class::isInstance) //
 				.map(AutoCloseable.class::cast) //
 				.map(CloseableArgument::new) //

jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java

@@ -14,7 +14,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.within;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -127,8 +126,9 @@ class ParameterizedTestIntegrationTests {
 	private final Locale originalLocale = Locale.getDefault(Locale.Category.FORMAT);
 
 	@AfterEach
-	void restoreLocale() {
+	void reset() {
 		Locale.setDefault(Locale.Category.FORMAT, originalLocale);
+		AutoCloseableArgument.closeCounter = 0;
 	}
 
 	@ParameterizedTest
@@ -1310,7 +1310,7 @@ void closeAutoCloseableArgumentsAfterTest() {
 		results.allEvents().assertThatEvents() //
 				.haveExactly(1, event(test(), finishedSuccessfully()));
 
-		assertTrue(AutoCloseableArgument.isClosed);
+		assertEquals(2, AutoCloseableArgument.closeCounter);
 	}
 
 	@Test
@@ -1441,7 +1441,7 @@ void testWithIgnoreLeadingAndTrailingWhitespaceSetToTrueForCsvFileSource(String
 		@ParameterizedTest
 		@ArgumentsSource(AutoCloseableArgumentProvider.class)
 		void testWithAutoCloseableArgument(AutoCloseableArgument autoCloseable) {
-			assertFalse(AutoCloseableArgument.isClosed);
+			assertEquals(0, AutoCloseableArgument.closeCounter);
 		}
 
 		@ParameterizedTest
@@ -2521,17 +2521,17 @@ private static class AutoCloseableArgumentProvider implements ArgumentsProvider
 
 		@Override
 		public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-			return Stream.of(arguments(new AutoCloseableArgument()));
+			return Stream.of(arguments(new AutoCloseableArgument(), Named.of("unused", new AutoCloseableArgument())));
 		}
 	}
 
 	static class AutoCloseableArgument implements AutoCloseable {
 
-		static boolean isClosed = false;
+		static int closeCounter = 0;
 
 		@Override
 		public void close() {
-			isClosed = true;
+			closeCounter++;
 		}
 	}