Browse Source

Polish

pull/9965/head
Andy Wilkinson 9 years ago
parent
commit
e9aeb9ad63
  1. 28
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java
  2. 7
      spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedWebappClassLoaderTests.java

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

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

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

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

Loading…
Cancel
Save