Merge branch '1.5.x'

2017-07-21 15:27:46 +01:00
parent 536c3bbd1c a57a74157d
commit ee3525aa47
2 changed files with 12 additions and 9 deletions
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java
@@ -37,6 +37,7 @@ import org.springframework.test.util.JsonPathExpectationsHelper;
 import org.springframework.util.FileCopyUtils;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;

 /**
 * Tests for {@link JsonContentAssert}. Some tests here are based on Spring Framework
@@ -1252,7 +1253,7 @@ public class JsonContentAssertTests {
 	@Test
 	public void extractingJsonPathMapValue() throws Exception {
 		assertThat(forJson(TYPES)).extractingJsonPathMapValue("@.colorMap")
-				.containsEntry("red", "rojo");
+				.contains(entry("red", "rojo"));
 	}

 	@Test