From 5ba3db6a7d28494c4fbf3a908f5591bca0d90457 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 21 Aug 2014 21:57:22 -0700 Subject: [PATCH] Fix failing CompositePropertySourceTests Fix CompositePropertySourceTests which fails when run we debug logging. --- .../core/env/CompositePropertySourceTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.java index 3ec7202394..9ae96d32ed 100644 --- a/spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.java @@ -20,7 +20,6 @@ import java.util.Collections; import org.junit.Test; -import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; /** @@ -39,8 +38,11 @@ public class CompositePropertySourceTests { composite.addPropertySource(p3); composite.addPropertySource(p1); composite.addFirstPropertySource(p1); - assertThat(composite.toString(), containsString("MapPropertySource [name='p1'], " - + "MapPropertySource [name='p2'], MapPropertySource [name='p3']")); + String s = composite.toString(); + int i1 = s.indexOf("name='p1'"); + int i2 = s.indexOf("name='p2'"); + int i3 = s.indexOf("name='p3'"); + assertTrue("Bad order: " + s, ((i1 < i2) && (i2 < i3))); } }