From 3fd72652be3988e4b28946bab0398f0b3db9d98a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 15 Jul 2022 16:46:39 +0200 Subject: [PATCH] Fix @ExtendWith search in TestClassScanner The search algorithm for @ExtendWith should not be tied to Spring's @NestedTestConfiguration semantics. Rather, general JUnit annotation search semantics should be used to find @ExtendWith. See gh-28824 --- .../springframework/test/context/aot/TestClassScanner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java b/spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java index d9b6942c9f..ea34827cea 100644 --- a/spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java +++ b/spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java @@ -37,8 +37,8 @@ import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; import org.springframework.test.context.BootstrapWith; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestContextAnnotationUtils; import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots; import static org.junit.platform.engine.discovery.PackageNameFilter.includePackageNames; @@ -170,7 +170,7 @@ class TestClassScanner { private static boolean isJupiterSpringTestClass(Class clazz) { return MergedAnnotations.search(TYPE_HIERARCHY) - .withEnclosingClasses(TestContextAnnotationUtils::searchEnclosingClass) + .withEnclosingClasses(ClassUtils::isInnerClass) .from(clazz) .stream(EXTEND_WITH_ANNOTATION_NAME) .map(annotation -> annotation.getClassArray(VALUE))