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

Identify and fix incomplete assertions 

Several calls to assertThat lacked a following assertion most often due
to wrong use of parenthesis.

See gh-10084
This commit is contained in:
Paul Vorbach 2017-08-27 15:09:30 +02:00 committed by Stephane Nicoll
parent 83eee7e65d
commit 04ca7f137d
4 changed files with 8 additions and 10 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

@ -100,8 +100,8 @@ public class RedisHealthIndicatorTests {
redisConnectionFactory); redisConnectionFactory);
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(redisConnectionFactory).getConnection(); verify(redisConnectionFactory).getConnection();
verify(redisConnection).info(); verify(redisConnection).info();
} }

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) {

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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"));

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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 {