Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson
2018-10-11 11:51:56 +01:00

View File

@@ -174,8 +174,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
public void failureAnalysisForUnmatchedQualifier() {
FailureAnalysis analysis = analyzeFailure(
createFailure(QualifiedBeanConfiguration.class));
assertThat(analysis.getDescription()).contains(
"@org.springframework.beans.factory.annotation.Qualifier(value=alpha)");
assertThat(analysis.getDescription()).containsPattern(
"@org.springframework.beans.factory.annotation.Qualifier\\(value=\"*alpha\"*\\)");
}
private void assertDescriptionConstructorMissingType(FailureAnalysis analysis,