wipwip

Author: Kehrlann

Diff for: web/src/test/java/org/springframework/security/web/authentication/ott/OneTimeTokenAuthenticationFilterTests.java

@@ -38,10 +38,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 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.verifyNoInteractions;
-import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 
@@ -66,7 +66,7 @@ class OneTimeTokenAuthenticationFilterTests {
 
 	@BeforeEach
 	void setUp() {
-		this.filter.setAuthenticationManager(authenticationManager);
+		this.filter.setAuthenticationManager(this.authenticationManager);
 	}
 
 	@Test
@@ -103,7 +103,7 @@ void doFilterWhenMissingTokenThenUnauthorized() throws ServletException, IOExcep
 
 	@Test
 	void doFilterWhenInvalidTokenThenUnauthorized() throws ServletException, IOException {
-		when(this.authenticationManager.authenticate(any())).thenThrow(new BadCredentialsException("invalid token"));
+		given(this.authenticationManager.authenticate(any())).willThrow(new BadCredentialsException("invalid token"));
 		this.filter.doFilter(
 				post("/login/ott").param("token", "some-token-value").buildRequest(new MockServletContext()),
 				this.response, this.chain);
@@ -113,7 +113,8 @@ void doFilterWhenInvalidTokenThenUnauthorized() throws ServletException, IOExcep
 
 	@Test
 	void doFilterWhenValidThenRedirectsToSavedRequest() throws ServletException, IOException {
-		when(this.authenticationManager.authenticate(any())).thenReturn(OneTimeTokenAuthenticationToken.authenticated("username", AuthorityUtils.NO_AUTHORITIES));
+		given(this.authenticationManager.authenticate(any()))
+			.willReturn(OneTimeTokenAuthenticationToken.authenticated("username", AuthorityUtils.NO_AUTHORITIES));
 		this.filter.doFilter(
 				post("/login/ott").param("token", "some-token-value").buildRequest(new MockServletContext()),
 				this.response, this.chain);