root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-08-29 14:00:23 +02:00
parent 6967846018 8d7d044bef
commit 1897d76cda
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,8 +79,8 @@ public class RedisHealthIndicatorTests {
RedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection); RedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
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");
} }
private RedisHealthIndicator createHealthIndicator( private RedisHealthIndicator createHealthIndicator(

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

@ -94,8 +94,8 @@ public class SolrHealthIndicatorTests {
SolrHealthIndicator healthIndicator = new SolrHealthIndicator(solrClient); SolrHealthIndicator healthIndicator = new SolrHealthIndicator(solrClient);
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");
} }
private NamedList<Object> mockResponse(int status) { private NamedList<Object> mockResponse(int status) {

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java
View File

@ -166,8 +166,6 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
assertThat(analysis.getDescription()).startsWith(String.format( assertThat(analysis.getDescription()).startsWith(String.format(
"Constructor in %s required a bean named '%s' that could not be found", "Constructor in %s required a bean named '%s' that could not be found",
StringNameHandler.class.getName(), "test-string")); StringNameHandler.class.getName(), "test-string"));
assertThat(analysis.getDescription().contains(
"No matching auto-configuration has been found for this bean name."));
assertThat(analysis.getAction()).startsWith(String.format( assertThat(analysis.getAction()).startsWith(String.format(
"Consider defining a bean named '%s' in your configuration.", "Consider defining a bean named '%s' in your configuration.",
"test-string")); "test-string"));

3
spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View File

@ -123,7 +123,8 @@ public enum DatabaseDriver {
* Firebird. * Firebird.
*/ */
FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver", FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver",
"org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") { "org.firebirdsql.ds.FBXADataSource",
"SELECT 1 FROM RDB$DATABASE") {
@Override @Override
protected Collection<String> getUrlPrefixes() { protected Collection<String> getUrlPrefixes() {

4
spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
View File

@ -75,8 +75,8 @@ public class DatabaseDriverClassNameTests {
@Test @Test
public void databaseClassIsOfRequiredType() throws Exception { public void databaseClassIsOfRequiredType() throws Exception {
assertThat(getInterfaceNames(this.className.replace('.', '/')) assertThat(getInterfaceNames(this.className.replace('.', '/')))
.contains(this.requiredType.getName().replace('.', '/'))); .contains(this.requiredType.getName().replace('.', '/'));
} }
private List<String> getInterfaceNames(String className) throws IOException { private List<String> getInterfaceNames(String className) throws IOException {