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

Merge branch '2.4.x' into 2.5.x 

See gh-26935
This commit is contained in:
Andy Wilkinson 2021-06-17 11:54:54 +01:00
parent 7ee3b287e1 204dd29c51
commit 566a642ce7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java
View File

@ -47,9 +47,11 @@ class BeanNotOfRequiredTypeFailureAnalyzerTests {
assertThat(analysis.getDescription()).startsWith("The bean 'asyncBean'");
assertThat(analysis.getDescription())
.containsPattern("The bean is of type '" + AsyncBean.class.getPackage().getName() + ".\\$Proxy.*'");
assertThat(analysis.getDescription()).contains("and implements:\n\t" + SomeInterface.class.getName());
assertThat(analysis.getDescription())
.contains(String.format("and implements:%n\t") + SomeInterface.class.getName());
assertThat(analysis.getDescription()).contains("Expected a bean of type '" + AsyncBean.class.getName() + "'");
assertThat(analysis.getDescription()).contains("which implements:\n\t" + SomeInterface.class.getName());
assertThat(analysis.getDescription())
.contains(String.format("which implements:%n\t") + SomeInterface.class.getName());
}
private FailureAnalysis performAnalysis(Class<?> configuration) {