From ccf0cae18c1f50e18d3b5eac0896136e09d459a5 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:22:04 +0100 Subject: [PATCH] Polishing --- .../test/context/bean/override/BeanOverrideUtils.java | 8 +++----- .../test/context/junit/jupiter/SpringExtension.java | 2 +- .../mockito/MockitoBeanConfigurationErrorTests.java | 3 +-- .../mockito/MockitoBeanOverrideProcessorTests.java | 8 ++++---- .../mockito/MockitoSpyBeanConfigurationErrorTests.java | 5 +---- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideUtils.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideUtils.java index c833a004bd4..5def4c4ac47 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideUtils.java @@ -134,13 +134,13 @@ public abstract class BeanOverrideUtils { } private static void processClass(Class clazz, Class testClass, List handlers) { - processElement(clazz, testClass, (processor, composedAnnotation) -> + processElement(clazz, (processor, composedAnnotation) -> processor.createHandlers(composedAnnotation, testClass).forEach(handlers::add)); } private static void processField(Field field, Class testClass, List handlers) { AtomicBoolean overrideAnnotationFound = new AtomicBoolean(); - processElement(field, testClass, (processor, composedAnnotation) -> { + processElement(field, (processor, composedAnnotation) -> { Assert.state(!Modifier.isStatic(field.getModifiers()), () -> "@BeanOverride field must not be static: " + field); Assert.state(overrideAnnotationFound.compareAndSet(false, true), @@ -149,9 +149,7 @@ public abstract class BeanOverrideUtils { }); } - private static void processElement(AnnotatedElement element, Class testClass, - BiConsumer consumer) { - + private static void processElement(AnnotatedElement element, BiConsumer consumer) { MergedAnnotations.from(element, DIRECT) .stream(BeanOverride.class) .sorted(reversedMetaDistance) 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 ed4a9771a27..debb5708369 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 @@ -412,7 +412,7 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes /** * Resolve a value for the {@link Parameter} in the supplied {@link ParameterContext} by * retrieving the corresponding dependency from the test's {@link ApplicationContext}. - *

Delegates to {@link ParameterResolutionDelegate#resolveDependency}. + *

Delegates to {@link ParameterResolutionDelegate}. * @see #supportsParameter * @see ParameterResolutionDelegate#resolveDependency */ diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java index 36cc59d8d07..cec11d42147 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java @@ -26,7 +26,7 @@ import org.springframework.test.context.bean.override.BeanOverrideContextCustomi import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** - * Tests for {@link MockitoBean @MockitoBean}. + * Tests for {@link MockitoBean @MockitoBean} error scenarios. * * @author Stephane Nicoll * @author Sam Brannen @@ -93,7 +93,6 @@ class MockitoBeanConfigurationErrorTests { @MockitoBean(enforceOverride = true) String example; - } static class FailureByNameLookup { diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessorTests.java index dce2ebe2cb2..78fe74349c4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessorTests.java @@ -52,17 +52,17 @@ class MockitoBeanOverrideProcessorTests { @Test void mockAnnotationCreatesMockitoBeanOverrideHandler() { MockitoBean annotation = AnnotationUtils.synthesizeAnnotation(MockitoBean.class); - BeanOverrideHandler object = processor.createHandler(annotation, TestCase.class, field); + BeanOverrideHandler handler = processor.createHandler(annotation, TestCase.class, field); - assertThat(object).isExactlyInstanceOf(MockitoBeanOverrideHandler.class); + assertThat(handler).isExactlyInstanceOf(MockitoBeanOverrideHandler.class); } @Test void spyAnnotationCreatesMockitoSpyBeanOverrideHandler() { MockitoSpyBean annotation = AnnotationUtils.synthesizeAnnotation(MockitoSpyBean.class); - BeanOverrideHandler object = processor.createHandler(annotation, TestCase.class, field); + BeanOverrideHandler handler = processor.createHandler(annotation, TestCase.class, field); - assertThat(object).isExactlyInstanceOf(MockitoSpyBeanOverrideHandler.class); + assertThat(handler).isExactlyInstanceOf(MockitoSpyBeanOverrideHandler.class); } @Test diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java index 38ee10d9615..387b4af0864 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** - * Tests for {@link MockitoSpyBean @MockitoSpyBean}. + * Tests for {@link MockitoSpyBean @MockitoSpyBean} error scenarios. * * @author Stephane Nicoll * @author Sam Brannen @@ -118,7 +118,6 @@ class MockitoSpyBeanConfigurationErrorTests { @MockitoSpyBean String example; - } static class ByNameSingleLookup { @@ -132,14 +131,12 @@ class MockitoSpyBeanConfigurationErrorTests { @MockitoSpyBean MyScopedProxy myScopedProxy; - } static class SelfInjectionScopedProxyTestCase { @MockitoSpyBean MySelfInjectionScopedProxy mySelfInjectionScopedProxy; - } @Component("myScopedProxy")