Remove mockito deprecations

Issue gh-11748
spring-projects · Aug 23, 2022 · 2fb625d · 2fb625d
1 parent 0c2c95c
commit 2fb625d
Show file tree

Hide file tree

Showing 45 changed files with 171 additions and 177 deletions.
diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java
@@ -34,7 +34,7 @@
 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;
 
 /**
  * @author Luke Taylor
@@ -68,7 +68,7 @@ public void ignoresEmptyCollection() {
 		pco.setObjectIdentityRetrievalStrategy(oids);
 		pco.setSidRetrievalStrategy(sids);
 		pco.cachePermissionsFor(mock(Authentication.class), Collections.emptyList());
-		verifyZeroInteractions(service, sids, oids);
+		verifyNoMoreInteractions(service, sids, oids);
 	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java
@@ -34,7 +34,7 @@
 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 void initDoesNotLogErrorWhenFilterChainProxyFailsToLoad() throws Exceptio
 		ReflectionTestUtils.setField(handler, "logger", logger);
 		expectClassUtilsForNameThrowsNoClassDefFoundError(className);
 		handler.init();
-		verifyZeroInteractions(logger);
+		verifyNoMoreInteractions(logger);
 	}
 
 	@Test

diff --git a/...ramework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java b/...ramework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
@@ -56,7 +56,7 @@
 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 void requestWhenAuthorizedClientFoundThenMethodArgumentResolved() throws
 				.andExpect(status().isOk())
 				.andExpect(content().string("resolved"));
 		// @formatter:on
-		verifyZeroInteractions(accessTokenResponseClient);
+		verifyNoMoreInteractions(accessTokenResponseClient);
 	}
 
 	@Test

diff --git a/.../springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java b/.../springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java
@@ -57,7 +57,7 @@
 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 void rememberMeLoginWhenAuthenticationSuccessHandlerDeclaredThenUses() th
 		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));

diff --git a/.../test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java b/.../test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java
@@ -45,7 +45,6 @@
 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 void setUp() {
 	@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(

diff --git a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java
@@ -23,7 +23,7 @@
 
 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);
 	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java
@@ -53,7 +53,7 @@
 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 void customAuthenticationManager() {
 				.submit(HomePage.class);
 		// @formatter:on
 		homePage.assertAt();
-		verifyZeroInteractions(defaultAuthenticationManager);
+		verifyNoMoreInteractions(defaultAuthenticationManager);
 	}
 
 	@Test

diff --git a/...src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java b/...src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java
@@ -85,7 +85,7 @@
 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 void basicWithCustomAuthenticationManager() {
 				.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 void requestWhenBasicWithAuthenticationManagerInLambdaThenAuthenticationM
 				.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));
 	}
 

diff --git a/...springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/...springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java
@@ -57,7 +57,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Tests {@link MethodSecurityInterceptor}.
@@ -318,7 +318,7 @@ public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throw
 		this.interceptor.setAfterInvocationManager(aim);
 		given(mi.proceed()).willThrow(new Throwable());
 		assertThatExceptionOfType(Throwable.class).isThrownBy(() -> this.interceptor.invoke(mi));
-		verifyZeroInteractions(aim);
+		verifyNoMoreInteractions(aim);
 	}
 
 	void mdsReturnsNull() {

diff --git a/...ingframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/...ingframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java
@@ -53,7 +53,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Tests {@link AspectJMethodSecurityInterceptor}.
@@ -154,7 +154,7 @@ public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() {
 		given(this.aspectJCallback.proceedWithObject()).willThrow(new RuntimeException());
 		assertThatExceptionOfType(RuntimeException.class)
 				.isThrownBy(() -> this.interceptor.invoke(this.joinPoint, this.aspectJCallback));
-		verifyZeroInteractions(aim);
+		verifyNoMoreInteractions(aim);
 	}
 
 	// SEC-1967

diff --git a/...org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java b/...org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java
@@ -44,7 +44,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 /**
  * @author Luke Taylor
@@ -132,7 +131,7 @@ public void unknownFailureExceptionIsIgnored() {
 		this.publisher.setApplicationEventPublisher(appPublisher);
 		this.publisher.publishAuthenticationFailure(new AuthenticationException("") {
 		}, mock(Authentication.class));
-		verifyZeroInteractions(appPublisher);
+		verifyNoMoreInteractions(appPublisher);
 	}
 
 	@Test

diff --git a/...work/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java b/...work/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
@@ -42,7 +42,7 @@
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * @author Rob Winch
@@ -128,7 +128,7 @@ public void authenticateWhenPasswordServiceAndBadCredentialsThenNotUpdated() {
 				this.user.getPassword());
 		assertThatExceptionOfType(BadCredentialsException.class)
 				.isThrownBy(() -> this.manager.authenticate(token).block());
-		verifyZeroInteractions(this.userDetailsPasswordService);
+		verifyNoMoreInteractions(this.userDetailsPasswordService);
 	}
 
 	@Test
@@ -141,7 +141,7 @@ public void authenticateWhenPasswordServiceAndUpgradeFalseThenNotUpdated() {
 		UsernamePasswordAuthenticationToken token = UsernamePasswordAuthenticationToken.unauthenticated(this.user,
 				this.user.getPassword());
 		Authentication result = this.manager.authenticate(token).block();
-		verifyZeroInteractions(this.userDetailsPasswordService);
+		verifyNoMoreInteractions(this.userDetailsPasswordService);
 	}
 
 	@Test
@@ -165,7 +165,7 @@ public void authenticateWhenPostAuthenticationChecksNotSet() {
 		UsernamePasswordAuthenticationToken token = UsernamePasswordAuthenticationToken.unauthenticated(this.user,
 				this.user.getPassword());
 		this.manager.authenticate(token).block();
-		verifyZeroInteractions(this.postAuthenticationChecks);
+		verifyNoMoreInteractions(this.postAuthenticationChecks);
 	}
 
 	@Test

diff --git a/.../java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/.../java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
@@ -60,7 +60,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Tests {@link DaoAuthenticationProvider}.
@@ -301,7 +301,7 @@ public void authenticateWhenBadCredentialsAndPasswordManagerThenNoUpdate() {
 		given(encoder.matches(any(), any())).willReturn(false);
 		given(userDetailsService.loadUserByUsername(any())).willReturn(user);
 		assertThatExceptionOfType(BadCredentialsException.class).isThrownBy(() -> provider.authenticate(token));
-		verifyZeroInteractions(passwordManager);
+		verifyNoMoreInteractions(passwordManager);
 	}
 
 	@Test
@@ -320,7 +320,7 @@ public void authenticateWhenNotUpgradeAndPasswordManagerThenNoUpdate() {
 		given(encoder.upgradeEncoding(any())).willReturn(false);
 		given(userDetailsService.loadUserByUsername(any())).willReturn(user);
 		Authentication result = provider.authenticate(token);
-		verifyZeroInteractions(passwordManager);
+		verifyNoMoreInteractions(passwordManager);
 	}
 
 	@Test

diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
@@ -38,7 +38,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Checks that the embedded version information is up to date.
@@ -94,7 +94,7 @@ public void noLoggingIfVersionsAreEqual() throws Exception {
 		expectSpringSecurityVersionThenReturn(version);
 		expectSpringVersionThenReturn(version);
 		performChecks();
-		verifyZeroInteractions(this.logger);
+		verifyNoMoreInteractions(this.logger);
 	}
 
 	@Test
@@ -103,7 +103,7 @@ public void noLoggingIfSpringVersionNull() throws Exception {
 		expectSpringSecurityVersionThenReturn(version);
 		expectSpringVersionThenReturn(null);
 		performChecks();
-		verifyZeroInteractions(this.logger);
+		verifyNoMoreInteractions(this.logger);
 	}
 
 	@Test
@@ -139,7 +139,7 @@ public void noLoggingIfPropertySet() throws Exception {
 		expectSpringVersionThenReturn("2");
 		System.setProperty(getDisableChecksProperty(), Boolean.TRUE.toString());
 		performChecks();
-		verifyZeroInteractions(this.logger);
+		verifyNoMoreInteractions(this.logger);
 	}
 
 	private String getDisableChecksProperty() {