Prevent a broken factory bean from breaking the resetting of mocks

alebar · wilkinsona · commit eb927f1b2959 · 2016-11-25T10:39:30.000Z
Closes gh-7271
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
@@ -65,7 +65,7 @@ private void resetMocks(ConfigurableApplicationContext applicationContext,
 		for (String name : names) {
 			BeanDefinition definition = beanFactory.getBeanDefinition(name);
 			if (definition.isSingleton() && instantiatedSingletons.contains(name)) {
-				Object bean = beanFactory.getBean(name);
+				Object bean = beanFactory.getSingleton(name);
 				if (reset.equals(MockReset.get(bean))) {
 					Mockito.reset(bean);
 				}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private void resetMocks(ConfigurableApplicationContext applicationContext,`
`65`	`65`	`for (String name : names) {`
`66`	`66`	`BeanDefinition definition = beanFactory.getBeanDefinition(name);`
`67`	`67`	`if (definition.isSingleton() && instantiatedSingletons.contains(name)) {`
`68`		`- Object bean = beanFactory.getBean(name);`
	`68`	`+ Object bean = beanFactory.getSingleton(name);`
`69`	`69`	`if (reset.equals(MockReset.get(bean))) {`
`70`	`70`	`Mockito.reset(bean);`
`71`	`71`	`}`