From 01579be7d42a0f7c0e75b35a50e46165c14f9c7f Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 7 Aug 2017 11:50:07 -0500 Subject: [PATCH] PathMatchResult->PathMatchInfo More fixes for Spring Framework refactoring --- .../PathMatcherServerWebExchangeMatcherTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webflux/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java b/webflux/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java index f80582869f..51a4af6240 100644 --- a/webflux/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java +++ b/webflux/src/test/java/org/springframework/security/web/server/util/matcher/PathMatcherServerWebExchangeMatcherTests.java @@ -45,7 +45,7 @@ public class PathMatcherServerWebExchangeMatcherTests { @Mock PathPattern pattern; @Mock - PathPattern.PathMatchResult pathMatchResult; + PathPattern.PathMatchInfo pathMatchInfo; MockServerWebExchange exchange; PathPatternParserServerWebExchangeMatcher matcher; String path; @@ -74,8 +74,8 @@ public class PathMatcherServerWebExchangeMatcherTests { @Test public void matchesWhenPathMatcherTrueThenReturnTrue() { when(pattern.matches(any())).thenReturn(true); - when(pattern.matchAndExtract(any())).thenReturn(pathMatchResult); - when(pathMatchResult.getUriVariables()).thenReturn(new HashMap<>()); + when(pattern.matchAndExtract(any())).thenReturn(pathMatchInfo); + when(pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); assertThat(matcher.matches(exchange).block().isMatch()).isTrue(); } @@ -91,8 +91,8 @@ public class PathMatcherServerWebExchangeMatcherTests { public void matchesWhenPathMatcherTrueAndMethodTrueThenReturnTrue() { matcher = new PathPatternParserServerWebExchangeMatcher(pattern, exchange.getRequest().getMethod()); when(pattern.matches(any())).thenReturn(true); - when(pattern.matchAndExtract(any())).thenReturn(pathMatchResult); - when(pathMatchResult.getUriVariables()).thenReturn(new HashMap<>()); + when(pattern.matchAndExtract(any())).thenReturn(pathMatchInfo); + when(pathMatchInfo.getUriVariables()).thenReturn(new HashMap<>()); assertThat(matcher.matches(exchange).block().isMatch()).isTrue(); }