spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2026-03-29 17:34:32 +02:00
parent f9523a785b
commit 51a5489438
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java
+8 -7
View File
@@ -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<String> 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);
}
}
}
}