From d720645275e1ecf44840e543f1245811a764674c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 31 Aug 2016 14:06:37 +0100 Subject: [PATCH] Polishing Fix mistake introduced during forward merge --- .../autoconfigure/condition/ConditionalOnMissingBeanTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 797bbc41be9..ef48fa8e6b3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -282,7 +282,7 @@ public class ConditionalOnMissingBeanTests { OnBeanInParentsConfiguration.class); child.setParent(this.context); child.refresh(); - assertThat(child.getBeansOfType(ExampleBean.class)).hasSize(1); + assertThat(child.getBeansOfType(ExampleBean.class)).hasSize(2); } @Configuration