Skip to content

S
spring-boot
Commit 0c2c018f authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge pull request #13707 from izeye 

* gh-13707:
  Fix parameter order for RequestMatcherAssert.doesNotMatch()
parents 63ae682a b87b23a4
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 10 deletions
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java
View file @ 0c2c018f
......@@ -78,14 +78,15 @@ public class EndpointRequestTests {
@Test
public void toAnyEndpointWhenServletPathNotEmptyShouldMatch() {
RequestMatcher matcher = EndpointRequest.toAnyEndpoint();
assertMatcher(matcher, "/actuator", "/spring", "/admin").matches("/actuator/foo",
"/spring", "/admin");
assertMatcher(matcher, "/actuator", "/spring", "/admin").matches("/actuator/bar",
"/spring", "/admin");
assertMatcher(matcher, "/actuator", "/spring").matches("/actuator", "/spring");
assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("/actuator/baz",
"/spring");
assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("/actuator/foo", "");
assertMatcher(matcher, "/actuator", "/spring", "/admin")
.matches(Arrays.asList("/spring", "/admin"), "/actuator/foo");
assertMatcher(matcher, "/actuator", "/spring", "/admin")
.matches(Arrays.asList("/spring", "/admin"), "/actuator/bar");
assertMatcher(matcher, "/actuator", "/spring").matches(Arrays.asList("/spring"),
"/actuator");
assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("/spring",
"/actuator/baz");
assertMatcher(matcher, "/actuator", "/spring").doesNotMatch("", "/actuator/foo");
}
@Test
......@@ -279,8 +280,8 @@ public class EndpointRequestTests {
matches(mockRequest(servletPath));
}
public void matches(String pathInfo, String... servletPaths) {
Arrays.stream(servletPaths).forEach((p) -> matches(mockRequest(p, pathInfo)));
public void matches(List<String> servletPaths, String pathInfo) {
servletPaths.forEach((p) -> matches(mockRequest(p, pathInfo)));
}
private void matches(HttpServletRequest request) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment