From 3de359c580328f0bd6f865aa295e58e8d229a8cc Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Sat, 21 Jun 2025 02:11:04 +0700 Subject: [PATCH] Fix test Signed-off-by: Tran Ngoc Nhan --- ...izationManagerWebInvocationPrivilegeEvaluatorTests.java | 2 -- .../web/access/intercept/AuthorizationFilterTests.java | 7 ------- .../DelegatingReactiveAuthorizationManagerTests.java | 2 -- 3 files changed, 11 deletions(-) diff --git a/web/src/test/java/org/springframework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluatorTests.java index 1ce76aafb5..ebb7199cb6 100644 --- a/web/src/test/java/org/springframework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluatorTests.java +++ b/web/src/test/java/org/springframework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluatorTests.java @@ -85,7 +85,6 @@ class AuthorizationManagerWebInvocationPrivilegeEvaluatorTests { @Test void isAllowedWhenServletContextExistsThenFilterInvocationHasServletContext() { ServletContext servletContext = new MockServletContext(); - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.privilegeEvaluator.setServletContext(servletContext); this.privilegeEvaluator.isAllowed("/test", TestAuthentication.authenticatedUser()); ArgumentCaptor captor = ArgumentCaptor.forClass(HttpServletRequest.class); @@ -102,7 +101,6 @@ class AuthorizationManagerWebInvocationPrivilegeEvaluatorTests { void isAllowedWhenRequestTransformerThenUsesRequestTransformerResult() { HttpServletRequest request = new MockHttpServletRequest(); given(this.requestTransformer.transform(any())).willReturn(request); - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.privilegeEvaluator.setRequestTransformer(this.requestTransformer); this.privilegeEvaluator.isAllowed("/test", TestAuthentication.authenticatedUser()); diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/AuthorizationFilterTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/AuthorizationFilterTests.java index 7cb43b0539..62f217d232 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/AuthorizationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/intercept/AuthorizationFilterTests.java @@ -118,7 +118,6 @@ public class AuthorizationFilterTests { @Test public void filterWhenAuthorizationManagerVerifyThrowsAccessDeniedExceptionThenStopFilterChain() { AuthorizationManager mockAuthorizationManager = mock(AuthorizationManager.class); - given(mockAuthorizationManager.authorize(any(), any())).willCallRealMethod(); AuthorizationFilter filter = new AuthorizationFilter(mockAuthorizationManager); TestingAuthenticationToken authenticationToken = new TestingAuthenticationToken("user", "password"); @@ -196,7 +195,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenErrorThenDoFilter() throws Exception { AuthorizationManager authorizationManager = mock(AuthorizationManager.class); - given(authorizationManager.authorize(any(), any())).willCallRealMethod(); AuthorizationFilter authorizationFilter = new AuthorizationFilter(authorizationManager); MockHttpServletRequest mockRequest = new MockHttpServletRequest(null, "/path"); mockRequest.setDispatcherType(DispatcherType.ERROR); @@ -233,7 +231,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenObserveOncePerRequestTrueAndNotAppliedThenInvoked() throws ServletException, IOException { - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.filter.setObserveOncePerRequest(true); this.filter.doFilter(this.request, this.response, this.chain); verify(this.authorizationManager).authorize(any(), any()); @@ -242,7 +239,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenObserveOncePerRequestFalseAndIsAppliedThenInvoked() throws ServletException, IOException { setIsAppliedTrue(); - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.filter.setObserveOncePerRequest(false); this.filter.doFilter(this.request, this.response, this.chain); verify(this.authorizationManager).authorize(any(), any()); @@ -250,7 +246,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenObserveOncePerRequestFalseAndNotAppliedThenInvoked() throws ServletException, IOException { - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.filter.setObserveOncePerRequest(false); this.filter.doFilter(this.request, this.response, this.chain); verify(this.authorizationManager).authorize(any(), any()); @@ -266,7 +261,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenFilterErrorDispatchTrueAndIsErrorThenInvoked() throws ServletException, IOException { - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.request.setDispatcherType(DispatcherType.ERROR); this.filter.setFilterErrorDispatch(true); this.filter.doFilter(this.request, this.response, this.chain); @@ -290,7 +284,6 @@ public class AuthorizationFilterTests { @Test public void doFilterWhenFilterAsyncDispatchTrueAndIsAsyncThenInvoked() throws ServletException, IOException { - given(this.authorizationManager.authorize(any(), any())).willCallRealMethod(); this.request.setDispatcherType(DispatcherType.ASYNC); this.filter.setFilterAsyncDispatch(true); this.filter.doFilter(this.request, this.response, this.chain); diff --git a/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java b/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java index b62d3dd1f8..eb824db505 100644 --- a/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authorization/DelegatingReactiveAuthorizationManagerTests.java @@ -81,7 +81,6 @@ public class DelegatingReactiveAuthorizationManagerTests { given(this.match1.matches(any())).willReturn(ServerWebExchangeMatcher.MatchResult.match()); given(this.delegate1.authorize(eq(this.authentication), any(AuthorizationContext.class))) .willReturn(Mono.just(this.decision)); - given(this.delegate1.authorize(eq(this.authentication), any(AuthorizationContext.class))).willCallRealMethod(); assertThat(this.manager.authorize(this.authentication, this.exchange).block()).isEqualTo(this.decision); verifyNoMoreInteractions(this.match2, this.delegate2); } @@ -92,7 +91,6 @@ public class DelegatingReactiveAuthorizationManagerTests { given(this.match2.matches(any())).willReturn(ServerWebExchangeMatcher.MatchResult.match()); given(this.delegate2.authorize(eq(this.authentication), any(AuthorizationContext.class))) .willReturn(Mono.just(this.decision)); - given(this.delegate2.authorize(eq(this.authentication), any(AuthorizationContext.class))).willCallRealMethod(); assertThat(this.manager.authorize(this.authentication, this.exchange).block()).isEqualTo(this.decision); verifyNoMoreInteractions(this.delegate1); }