From 68475406eb6efb70600b53681ca81360ab9a7628 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 5 Nov 2013 15:32:53 +0000 Subject: [PATCH] Really fix it --- .../SecurityAutoConfigurationTests.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java index b43b24d397..1cc0677a34 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java @@ -21,6 +21,7 @@ import org.springframework.boot.TestUtils; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.mock.web.MockServletContext; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.TestingAuthenticationToken; @@ -45,7 +46,7 @@ public class SecurityAutoConfigurationTests { public void testWebConfiguration() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); - this.context.register(SecurityAutoConfiguration.class, + this.context.register(SecurityConfiguration.class, EndpointAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -60,7 +61,7 @@ public class SecurityAutoConfigurationTests { public void testDisableIgnoredStaticApplicationPaths() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); - this.context.register(SecurityAutoConfiguration.class, + this.context.register(SecurityConfiguration.class, EndpointAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -75,7 +76,7 @@ public class SecurityAutoConfigurationTests { public void testDisableBasicAuthOnApplicationPaths() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); - this.context.register(SecurityAutoConfiguration.class, + this.context.register(SecurityConfiguration.class, EndpointAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -99,6 +100,12 @@ public class SecurityAutoConfigurationTests { this.context.getBean(AuthenticationManager.class)); } + // Use this while SPR-11069 prevents us from checking OnMissingBean by annotation + @Configuration + @Import(SecurityAutoConfiguration.class) + protected static class SecurityConfiguration { + } + @Configuration protected static class TestConfiguration {