From e5394ceac2d322d517270b382acd1472c3b808df Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 7 Mar 2020 16:53:46 +0100 Subject: [PATCH] Polish "Handle new Annotation.toString() behaviour in JDK 14" See gh-20180 --- .../NoSuchBeanDefinitionFailureAnalyzerTests.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index 8f6013a4ea..0639878835 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -154,11 +154,14 @@ class NoSuchBeanDefinitionFailureAnalyzerTests { @Test void failureAnalysisForUnmatchedQualifier() { FailureAnalysis analysis = analyzeFailure(createFailure(QualifiedBeanConfiguration.class)); - String pattern = "@org.springframework.beans.factory.annotation.Qualifier\\(value=\"*alpha\"*\\)"; + assertThat(analysis.getDescription()).containsPattern(determineAnnotationValuePattern()); + } + + private String determineAnnotationValuePattern() { if (JavaVersion.getJavaVersion().isEqualOrNewerThan(JavaVersion.FOURTEEN)) { - pattern = "@org.springframework.beans.factory.annotation.Qualifier\\(\"*alpha\"*\\)"; + return "@org.springframework.beans.factory.annotation.Qualifier\\(\"*alpha\"*\\)"; } - assertThat(analysis.getDescription()).containsPattern(pattern); + return "@org.springframework.beans.factory.annotation.Qualifier\\(value=\"*alpha\"*\\)"; } @Test