Skip to content

Commit 3fd7265

Browse files
committed
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 spring-projectsgh-28824
1 parent 1f3ea51 commit 3fd7265

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.springframework.core.annotation.MergedAnnotations;
3838
import org.springframework.test.context.BootstrapWith;
3939
import org.springframework.test.context.ContextConfiguration;
40-
import org.springframework.test.context.TestContextAnnotationUtils;
4140
import org.springframework.util.Assert;
41+
import org.springframework.util.ClassUtils;
4242

4343
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasspathRoots;
4444
import static org.junit.platform.engine.discovery.PackageNameFilter.includePackageNames;
@@ -170,7 +170,7 @@ private boolean isSpringTestClass(Class<?> clazz) {
170170

171171
private static boolean isJupiterSpringTestClass(Class<?> clazz) {
172172
return MergedAnnotations.search(TYPE_HIERARCHY)
173-
.withEnclosingClasses(TestContextAnnotationUtils::searchEnclosingClass)
173+
.withEnclosingClasses(ClassUtils::isInnerClass)
174174
.from(clazz)
175175
.stream(EXTEND_WITH_ANNOTATION_NAME)
176176
.map(annotation -> annotation.getClassArray(VALUE))

0 commit comments

Comments
 (0)