From bcc9e27dd00a7eaf2f7e66d04d04ed31d0dd1efc Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 25 Mar 2026 12:12:29 +0100 Subject: [PATCH] Polishing --- .../annotation/ParameterResolutionTests.java | 25 ++++++++++--------- .../junit/jupiter/SpringExtension.java | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java index 8ed67a96fb2..3ec16e2fef1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java @@ -45,9 +45,9 @@ class ParameterResolutionTests { @Test void isAutowirablePreconditions() { - assertThatIllegalArgumentException().isThrownBy(() -> - ParameterResolutionDelegate.isAutowirable(null, 0)) - .withMessageContaining("Parameter must not be null"); + assertThatIllegalArgumentException() + .isThrownBy(() -> ParameterResolutionDelegate.isAutowirable(null, 0)) + .withMessageContaining("Parameter must not be null"); } @Test @@ -87,29 +87,30 @@ class ParameterResolutionTests { Parameter[] parameters = notAutowirableConstructor.getParameters(); for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) { Parameter parameter = parameters[parameterIndex]; - assertThat(ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex)).as("Parameter " + parameter + " must not be autowirable").isFalse(); + assertThat(ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex)) + .as("Parameter " + parameter + " must not be autowirable").isFalse(); } } @Test void resolveDependencyPreconditionsForParameter() { assertThatIllegalArgumentException() - .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock())) - .withMessageContaining("Parameter must not be null"); + .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock())) + .withMessageContaining("Parameter must not be null"); } @Test void resolveDependencyPreconditionsForContainingClass() { - assertThatIllegalArgumentException().isThrownBy(() -> - ParameterResolutionDelegate.resolveDependency(getParameter(), 0, null, null)) - .withMessageContaining("Containing class must not be null"); + assertThatIllegalArgumentException() + .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(getParameter(), 0, null, null)) + .withMessageContaining("Containing class must not be null"); } @Test void resolveDependencyPreconditionsForBeanFactory() { - assertThatIllegalArgumentException().isThrownBy(() -> - ParameterResolutionDelegate.resolveDependency(getParameter(), 0, getClass(), null)) - .withMessageContaining("AutowireCapableBeanFactory must not be null"); + assertThatIllegalArgumentException() + .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(getParameter(), 0, getClass(), null)) + .withMessageContaining("AutowireCapableBeanFactory must not be null"); } private Parameter getParameter() throws NoSuchMethodException { diff --git a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java index 8a9f35d410d..ed4a9771a27 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java @@ -400,7 +400,7 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes ParameterResolutionDelegate.isAutowirable(parameter, parameterContext.getIndex())); } - private boolean supportsApplicationEvents(Class parameterType, Executable executable) { + private static boolean supportsApplicationEvents(Class parameterType, Executable executable) { if (ApplicationEvents.class.isAssignableFrom(parameterType)) { Assert.isTrue(executable instanceof Method, "ApplicationEvents can only be injected into test and lifecycle methods");