Fix support pre-5.13 AnnotationBasedArgumentsProvider implementations (#4611)

The `provideArguments(ExtensionContext, Annotation)` was deprecated in
5.13 and no longer taken into account when determining the consumed
annotation. Now, it is checked for again if the new method overload
couldn't be found.

Fixes #4610.

(cherry picked from commit 4bbe57d)

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-5.13.1.adoc

@@ -42,6 +42,8 @@ on GitHub.
   in their enclosing class. This undesired change in behavior has now been reverted so
   that tests in `@Nested` test classes are always executed _after_ tests in enclosing test
   classes again.
+* Fix support for `AnnotationBasedArgumentsProvider` implementations that override the
+  deprecated `provideArguments(ExtensionContext, Annotation)` method.
 
 [[release-notes-5.13.1-junit-jupiter-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes

junit-jupiter-params/src/main/java/org/junit/jupiter/params/support/AnnotationConsumerInitializer.java

@@ -41,6 +41,7 @@ public final class AnnotationConsumerInitializer {
 	private static final List<AnnotationConsumingMethodSignature> annotationConsumingMethodSignatures = asList( //
 		new AnnotationConsumingMethodSignature("accept", 1, 0), //
 		new AnnotationConsumingMethodSignature("provideArguments", 3, 2), //
+		new AnnotationConsumingMethodSignature("provideArguments", 2, 1), //
 		new AnnotationConsumingMethodSignature("convert", 3, 2));
 
 	private AnnotationConsumerInitializer() {

jupiter-tests/src/test/java/org/junit/jupiter/params/support/AnnotationConsumerInitializerTests.java

@@ -23,17 +23,21 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.converter.AnnotationBasedArgumentConverter;
 import org.junit.jupiter.params.converter.JavaTimeConversionPattern;
 import org.junit.jupiter.params.provider.AnnotationBasedArgumentsProvider;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.FieldSource;
 import org.junit.platform.commons.JUnitException;
 
 @DisplayName("AnnotationConsumerInitializer")
@@ -51,10 +55,11 @@ void shouldInitializeAnnotationConsumer() throws NoSuchMethodException {
 					source -> assertThat(source.value()).containsExactly("a", "b"));
 	}
 
-	@Test
+	@ParameterizedTest
+	@FieldSource("argumentsProviders")
 	@DisplayName("should initialize annotation-based ArgumentsProvider")
-	void shouldInitializeAnnotationBasedArgumentsProvider() throws NoSuchMethodException {
-		var instance = new SomeAnnotationBasedArgumentsProvider();
+	void shouldInitializeAnnotationBasedArgumentsProvider(AbstractAnnotationBasedArgumentsProvider instance)
+			throws NoSuchMethodException {
 		var method = SubjectClass.class.getDeclaredMethod("foo");
 		var initialisedAnnotationConsumer = initialize(method, instance);
 
@@ -101,20 +106,32 @@ void shouldThrowExceptionWhenParameterIsNotAnnotated() throws NoSuchMethodExcept
 		assertThatThrownBy(() -> initialize(parameter, instance)).isInstanceOf(JUnitException.class);
 	}
 
-	@Test
-	void shouldInitializeForEachAnnotations() throws NoSuchMethodException {
-		var instance = spy(new SomeAnnotationBasedArgumentsProvider());
+	@ParameterizedTest
+	@FieldSource("argumentsProviders")
+	void shouldInitializeForEachAnnotations(AbstractAnnotationBasedArgumentsProvider provider)
+			throws NoSuchMethodException {
+		var instance = spy(provider);
 		var method = SubjectClass.class.getDeclaredMethod("repeatableAnnotation", String.class);
 
 		initialize(method, instance);
 
 		verify(instance, times(2)).accept(any(CsvSource.class));
 	}
 
-	private static class SomeAnnotationBasedArgumentsProvider extends AnnotationBasedArgumentsProvider<CsvSource> {
+	static Supplier<List<Named<? extends AbstractAnnotationBasedArgumentsProvider>>> argumentsProviders = () -> List.of( //
+		Named.of("current", new SomeAnnotationBasedArgumentsProvider()), //
+		Named.of("deprecated", new DeprecatedAnnotationBasedArgumentsProvider()) //
+	);
+
+	private static abstract class AbstractAnnotationBasedArgumentsProvider
+			extends AnnotationBasedArgumentsProvider<CsvSource> {
 
 		List<CsvSource> annotations = new ArrayList<>();
 
+	}
+
+	private static class SomeAnnotationBasedArgumentsProvider extends AbstractAnnotationBasedArgumentsProvider {
+
 		@Override
 		protected Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters,
 				ExtensionContext context, CsvSource annotation) {
@@ -123,6 +140,16 @@ protected Stream<? extends Arguments> provideArguments(ParameterDeclarations par
 		}
 	}
 
+	private static class DeprecatedAnnotationBasedArgumentsProvider extends AbstractAnnotationBasedArgumentsProvider {
+
+		@Override
+		@SuppressWarnings("deprecation")
+		protected Stream<? extends Arguments> provideArguments(ExtensionContext context, CsvSource annotation) {
+			annotations.add(annotation);
+			return Stream.empty();
+		}
+	}
+
 	private static class SomeAnnotationBasedArgumentConverter
 			extends AnnotationBasedArgumentConverter<JavaTimeConversionPattern> {