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

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Phillip Webb
2014-09-25 20:16:04 -07:00
parent 08f2522eba fa02c01727
commit b9edf3c500
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@@ -223,7 +223,8 @@ public class EndpointWebMvcAutoConfigurationTests {
assertThat(localServerPort, notNullValue());
assertThat(localManagementPort, notNullValue());
assertThat(localServerPort, not(equalTo(localManagementPort)));
assertThat(applicationContext.getBean(ServerPortConfig.class).getCount(), equalTo(2));
assertThat(this.applicationContext.getBean(ServerPortConfig.class).getCount(),
equalTo(2));
this.applicationContext.close();
assertAllClosed();
}
@@ -305,11 +306,11 @@ public class EndpointWebMvcAutoConfigurationTests {
@Configuration
public static class ServerPortConfig {
private int count = 0;
public int getCount() {
return count;
return this.count;
}
@Bean
@@ -317,7 +318,7 @@ public class EndpointWebMvcAutoConfigurationTests {
ServerProperties properties = new ServerProperties() {
@Override
public void customize(ConfigurableEmbeddedServletContainer container) {
count++;
ServerPortConfig.this.count++;
super.customize(container);
}
};