From b87b23a44f6ec267ff2ddf942f56cb47a4d913b0 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sun, 8 Jul 2018 03:10:00 +0900 Subject: [PATCH] Fix parameter order for RequestMatcherAssert.doesNotMatch() Closes gh-13707 --- .../servlet/EndpointRequestTests.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java index e16c01e53fd..20df4c8c571 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java @@ -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 servletPaths, String pathInfo) { + servletPaths.forEach((p) -> matches(mockRequest(p, pathInfo))); } private void matches(HttpServletRequest request) {