From 82cd203791de214283a2bb67e665fba81ebac32b Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Sun, 23 Feb 2020 19:26:18 -0500 Subject: [PATCH] Remove unnecessary mocking Fixes gh-8012 --- .../web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java | 1 - .../web/servlet/util/matcher/MvcRequestMatcherTests.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java index 8292aa3ec4..3c2a4bcc2d 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationCodeGrantWebFilterTests.java @@ -69,7 +69,6 @@ public class OAuth2AuthorizationCodeGrantWebFilterTests { this.filter = new OAuth2AuthorizationCodeGrantWebFilter( this.authenticationManager, this.clientRegistrationRepository, this.authorizedClientRepository); - when(this.authorizationRequestRepository.loadAuthorizationRequest(any())).thenReturn(Mono.empty()); this.filter.setAuthorizationRequestRepository(this.authorizationRequestRepository); } diff --git a/web/src/test/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcherTests.java index 928bebc339..630a922c5b 100644 --- a/web/src/test/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcherTests.java +++ b/web/src/test/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcherTests.java @@ -66,9 +66,6 @@ public class MvcRequestMatcherTests { @Test public void extractUriTemplateVariablesSuccess() throws Exception { - when(this.introspector.getMatchableHandlerMapping(this.request)) - .thenReturn(this.mapping); - this.matcher = new MvcRequestMatcher(this.introspector, "/{p}"); when(this.introspector.getMatchableHandlerMapping(this.request)).thenReturn(null);