diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java index d9cad25adb2..d3fa761afd1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java +++ b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java @@ -55,6 +55,7 @@ import org.springframework.test.context.ContextLoadException; import org.springframework.test.context.ContextLoader; import org.springframework.test.context.MergedContextConfiguration; import org.springframework.test.context.SmartContextLoader; +import org.springframework.test.context.TestContextAnnotationUtils; import org.springframework.test.context.TestContextBootstrapper; import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; @@ -94,7 +95,7 @@ public class TestContextAotGenerator { private static final Log logger = LogFactory.getLog(TestContextAotGenerator.class); private static final Predicate> isDisabledInAotMode = - testClass -> MergedAnnotations.from(testClass).isPresent(DisabledInAotMode.class); + testClass -> TestContextAnnotationUtils.hasAnnotation(testClass, DisabledInAotMode.class); private final ApplicationContextAotGenerator aotGenerator = new ApplicationContextAotGenerator();