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

Polish

This commit is contained in:
Phillip Webb 2016-11-15 10:40:21 -08:00
parent 948b5760a7
commit bacf0878af
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationNoSecurityTests.java
View File

@ -48,17 +48,16 @@ public class ManagementServerPropertiesAutoConfigurationNoSecurityTests {
@Test @Test
public void securitySettingsIgnoredWithoutSpringSecurity() { public void securitySettingsIgnoredWithoutSpringSecurity() {
ManagementServerProperties properties = ManagementServerProperties properties = load("management.security.enabled=false");
load("management.security.enabled=false");
assertThat(properties.getSecurity().isEnabled()).isFalse(); assertThat(properties.getSecurity().isEnabled()).isFalse();
} }
public ManagementServerProperties load(String... environment) { public ManagementServerProperties load(String... environment) {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
EnvironmentTestUtils.addEnvironment(ctx, environment); EnvironmentTestUtils.addEnvironment(context, environment);
ctx.register(ManagementServerPropertiesAutoConfiguration.class); context.register(ManagementServerPropertiesAutoConfiguration.class);
ctx.refresh(); context.refresh();
this.context = ctx; this.context = context;
return this.context.getBean(ManagementServerProperties.class); return this.context.getBean(ManagementServerProperties.class);
} }

1
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java
View File

@ -51,6 +51,7 @@ import org.springframework.web.servlet.DispatcherServlet;
public class MockMvcAutoConfiguration { public class MockMvcAutoConfiguration {
private final WebApplicationContext context; private final WebApplicationContext context;
private final WebMvcProperties webMvcProperties; private final WebMvcProperties webMvcProperties;
MockMvcAutoConfiguration(WebApplicationContext context, MockMvcAutoConfiguration(WebApplicationContext context,