Browse Source

Polishing

pull/36543/head
Sam Brannen 5 days ago
parent
commit
bcc9e27dd0
  1. 25
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java
  2. 2
      spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java

25
spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java

@ -45,9 +45,9 @@ class ParameterResolutionTests {
@Test @Test
void isAutowirablePreconditions() { void isAutowirablePreconditions() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
ParameterResolutionDelegate.isAutowirable(null, 0)) .isThrownBy(() -> ParameterResolutionDelegate.isAutowirable(null, 0))
.withMessageContaining("Parameter must not be null"); .withMessageContaining("Parameter must not be null");
} }
@Test @Test
@ -87,29 +87,30 @@ class ParameterResolutionTests {
Parameter[] parameters = notAutowirableConstructor.getParameters(); Parameter[] parameters = notAutowirableConstructor.getParameters();
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) { for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
Parameter parameter = parameters[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 @Test
void resolveDependencyPreconditionsForParameter() { void resolveDependencyPreconditionsForParameter() {
assertThatIllegalArgumentException() assertThatIllegalArgumentException()
.isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock())) .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(null, 0, null, mock()))
.withMessageContaining("Parameter must not be null"); .withMessageContaining("Parameter must not be null");
} }
@Test @Test
void resolveDependencyPreconditionsForContainingClass() { void resolveDependencyPreconditionsForContainingClass() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
ParameterResolutionDelegate.resolveDependency(getParameter(), 0, null, null)) .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(getParameter(), 0, null, null))
.withMessageContaining("Containing class must not be null"); .withMessageContaining("Containing class must not be null");
} }
@Test @Test
void resolveDependencyPreconditionsForBeanFactory() { void resolveDependencyPreconditionsForBeanFactory() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
ParameterResolutionDelegate.resolveDependency(getParameter(), 0, getClass(), null)) .isThrownBy(() -> ParameterResolutionDelegate.resolveDependency(getParameter(), 0, getClass(), null))
.withMessageContaining("AutowireCapableBeanFactory must not be null"); .withMessageContaining("AutowireCapableBeanFactory must not be null");
} }
private Parameter getParameter() throws NoSuchMethodException { private Parameter getParameter() throws NoSuchMethodException {

2
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())); 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)) { if (ApplicationEvents.class.isAssignableFrom(parameterType)) {
Assert.isTrue(executable instanceof Method, Assert.isTrue(executable instanceof Method,
"ApplicationEvents can only be injected into test and lifecycle methods"); "ApplicationEvents can only be injected into test and lifecycle methods");

Loading…
Cancel
Save