From 5b990605dc4f9891d1df1592d4ec89dd3d1eb105 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Wed, 2 Jan 2019 13:53:24 -0800 Subject: [PATCH] Polish "Order actuator security config after resource-server config" Closes gh-15472 --- ...ctiveManagementWebSecurityAutoConfigurationTests.java | 9 +++------ .../ManagementWebSecurityAutoConfigurationTests.java | 8 +++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java index 46d009af40..effc1e12f1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java @@ -120,17 +120,14 @@ public class ReactiveManagementWebSecurityAutoConfigurationTests { } @Test - public void backsOffIfReactiveOAuth2ResourceServerAutoConfigurationSecurityIsAdded() { + public void backOffIfReactiveOAuth2ResourceServerAutoConfigurationPresent() { this.contextRunner .withConfiguration(AutoConfigurations .of(ReactiveOAuth2ResourceServerAutoConfiguration.class)) .withPropertyValues( "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://authserver") - .run((context) -> { - assertThat(context.getBeanNamesForType( - ReactiveManagementWebSecurityAutoConfiguration.class)) - .isEmpty(); - }); + .run((context) -> assertThat(context).doesNotHaveBean( + ReactiveManagementWebSecurityAutoConfiguration.class)); } @Test diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java index c785a08a54..d1d7d98df4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java @@ -108,16 +108,14 @@ public class ManagementWebSecurityAutoConfigurationTests { } @Test - public void backOffIfOAuth2ResourceServerAutoConfigurationSecurityIsAdded() { + public void backOffIfOAuth2ResourceServerAutoConfigurationPresent() { this.contextRunner .withConfiguration(AutoConfigurations .of(OAuth2ResourceServerAutoConfiguration.class)) .withPropertyValues( "spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://authserver") - .run((context) -> { - assertThat(context.getBeanNamesForType( - ManagementWebSecurityConfigurerAdapter.class)).isEmpty(); - }); + .run((context) -> assertThat(context) + .doesNotHaveBean(ManagementWebSecurityConfigurerAdapter.class)); } private HttpStatus getResponseStatus(AssertableWebApplicationContext context,