Merge branch '1.4.x' into 1.5.x

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

@@ -65,7 +65,7 @@ public class ResetMocksTestExecutionListener extends AbstractTestExecutionListen
 		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);
 				}

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

@@ -21,6 +21,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
+import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.example.ExampleService;
 import org.springframework.context.ApplicationContext;
@@ -37,6 +38,7 @@ import static org.mockito.Mockito.mock;
  * Tests for {@link ResetMocksTestExecutionListener}.
  *
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -94,6 +96,31 @@ public class ResetMocksTestExecutionListenerTests {
 			throw new RuntimeException();
 		}
 
+		@Bean
+		public BrokenFactoryBean brokenFactoryBean() {
+			// gh-7270
+			return new BrokenFactoryBean();
+		}
+
+	}
+
+	static class BrokenFactoryBean implements FactoryBean<String> {
+
+		@Override
+		public String getObject() throws Exception {
+			throw new IllegalStateException();
+		}
+
+		@Override
+		public Class<?> getObjectType() {
+			return String.class;
+		}
+
+		@Override
+		public boolean isSingleton() {
+			return true;
+		}
+
 	}
 
 }