root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-07-24 14:28:01 -07:00
parent a760f3628c 6032b454b0
commit 5011bc6451
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfigurationTests.java
View File

@ -61,8 +61,10 @@ public class OAuth2WebSecurityConfigurationTests {
@Test @Test
public void securityConfigurerConfiguresOAuth2Login() { public void securityConfigurerConfiguresOAuth2Login() {
this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class, this.contextRunner
OAuth2WebSecurityConfiguration.class).run((context) -> { .withUserConfiguration(ClientRegistrationRepositoryConfiguration.class,
OAuth2WebSecurityConfiguration.class)
.run((context) -> {
ClientRegistrationRepository expected = context ClientRegistrationRepository expected = context
.getBean(ClientRegistrationRepository.class); .getBean(ClientRegistrationRepository.class);
ClientRegistrationRepository actual = (ClientRegistrationRepository) ReflectionTestUtils ClientRegistrationRepository actual = (ClientRegistrationRepository) ReflectionTestUtils
@ -85,17 +87,17 @@ public class OAuth2WebSecurityConfigurationTests {
@Test @Test
public void configurationRegistersAuthorizedClientServiceBean() { public void configurationRegistersAuthorizedClientServiceBean() {
this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class, this.contextRunner
OAuth2WebSecurityConfiguration.class).run((context) -> { .withUserConfiguration(ClientRegistrationRepositoryConfiguration.class,
assertThat(context) OAuth2WebSecurityConfiguration.class)
.hasSingleBean(OAuth2AuthorizedClientService.class); .run((context) -> assertThat(context)
}); .hasSingleBean(OAuth2AuthorizedClientService.class));
} }
@Test @Test
public void configurationRegistersAuthorizedClientRepositoryBean() { public void configurationRegistersAuthorizedClientRepositoryBean() {
this.contextRunner this.contextRunner
.withUserConfiguration(ClientRepositoryConfiguration.class, .withUserConfiguration(ClientRegistrationRepositoryConfiguration.class,
OAuth2WebSecurityConfiguration.class) OAuth2WebSecurityConfiguration.class)
.run((context) -> assertThat(context) .run((context) -> assertThat(context)
.hasSingleBean(OAuth2AuthorizedClientRepository.class)); .hasSingleBean(OAuth2AuthorizedClientRepository.class));
@ -189,7 +191,7 @@ public class OAuth2WebSecurityConfigurationTests {
@Configuration @Configuration
@Import(TestConfig.class) @Import(TestConfig.class)
static class ClientRepositoryConfiguration { static class ClientRegistrationRepositoryConfiguration {
@Bean @Bean
public ClientRegistrationRepository clientRegistrationRepository() { public ClientRegistrationRepository clientRegistrationRepository() {
@ -216,13 +218,13 @@ public class OAuth2WebSecurityConfigurationTests {
} }
@Configuration @Configuration
@Import({ ClientRepositoryConfiguration.class }) @Import(ClientRegistrationRepositoryConfiguration.class)
static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapter { static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapter {
} }
@Configuration @Configuration
@Import({ ClientRepositoryConfiguration.class }) @Import(ClientRegistrationRepositoryConfiguration.class)
static class OAuth2AuthorizedClientServiceConfiguration { static class OAuth2AuthorizedClientServiceConfiguration {
@Bean @Bean
@ -235,7 +237,7 @@ public class OAuth2WebSecurityConfigurationTests {
} }
@Configuration @Configuration
@Import(ClientRepositoryConfiguration.class) @Import(ClientRegistrationRepositoryConfiguration.class)
static class OAuth2AuthorizedClientRepositoryConfiguration { static class OAuth2AuthorizedClientRepositoryConfiguration {
@Bean @Bean