Merge branch '1.5.x'

2016-10-11 23:42:14 -07:00
parent 264d8442da d818a09ed8
commit 01900c8342
25 changed files with 130 additions and 118 deletions
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
@@ -478,8 +478,11 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 		}

 		@Override
-		public Object postProcessBeforeInitialization(Object bean, String beanName)
+		public Object postProcessAfterInitialization(Object bean, String beanName)
 				throws BeansException {
+			if (bean instanceof FactoryBean) {
+				return bean;
+			}
 			return createSpyIfNecessary(bean, beanName);
 		}