Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove mockito deprecations

Browse Source 
Issue gh-11748
This commit is contained in:
Rob Winch
2022-08-23 13:05:29 -05:00
parent 0c2c95c02f
commit 2fb625db84
45 changed files with 171 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java
+2 -2
View File
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* @author Luke Taylor
@@ -89,7 +89,7 @@ public class SecurityNamespaceHandlerTests {
ReflectionTestUtils.setField(handler, "logger", logger);
expectClassUtilsForNameThrowsNoClassDefFoundError(className);
handler.init();
verifyZeroInteractions(logger);
verifyNoMoreInteractions(logger);
}
@Test
config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
+2 -2
View File
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -102,7 +102,7 @@ public class OAuth2ClientConfigurationTests {
.andExpect(status().isOk())
.andExpect(content().string("resolved"));
// @formatter:on
verifyZeroInteractions(accessTokenResponseClient);
verifyNoMoreInteractions(accessTokenResponseClient);
}
@Test
config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java
+2 -2
View File
@@ -57,7 +57,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -129,7 +129,7 @@ public class NamespaceRememberMeTests {
AuthSuccessConfig.SUCCESS_HANDLER = mock(AuthenticationSuccessHandler.class);
this.spring.register(AuthSuccessConfig.class).autowire();
MvcResult result = this.mvc.perform(post("/login").with(rememberMeLogin())).andReturn();
verifyZeroInteractions(AuthSuccessConfig.SUCCESS_HANDLER);
verifyNoMoreInteractions(AuthSuccessConfig.SUCCESS_HANDLER);
Cookie rememberMe = result.getResponse().getCookie("remember-me");
assertThat(rememberMe).isNotNull();
this.mvc.perform(get("/somewhere").cookie(rememberMe));
config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java
+1 -2
View File
@@ -45,7 +45,6 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
import org.springframework.test.util.ReflectionTestUtils;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.atLeastOnce;
@@ -104,7 +103,7 @@ public class DefaultFilterChainValidatorTests {
@Test
public void validateCheckLoginPageIsntProtectedThrowsIllegalArgumentException() {
IllegalArgumentException toBeThrown = new IllegalArgumentException("failed to eval expression");
willThrow(toBeThrown).given(this.accessDecisionManager).decide(any(Authentication.class), anyObject(),
willThrow(toBeThrown).given(this.accessDecisionManager).decide(any(Authentication.class), any(),
any(Collection.class));
this.validator.validate(this.chain);
verify(this.logger).info(
config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java
+2 -2
View File
@@ -23,7 +23,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.beans.factory.xml.ParserContext;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@ExtendWith(MockitoExtension.class)
public class WebConfigUtilsTests {
@@ -38,7 +38,7 @@ public class WebConfigUtilsTests {
public void validateHttpRedirectSpELNoParserWarning() {
WebConfigUtils.validateHttpRedirect("#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}",
this.parserContext, "fakeSource");
verifyZeroInteractions(this.parserContext);
verifyNoMoreInteractions(this.parserContext);
}
}
config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java
+2 -2
View File
@@ -53,7 +53,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.security.config.Customizer.withDefaults;
/**
@@ -294,7 +294,7 @@ public class FormLoginTests {
.submit(HomePage.class);
// @formatter:on
homePage.assertAt();
verifyZeroInteractions(defaultAuthenticationManager);
verifyNoMoreInteractions(defaultAuthenticationManager);
}
@Test
config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java
+3 -3
View File
@@ -85,7 +85,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.springframework.security.config.Customizer.withDefaults;
/**
@@ -409,7 +409,7 @@ public class ServerHttpSecurityTests {
.expectStatus().isOk()
.expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok"));
// @formatter:on
verifyZeroInteractions(this.authenticationManager);
verifyNoMoreInteractions(this.authenticationManager);
}
@Test
@@ -438,7 +438,7 @@ public class ServerHttpSecurityTests {
.expectStatus().isOk()
.expectBody(String.class).consumeWith((b) -> assertThat(b.getResponseBody()).isEqualTo("ok"));
// @formatter:on
verifyZeroInteractions(this.authenticationManager);
verifyNoMoreInteractions(this.authenticationManager);
verify(customAuthenticationManager).authenticate(any(Authentication.class));
}