Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +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
core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java
+2 -2
View File
@@ -57,7 +57,7 @@ import static org.mockito.BDDMockito.willThrow;
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 class MethodSecurityInterceptorTests {
this.interceptor.setAfterInvocationManager(aim);
given(mi.proceed()).willThrow(new Throwable());
assertThatExceptionOfType(Throwable.class).isThrownBy(() -> this.interceptor.invoke(mi));
verifyZeroInteractions(aim);
verifyNoMoreInteractions(aim);
}
void mdsReturnsNull() {
core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java
+2 -2
View File
@@ -53,7 +53,7 @@ import static org.mockito.BDDMockito.willThrow;
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 class AspectJMethodSecurityInterceptorTests {
given(this.aspectJCallback.proceedWithObject()).willThrow(new RuntimeException());
assertThatExceptionOfType(RuntimeException.class)
.isThrownBy(() -> this.interceptor.invoke(this.joinPoint, this.aspectJCallback));
verifyZeroInteractions(aim);
verifyNoMoreInteractions(aim);
}
// SEC-1967
core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java
+1 -2
View File
@@ -44,7 +44,6 @@ import static org.mockito.Mockito.reset;
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 class DefaultAuthenticationEventPublisherTests {
this.publisher.setApplicationEventPublisher(appPublisher);
this.publisher.publishAuthenticationFailure(new AuthenticationException("") {
}, mock(Authentication.class));
verifyZeroInteractions(appPublisher);
verifyNoMoreInteractions(appPublisher);
}
@Test
core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java
+4 -4
View File
@@ -42,7 +42,7 @@ import static org.mockito.BDDMockito.given;
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 class UserDetailsRepositoryReactiveAuthenticationManagerTests {
this.user.getPassword());
assertThatExceptionOfType(BadCredentialsException.class)
.isThrownBy(() -> this.manager.authenticate(token).block());
verifyZeroInteractions(this.userDetailsPasswordService);
verifyNoMoreInteractions(this.userDetailsPasswordService);
}
@Test
@@ -141,7 +141,7 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
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 class UserDetailsRepositoryReactiveAuthenticationManagerTests {
UsernamePasswordAuthenticationToken token = UsernamePasswordAuthenticationToken.unauthenticated(this.user,
this.user.getPassword());
this.manager.authenticate(token).block();
verifyZeroInteractions(this.postAuthenticationChecks);
verifyNoMoreInteractions(this.postAuthenticationChecks);
}
@Test
core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
+3 -3
View File
@@ -60,7 +60,7 @@ import static org.mockito.BDDMockito.given;
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 class DaoAuthenticationProviderTests {
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 class DaoAuthenticationProviderTests {
given(encoder.upgradeEncoding(any())).willReturn(false);
given(userDetailsService.loadUserByUsername(any())).willReturn(user);
Authentication result = provider.authenticate(token);
verifyZeroInteractions(passwordManager);
verifyNoMoreInteractions(passwordManager);
}
@Test
core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
+4 -4
View File
@@ -38,7 +38,7 @@ import static org.mockito.ArgumentMatchers.any;
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 class SpringSecurityCoreVersionTests {
expectSpringSecurityVersionThenReturn(version);
expectSpringVersionThenReturn(version);
performChecks();
verifyZeroInteractions(this.logger);
verifyNoMoreInteractions(this.logger);
}
@Test
@@ -103,7 +103,7 @@ public class SpringSecurityCoreVersionTests {
expectSpringSecurityVersionThenReturn(version);
expectSpringVersionThenReturn(null);
performChecks();
verifyZeroInteractions(this.logger);
verifyNoMoreInteractions(this.logger);
}
@Test
@@ -139,7 +139,7 @@ public class SpringSecurityCoreVersionTests {
expectSpringVersionThenReturn("2");
System.setProperty(getDisableChecksProperty(), Boolean.TRUE.toString());
performChecks();
verifyZeroInteractions(this.logger);
verifyNoMoreInteractions(this.logger);
}
private String getDisableChecksProperty() {