Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2015-06-17 12:42:06 -07:00
parent b5d49b3099
commit c3b344fdc2
8 changed files with 78 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java
View File

@@ -112,18 +112,19 @@ public class SpringApplicationAdminJmxAutoConfigurationTests {
}
}
@SuppressWarnings("unchecked")
@Test
public void registerWithSimpleWebApp() throws Exception {
this.context = new SpringApplicationBuilder()
.sources(
EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
JmxAutoConfiguration.class, SpringApplicationAdminJmxAutoConfiguration.class)
.run("--" + ENABLE_ADMIN_PROP, "--server.port=0");
this.context = new SpringApplicationBuilder().sources(
EmbeddedServletContainerAutoConfiguration.class,
ServerPropertiesAutoConfiguration.class,
DispatcherServletAutoConfiguration.class, JmxAutoConfiguration.class,
SpringApplicationAdminJmxAutoConfiguration.class).run(
"--" + ENABLE_ADMIN_PROP, "--server.port=0");
assertTrue(this.context instanceof EmbeddedWebApplicationContext);
assertEquals(true, this.mBeanServer.getAttribute(createDefaultObjectName(), "EmbeddedWebApplication"));
int expected = ((EmbeddedWebApplicationContext) this.context).getEmbeddedServletContainer().getPort();
assertEquals(true, this.mBeanServer.getAttribute(createDefaultObjectName(),
"EmbeddedWebApplication"));
int expected = ((EmbeddedWebApplicationContext) this.context)
.getEmbeddedServletContainer().getPort();
String actual = getProperty(createDefaultObjectName(), "local.server.port");
assertEquals(String.valueOf(expected), actual);
}
@@ -143,7 +144,7 @@ public class SpringApplicationAdminJmxAutoConfigurationTests {
private String getProperty(ObjectName objectName, String key) throws Exception {
return (String) this.mBeanServer.invoke(objectName, "getProperty",
new Object[]{key}, new String[]{String.class.getName()});
new Object[] { key }, new String[] { String.class.getName() });
}
private void load(String... environment) {

7
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
View File

@@ -136,7 +136,7 @@ public class WebMvcAutoConfigurationTests {
}
@Test
public void resourceHandlerMappingOverrideAll() throws Exception {
public void resourceHandlerMappingOverrideAll() throws Exception {
load(AllResources.class);
Map<String, List<Resource>> mappingLocations = getResourceMappingLocations();
assertThat(mappingLocations.get("/**").size(), equalTo(1));
@@ -200,7 +200,8 @@ public class WebMvcAutoConfigurationTests {
@Test
public void overrideMessageCodesFormat() throws Exception {
load(AllResources.class, "spring.mvc.messageCodesResolverFormat:POSTFIX_ERROR_CODE");
load(AllResources.class,
"spring.mvc.messageCodesResolverFormat:POSTFIX_ERROR_CODE");
assertNotNull(this.context.getBean(WebMvcAutoConfigurationAdapter.class)
.getMessageCodesResolver());
}
@@ -318,7 +319,6 @@ public class WebMvcAutoConfigurationTests {
assertEquals(123456L, actual);
}
@SuppressWarnings("unchecked")
private void load(Class<?> config, String... environment) {
this.context = new AnnotationConfigEmbeddedWebApplicationContext();
@@ -338,7 +338,6 @@ public class WebMvcAutoConfigurationTests {
load(null, environment);
}
@Configuration
protected static class ViewConfig {