root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Only attempt mock reset on instantiated singletons 

Update ResetMocksTestExecutionListener to only attempt a mock reset when
a singleton has actually been created.

Fixes gh-5870
This commit is contained in:
Phillip Webb 2016-05-16 13:03:04 -07:00
parent bcfa2e6676
commit 2fc86b2d5a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
View File

@ -16,11 +16,14 @@
package org.springframework.boot.test.mock.mockito; package org.springframework.boot.test.mock.mockito;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.test.context.TestContext; import org.springframework.test.context.TestContext;
@ -56,11 +59,11 @@ public class ResetMocksTestExecutionListener extends AbstractTestExecutionListen
MockReset reset) { MockReset reset) {
ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory(); ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory();
String[] names = beanFactory.getBeanDefinitionNames(); String[] names = beanFactory.getBeanDefinitionNames();
Set<String> instantiatedSingletons = new HashSet<String>(
Arrays.asList(beanFactory.getSingletonNames()));
for (String name : names) { for (String name : names) {
BeanDefinition definition = beanFactory.getBeanDefinition(name); BeanDefinition definition = beanFactory.getBeanDefinition(name);
String scope = definition.getScope(); if (definition.isSingleton() && instantiatedSingletons.contains(name)) {
if (AbstractBeanDefinition.SCOPE_DEFAULT.equals(scope)
|| BeanDefinition.SCOPE_SINGLETON.equals(scope)) {
Object bean = beanFactory.getBean(name); Object bean = beanFactory.getBean(name);
if (reset.equals(MockReset.get(bean))) { if (reset.equals(MockReset.get(bean))) {
Mockito.reset(bean); Mockito.reset(bean);

8
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
View File

@ -26,6 +26,7 @@ import org.springframework.boot.test.mock.mockito.example.ExampleService;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -80,6 +81,13 @@ public class ResetMocksTestExecutionListenerTests {
return mock(ExampleService.class); return mock(ExampleService.class);
} }
@Bean
@Lazy
public ExampleService fail() {
// gh-5870
throw new RuntimeException();
}
} }
} }