Polish test following forward merge

adamduan · Jul 11, 2018 · c489c6c · c489c6c
1 parent 67dfa0a
commit c489c6c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...rc/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/...rc/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java
@@ -139,12 +139,14 @@ private void hasBarBean(AssertableApplicationContext context) {
 
 	@Test
 	public void conditionEvaluationConsidersChangeInTypeWhenBeanIsOverridden() {
-		this.context.register(OriginalDefinition.class, OverridingDefinition.class,
-				ConsumingConfiguration.class);
-		this.context.refresh();
-		assertThat(this.context.containsBean("testBean")).isTrue();
-		assertThat(this.context.getBean(Integer.class)).isEqualTo(1);
-		assertThat(this.context.getBeansOfType(ConsumingConfiguration.class)).isEmpty();
+		this.contextRunner
+				.withUserConfiguration(OriginalDefinition.class,
+						OverridingDefinition.class, ConsumingConfiguration.class)
+				.run((context) -> {
+					assertThat(context).hasBean("testBean");
+					assertThat(context).hasSingleBean(Integer.class);
+					assertThat(context).doesNotHaveBean(ConsumingConfiguration.class);
+				});
 	}
 
 	@Configuration