From 6032b454b043400e57bbd0cfdb370e1fcc83f094 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Tue, 24 Jul 2018 14:11:01 -0700 Subject: [PATCH] Polish --- .../OAuth2WebSecurityConfigurationTests.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java index efba0c68e0..2e813747a4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java @@ -59,8 +59,10 @@ public class OAuth2WebSecurityConfigurationTests { @Test public void securityConfigurerConfiguresOAuth2Login() { - this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class, - OAuth2WebSecurityConfiguration.class).run((context) -> { + this.contextRunner + .withUserConfiguration(ClientRegistrationRepositoryConfiguration.class, + OAuth2WebSecurityConfiguration.class) + .run((context) -> { ClientRegistrationRepository expected = context .getBean(ClientRegistrationRepository.class); ClientRegistrationRepository actual = (ClientRegistrationRepository) ReflectionTestUtils @@ -83,8 +85,10 @@ public class OAuth2WebSecurityConfigurationTests { @Test public void configurationRegistersAuthorizedClientServiceBean() { - this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class, - OAuth2WebSecurityConfiguration.class).run((context) -> { + this.contextRunner + .withUserConfiguration(ClientRegistrationRepositoryConfiguration.class, + OAuth2WebSecurityConfiguration.class) + .run((context) -> { OAuth2AuthorizedClientService bean = context .getBean(OAuth2AuthorizedClientService.class); OAuth2AuthorizedClientService authorizedClientService = (OAuth2AuthorizedClientService) ReflectionTestUtils @@ -174,7 +178,7 @@ public class OAuth2WebSecurityConfigurationTests { @Configuration @Import(TestConfig.class) - static class ClientRepositoryConfiguration { + static class ClientRegistrationRepositoryConfiguration { @Bean public ClientRegistrationRepository clientRegistrationRepository() { @@ -201,13 +205,13 @@ public class OAuth2WebSecurityConfigurationTests { } @Configuration - @Import({ ClientRepositoryConfiguration.class }) + @Import(ClientRegistrationRepositoryConfiguration.class) static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapter { } @Configuration - @Import({ ClientRepositoryConfiguration.class }) + @Import(ClientRegistrationRepositoryConfiguration.class) static class OAuth2AuthorizedClientServiceConfiguration { @Bean