Skip to content

Commit d597cc3

Browse files
author
Dave Syer
committed
Fix test broken in gh-708
1 parent 6ad7257 commit d597cc3

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AutoConfigurationReportTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.context.annotation.Condition;
3838
import org.springframework.context.annotation.Import;
3939

40-
import static org.hamcrest.Matchers.containsInAnyOrder;
40+
import static org.hamcrest.Matchers.contains;
4141
import static org.hamcrest.Matchers.containsString;
4242
import static org.hamcrest.Matchers.equalTo;
4343
import static org.hamcrest.Matchers.not;
@@ -201,7 +201,6 @@ public void testDuplicateConditionAndOutcomes() {
201201
}
202202

203203
@Test
204-
@SuppressWarnings("unchecked")
205204
public void duplicateOutcomes() {
206205
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
207206
DuplicateConfig.class);
@@ -212,7 +211,7 @@ public void duplicateOutcomes() {
212211
ConditionAndOutcomes outcomes = report.getConditionAndOutcomesBySource().get(
213212
autoconfigKey);
214213
assertThat(outcomes, not(nullValue()));
215-
assertThat(getNumberOfOutcomes(outcomes), equalTo(2));
214+
assertThat(getNumberOfOutcomes(outcomes), equalTo(1));
216215

217216
List<String> messages = new ArrayList<String>();
218217
for (ConditionAndOutcome outcome : outcomes) {
@@ -222,9 +221,7 @@ public void duplicateOutcomes() {
222221

223222
Matcher<String> onClassMessage = containsString("@ConditionalOnClass "
224223
+ "classes found: javax.servlet.Servlet,org.springframework.web.multipart.support.StandardServletMultipartResolver");
225-
Matcher<String> onBeanMessage = containsString("@ConditionalOnBean "
226-
+ "(types: javax.servlet.MultipartConfigElement; SearchStrategy: all) found no beans");
227-
assertThat(messages, containsInAnyOrder(onClassMessage, onBeanMessage));
224+
assertThat(messages, contains(onClassMessage));
228225
context.close();
229226
}
230227

0 commit comments

Comments
 (0)