Merge branch '6.2.x'

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java

@@ -281,7 +281,7 @@ public void afterEach(ExtensionContext context) throws Exception {
 	 * <ol>
 	 * <li>The {@linkplain ParameterContext#getDeclaringExecutable() declaring
 	 * executable} is a {@link Constructor} and
-	 * {@link TestConstructorUtils#isAutowirableConstructor(Constructor, Class, PropertyProvider)}
+	 * {@link TestConstructorUtils#isAutowirableConstructor(Executable, PropertyProvider)}
 	 * returns {@code true}. Note that {@code isAutowirableConstructor()} will be
 	 * invoked with a fallback {@link PropertyProvider} that delegates its lookup
 	 * to {@link ExtensionContext#getConfigurationParameter(String)}.</li>
@@ -296,17 +296,16 @@ public void afterEach(ExtensionContext context) throws Exception {
 	 * constructor. Consequently, no other registered {@link ParameterResolver}
 	 * will be able to resolve parameters.
 	 * @see #resolveParameter
-	 * @see TestConstructorUtils#isAutowirableConstructor(Constructor, Class)
+	 * @see TestConstructorUtils#isAutowirableConstructor(Executable, PropertyProvider)
 	 * @see ParameterResolutionDelegate#isAutowirable
 	 */
 	@Override
 	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
 		Parameter parameter = parameterContext.getParameter();
 		Executable executable = parameter.getDeclaringExecutable();
-		Class<?> testClass = extensionContext.getRequiredTestClass();
 		PropertyProvider junitPropertyProvider = propertyName ->
 				extensionContext.getConfigurationParameter(propertyName).orElse(null);
-		return (TestConstructorUtils.isAutowirableConstructor(executable, testClass, junitPropertyProvider) ||
+		return (TestConstructorUtils.isAutowirableConstructor(executable, junitPropertyProvider) ||
 				ApplicationContext.class.isAssignableFrom(parameter.getType()) ||
 				supportsApplicationEvents(parameterContext) ||
 				ParameterResolutionDelegate.isAutowirable(parameter, parameterContext.getIndex()));

spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java

@@ -69,6 +69,7 @@ public abstract class TestConstructorUtils {
 	private TestConstructorUtils() {
 	}
 
+
 	/**
 	 * Determine if the supplied executable for the given test class is an
 	 * autowirable constructor.
@@ -77,8 +78,11 @@ private TestConstructorUtils() {
 	 * @param executable an executable for the test class
 	 * @param testClass the test class
 	 * @return {@code true} if the executable is an autowirable constructor
-	 * @see #isAutowirableConstructor(Executable, Class, PropertyProvider)
+	 * @see #isAutowirableConstructor(Executable, PropertyProvider)
+	 * @deprecated as of 6.2.13, in favor of {@link #isAutowirableConstructor(Executable, PropertyProvider)};
+	 * to be removed in Spring Framework 7.1
 	 */
+	@Deprecated(since = "6.2.13", forRemoval = true)
 	public static boolean isAutowirableConstructor(Executable executable, Class<?> testClass) {
 		return isAutowirableConstructor(executable, testClass, null);
 	}
@@ -92,7 +96,10 @@ public static boolean isAutowirableConstructor(Executable executable, Class<?> t
 	 * @param testClass the test class
 	 * @return {@code true} if the constructor is autowirable
 	 * @see #isAutowirableConstructor(Constructor, Class, PropertyProvider)
+	 * @deprecated as of 6.2.13, in favor of {@link #isAutowirableConstructor(Executable, PropertyProvider)};
+	 * to be removed in Spring Framework 7.1
 	 */
+	@Deprecated(since = "6.2.13", forRemoval = true)
 	public static boolean isAutowirableConstructor(Constructor<?> constructor, Class<?> testClass) {
 		return isAutowirableConstructor(constructor, testClass, null);
 	}
@@ -110,7 +117,10 @@ public static boolean isAutowirableConstructor(Constructor<?> constructor, Class
 	 * @return {@code true} if the executable is an autowirable constructor
 	 * @since 5.3
 	 * @see #isAutowirableConstructor(Constructor, Class, PropertyProvider)
+	 * @deprecated as of 6.2.13, in favor of {@link #isAutowirableConstructor(Executable, PropertyProvider)};
+	 * to be removed in Spring Framework 7.1
 	 */
+	@Deprecated(since = "6.2.13", forRemoval = true)
 	public static boolean isAutowirableConstructor(Executable executable, Class<?> testClass,
 			@Nullable PropertyProvider fallbackPropertyProvider) {
 
@@ -138,16 +148,62 @@ public static boolean isAutowirableConstructor(Executable executable, Class<?> t
 	 * {@link TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}).</li>
 	 * </ol>
 	 * @param constructor a constructor for the test class
-	 * @param testClass the test class
+	 * @param testClass the test class, typically the declaring class of the constructor
 	 * @param fallbackPropertyProvider fallback property provider used to look up
-	 * the value for the default <em>test constructor autowire mode</em> if no
-	 * such value is found in {@link SpringProperties}
+	 * the value for {@link TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}
+	 * if no such value is found in {@link SpringProperties}; may be {@code null}
+	 * if there is no fallback support
 	 * @return {@code true} if the constructor is autowirable
 	 * @since 5.3
+	 * @see #isAutowirableConstructor(Executable, PropertyProvider)
+	 * @deprecated as of 6.2.13, in favor of {@link #isAutowirableConstructor(Executable, PropertyProvider)};
+	 * to be removed in Spring Framework 7.1
 	 */
+	@Deprecated(since = "6.2.13", forRemoval = true)
 	public static boolean isAutowirableConstructor(Constructor<?> constructor, Class<?> testClass,
 			@Nullable PropertyProvider fallbackPropertyProvider) {
 
+		return isAutowirableConstructorInternal(constructor, testClass, fallbackPropertyProvider);
+	}
+
+	/**
+	 * Determine if the supplied {@link Executable} is an autowirable {@link Constructor}.
+	 *
+	 * <p>A constructor is considered to be autowirable if one of the following
+	 * conditions is {@code true}.
+	 *
+	 * <ol>
+	 * <li>The constructor is annotated with {@link Autowired @Autowired},
+	 * {@link jakarta.inject.Inject @jakarta.inject.Inject}, or
+	 * {@link javax.inject.Inject @javax.inject.Inject}.</li>
+	 * <li>{@link TestConstructor @TestConstructor} is <em>present</em> or
+	 * <em>meta-present</em> on the test class with
+	 * {@link TestConstructor#autowireMode() autowireMode} set to
+	 * {@link AutowireMode#ALL ALL}.</li>
+	 * <li>The default <em>test constructor autowire mode</em> has been set to
+	 * {@code ALL} in {@link SpringProperties} or in the supplied fallback
+	 * {@link PropertyProvider}.</li>
+	 * </ol>
+	 * @param executable an {@code Executable} for a test class
+	 * @param fallbackPropertyProvider fallback property provider used to look up
+	 * the value for {@value TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}
+	 * if no such value is found in {@link SpringProperties}; may be {@code null}
+	 * if there is no fallback support
+	 * @return {@code true} if the executable is an autowirable constructor
+	 * @since 6.2.13
+	 * @see TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME
+	 */
+	public static boolean isAutowirableConstructor(Executable executable,
+			@Nullable PropertyProvider fallbackPropertyProvider) {
+
+		return (executable instanceof Constructor<?> constructor &&
+				isAutowirableConstructorInternal(constructor, constructor.getDeclaringClass(), fallbackPropertyProvider));
+	}
+
+
+	private static boolean isAutowirableConstructorInternal(Constructor<?> constructor, Class<?> testClass,
+			@Nullable PropertyProvider fallbackPropertyProvider) {
+
 		// Is the constructor annotated with @Autowired/@Inject?
 		if (isAnnotatedWithAutowiredOrInject(constructor)) {
 			return true;

spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java

@@ -41,6 +41,9 @@
  */
 class TestConstructorUtilsTests {
 
+	private static final PropertyProvider propertyProvider = name -> null;
+
+
 	@AfterEach
 	void clearGlobalFlag() {
 		setGlobalFlag(null);
@@ -100,12 +103,12 @@ void globalFlagVariations() throws Exception {
 
 	private void assertAutowirable(Class<?> testClass) throws NoSuchMethodException {
 		Constructor<?> constructor = testClass.getDeclaredConstructor();
-		assertThat(TestConstructorUtils.isAutowirableConstructor(constructor, testClass)).isTrue();
+		assertThat(TestConstructorUtils.isAutowirableConstructor(constructor, propertyProvider)).isTrue();
 	}
 
 	private void assertNotAutowirable(Class<?> testClass) throws NoSuchMethodException {
 		Constructor<?> constructor = testClass.getDeclaredConstructor();
-		assertThat(TestConstructorUtils.isAutowirableConstructor(constructor, testClass)).isFalse();
+		assertThat(TestConstructorUtils.isAutowirableConstructor(constructor, propertyProvider)).isFalse();
 	}
 
 	private void setGlobalFlag() {