root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Andy Wilkinson 2017-08-04 11:00:36 +01:00
parent 6090fd3eb0
commit e9aeb9ad63
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java
View File

@ -103,15 +103,13 @@ public class RequestMappingEndpointTests {
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(result.keySet()) assertThat(result.keySet())
.filteredOn((key) -> key.contains("/dump || /dump.json")) .filteredOn((key) -> key.contains("/dump || /dump.json"))
.hasOnlyOneElementSatisfying((key) -> { .hasOnlyOneElementSatisfying(
assertThat((Map<String, Object>) result.get(key)) (key) -> assertThat((Map<String, Object>) result.get(key))
.containsOnlyKeys("bean", "method"); .containsOnlyKeys("bean", "method"));
});
assertThat(result.keySet()).filteredOn((key) -> key.contains(" || /.json")) assertThat(result.keySet()).filteredOn((key) -> key.contains(" || /.json"))
.hasOnlyOneElementSatisfying((key) -> { .hasOnlyOneElementSatisfying(
assertThat((Map<String, Object>) result.get(key)) (key) -> assertThat((Map<String, Object>) result.get(key))
.containsOnlyKeys("bean", "method"); .containsOnlyKeys("bean", "method"));
});
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -127,15 +125,13 @@ public class RequestMappingEndpointTests {
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(result.keySet()) assertThat(result.keySet())
.filteredOn((key) -> key.contains("/dump || /dump.json")) .filteredOn((key) -> key.contains("/dump || /dump.json"))
.hasOnlyOneElementSatisfying((key) -> { .hasOnlyOneElementSatisfying(
assertThat((Map<String, Object>) result.get(key)) (key) -> assertThat((Map<String, Object>) result.get(key))
.containsOnlyKeys("method"); .containsOnlyKeys("method"));
});
assertThat(result.keySet()).filteredOn((key) -> key.contains(" || /.json")) assertThat(result.keySet()).filteredOn((key) -> key.contains(" || /.json"))
.hasOnlyOneElementSatisfying((key) -> { .hasOnlyOneElementSatisfying(
assertThat((Map<String, Object>) result.get(key)) (key) -> assertThat((Map<String, Object>) result.get(key))
.containsOnlyKeys("method"); .containsOnlyKeys("method"));
});
} }
@Configuration @Configuration

7
spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedWebappClassLoaderTests.java
View File

@ -52,10 +52,9 @@ public class TomcatEmbeddedWebappClassLoaderTests {
@Test @Test
public void getResourceFindsResourceFromParentClassLoader() throws Exception { public void getResourceFindsResourceFromParentClassLoader() throws Exception {
File war = createWar(); File war = createWar();
withWebappClassLoader(war, (classLoader) -> { withWebappClassLoader(war,
assertThat(classLoader.getResource("test.txt")) (classLoader) -> assertThat(classLoader.getResource("test.txt"))
.isEqualTo(new URL(webInfClassesUrlString(war) + "test.txt")); .isEqualTo(new URL(webInfClassesUrlString(war) + "test.txt")));
});
} }
@Test @Test