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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2017-01-08 09:20:00 +01:00
parent 49828d9377 7c161b9920
commit fefc66625f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/MongoHealthIndicatorTests.java
View File

@@ -85,8 +85,8 @@ public class MongoHealthIndicatorTests {
MongoHealthIndicator healthIndicator = new MongoHealthIndicator(mongoTemplate); MongoHealthIndicator healthIndicator = new MongoHealthIndicator(mongoTemplate);
Health health = healthIndicator.health(); Health health = healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN); assertThat(health.getStatus()).isEqualTo(Status.DOWN);
assertThat(((String) health.getDetails().get("error")) assertThat((String) health.getDetails().get("error"))
.contains("Connection failed")); .contains("Connection failed");
verify(mongoTemplate).executeCommand("{ buildInfo: 1 }"); verify(mongoTemplate).executeCommand("{ buildInfo: 1 }");
} }

2
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@@ -799,7 +799,7 @@ public class SpringApplicationTests {
this.context = application.run(); this.context = application.run();
assertThat(this.context.getEnvironment()) assertThat(this.context.getEnvironment())
.isNotInstanceOf(StandardServletEnvironment.class); .isNotInstanceOf(StandardServletEnvironment.class);
assertThat(this.context.getEnvironment().getProperty("foo")); assertThat(this.context.getEnvironment().getProperty("foo")).isEqualTo("bar");
assertThat(this.context.getEnvironment().getPropertySources().iterator().next() assertThat(this.context.getEnvironment().getPropertySources().iterator().next()
.getName()).isEqualTo( .getName()).isEqualTo(
TestPropertySourceUtils.INLINED_PROPERTIES_PROPERTY_SOURCE_NAME); TestPropertySourceUtils.INLINED_PROPERTIES_PROPERTY_SOURCE_NAME);