Polish gh-929

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java

@@ -208,6 +208,7 @@ public class OidcUserInfoTests {
 				.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
 				.andExpect(status().is2xxSuccessful());
 		// @formatter:on
+
 		verify(userInfoMapper).apply(any());
 		verify(authenticationConverter).convert(any());
 		verify(authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), any());
@@ -228,7 +229,7 @@ public class OidcUserInfoTests {
 	}
 
 	@Test
-	public void requestWhenUserInfoEndpointCustomizedThenAuthenticationProviderUsed() throws Exception {
+	public void requestWhenUserInfoEndpointCustomizedWithAuthenticationProviderThenUsed() throws Exception {
 		this.spring.register(CustomUserInfoConfiguration.class).autowire();
 
 		OAuth2Authorization authorization = createAuthorization();
@@ -247,6 +248,7 @@ public class OidcUserInfoTests {
 						.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
 				.andExpect(status().is2xxSuccessful());
 		// @formatter:on
+
 		verify(authenticationSuccessHandler).onAuthenticationSuccess(any(), any(), any());
 		verify(authenticationProvider).authenticate(any());
 		verifyNoInteractions(authenticationFailureHandler);
@@ -254,8 +256,9 @@ public class OidcUserInfoTests {
 	}
 
 	@Test
-	public void requestWhenUserInfoEndpointCustomizedAndErrorThenUsed() throws Exception {
+	public void requestWhenUserInfoEndpointCustomizedWithAuthenticationFailureHandlerThenUsed() throws Exception {
 		this.spring.register(CustomUserInfoConfiguration.class).autowire();
+
 		when(userInfoMapper.apply(any())).thenReturn(createUserInfo());
 		doAnswer(
 				invocation -> {
@@ -267,13 +270,12 @@ public class OidcUserInfoTests {
 		).when(authenticationFailureHandler).onAuthenticationFailure(any(), any(), any());
 
 		OAuth2AccessToken accessToken = createAuthorization().getAccessToken().getToken();
-
-
 		// @formatter:off
 		this.mvc.perform(get(DEFAULT_OIDC_USER_INFO_ENDPOINT_URI)
 				.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.getTokenValue()))
 				.andExpect(status().is4xxClientError());
 		// @formatter:on
+
 		verify(authenticationFailureHandler).onAuthenticationFailure(any(), any(), any());
 		verifyNoInteractions(authenticationSuccessHandler);
 		verifyNoInteractions(userInfoMapper);

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java

@@ -88,21 +88,21 @@ public class OidcUserInfoEndpointFilterTests {
 	}
 
 	@Test
-	public void setAuthenticationConverterNullThenThrowIllegalArgumentException() {
+	public void setAuthenticationConverterWhenNullThenThrowIllegalArgumentException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.filter.setAuthenticationConverter(null))
 				.withMessage("authenticationConverter cannot be null");
 	}
 
 	@Test
-	public void setAuthenticationSuccessHandlerNullThenThrowIllegalArgumentException() {
+	public void setAuthenticationSuccessHandlerWhenNullThenThrowIllegalArgumentException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.filter.setAuthenticationSuccessHandler(null))
 				.withMessage("authenticationSuccessHandler cannot be null");
 	}
 
 	@Test
-	public void setAuthenticationFailureHandlerNullThenThrowIllegalArgumentException() {
+	public void setAuthenticationFailureHandlerWhenNullThenThrowIllegalArgumentException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> this.filter.setAuthenticationFailureHandler(null))
 				.withMessage("authenticationFailureHandler cannot be null");
@@ -201,7 +201,7 @@ public class OidcUserInfoEndpointFilterTests {
 	}
 
 	@Test
-	public void doFilterWhenCustomAuthenticationConverterThenUses() throws Exception {
+	public void doFilterWhenCustomAuthenticationConverterThenUsed() throws Exception {
 		Authentication principal = new TestingAuthenticationToken("principal", "credentials");
 		OidcUserInfoAuthenticationToken authentication = new OidcUserInfoAuthenticationToken(principal);
 		AuthenticationConverter authenticationConverter = mock(AuthenticationConverter.class);
@@ -220,13 +220,14 @@ public class OidcUserInfoEndpointFilterTests {
 
 		this.filter.doFilter(request, response, filterChain);
 
+		verifyNoInteractions(filterChain);
 		verify(authenticationConverter).convert(request);
 		verify(this.authenticationManager).authenticate(authentication);
 		assertUserInfoResponse(response.getContentAsString());
 	}
 
 	@Test
-	public void doFilterWhenCustomAuthenticationSuccessHandlerThenUses() throws Exception {
+	public void doFilterWhenCustomAuthenticationSuccessHandlerThenUsed() throws Exception {
 		AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class);
 		this.filter.setAuthenticationSuccessHandler(successHandler);
 
@@ -249,7 +250,7 @@ public class OidcUserInfoEndpointFilterTests {
 	}
 
 	@Test
-	public void doFilterWhenCustomFailureHandlerThenUses() throws Exception {
+	public void doFilterWhenCustomAuthenticationFailureHandlerThenUsed() throws Exception {
 		AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class);
 		this.filter.setAuthenticationFailureHandler(failureHandler);
 
@@ -269,7 +270,6 @@ public class OidcUserInfoEndpointFilterTests {
 		this.filter.doFilter(request, response, filterChain);
 
 		verifyNoInteractions(filterChain);
-
 		verify(failureHandler).onAuthenticationFailure(request, response, authenticationException);
 	}