From 51a548943834453703b27ffd7bcceef9b075c8e2 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sun, 29 Mar 2026 17:34:32 +0200 Subject: [PATCH] Polishing --- .../MockitoResetTestExecutionListener.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java index 055c4c61bee..d3b0558eef5 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java @@ -113,14 +113,15 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList private static void resetMocks(ConfigurableApplicationContext applicationContext, MockReset reset) { ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory(); - String[] beanNames = beanFactory.getBeanDefinitionNames(); Set instantiatedSingletons = new HashSet<>(Arrays.asList(beanFactory.getSingletonNames())); - for (String beanName : beanNames) { - BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName); - if (beanDefinition.isSingleton() && instantiatedSingletons.contains(beanName)) { - Object bean = getBean(beanFactory, beanName); - if (bean != null && reset == MockReset.get(bean)) { - Mockito.reset(bean); + for (String beanName : beanFactory.getBeanDefinitionNames()) { + if (instantiatedSingletons.contains(beanName)) { + BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName); + if (beanDefinition.isSingleton()) { + Object bean = getBean(beanFactory, beanName); + if (bean != null && reset == MockReset.get(bean)) { + Mockito.reset(bean); + } } } }