From d597cc3387d62bfe3ae2414ccdd8d3e1794e883d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 25 Apr 2014 10:16:19 +0100 Subject: [PATCH] Fix test broken in gh-708 --- .../condition/AutoConfigurationReportTests.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java index 2fe20a020a1..c3a4cc365e9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.Import; -import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; @@ -201,7 +201,6 @@ public class AutoConfigurationReportTests { } @Test - @SuppressWarnings("unchecked") public void duplicateOutcomes() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( DuplicateConfig.class); @@ -212,7 +211,7 @@ public class AutoConfigurationReportTests { ConditionAndOutcomes outcomes = report.getConditionAndOutcomesBySource().get( autoconfigKey); assertThat(outcomes, not(nullValue())); - assertThat(getNumberOfOutcomes(outcomes), equalTo(2)); + assertThat(getNumberOfOutcomes(outcomes), equalTo(1)); List messages = new ArrayList(); for (ConditionAndOutcome outcome : outcomes) { @@ -222,9 +221,7 @@ public class AutoConfigurationReportTests { Matcher onClassMessage = containsString("@ConditionalOnClass " + "classes found: javax.servlet.Servlet,org.springframework.web.multipart.support.StandardServletMultipartResolver"); - Matcher onBeanMessage = containsString("@ConditionalOnBean " - + "(types: javax.servlet.MultipartConfigElement; SearchStrategy: all) found no beans"); - assertThat(messages, containsInAnyOrder(onClassMessage, onBeanMessage)); + assertThat(messages, contains(onClassMessage)); context.close(); }