spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Polish "Pick up all @TypeExcludeFilters annotations on test classes"

Browse Source 
See gh-51489

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
This commit is contained in:
Andy Wilkinson
2026-09-17 12:11:52 +01:00
parent e78471699c
commit fafa1c4375
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-test/src/test/java/org/springframework/boot/test/context/filter/annotation/TypeExcludeFiltersContextCustomizerFactoryTests.java
+26 -33
View File
@@ -116,25 +116,25 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
@Test
void getContextCustomizerWhenEnclosingClassHasAnnotationsTypeExcludeFilters() throws Exception {
typeExcludeFiltersFor(WithMultipleExcludeFilterAnnotations.WithEnclosingClassExcludeFilters.class)
.matches(FirstSliceExclude.class, SecondSliceExclude.class);
.matches(SliceExclude.class, SecondExclude.class);
}
@Test
void getContextCustomizerWhenSuperclassHasAnnotationShouldIncludeTypeExcludeFilters() throws Exception {
typeExcludeFiltersFor(WithMixedInheritance.class).matches(TestClassAwareExclude.class, FirstSliceExclude.class,
SecondSliceExclude.class, ThirdSliceExclude.class);
typeExcludeFiltersFor(WithMixedInheritance.class).matches(TestClassAwareExclude.class, SliceExclude.class,
SecondExclude.class, ThirdExclude.class);
}
@Test
void getContextCustomizerWhenHasNestedComposedAnnotationShouldIncludeTypeExcludeFilters() throws Exception {
typeExcludeFiltersFor(WithComposedAnnotation.class).matches(FirstSliceExclude.class);
typeExcludeFiltersFor(WithComposedAnnotation.class).matches(SliceExclude.class);
}
@Test
void getContextCustomizerWhenDeeplyNestedShouldIncludeAllEnclosingExcludeFilters() throws Exception {
typeExcludeFiltersFor(GrandparentEnclosing.ParentEnclosing.DeepInnerClass.class)
.matches(FirstSliceExclude.class, SecondSliceExclude.class, ThirdSliceExclude.class);
typeExcludeFiltersFor(GrandparentEnclosing.ParentEnclosing.DeepInnerClass.class).matches(SliceExclude.class,
SecondExclude.class, ThirdExclude.class);
}
private TypeExcludeFilterAssert typeExcludeFiltersFor(Class<?> testClass) {
@@ -200,8 +200,8 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
}
@FirstTestSlice
@TypeExcludeFilters(SecondSliceExclude.class)
@TestSlice
@TypeExcludeFilters(SecondExclude.class)
static class WithMultipleExcludeFilterAnnotations {
class WithEnclosingClassExcludeFilters {
@@ -215,17 +215,17 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
}
@FirstTestSlice
@TestSlice
static class WithFirstTestSliceExclude implements WithSecondTestSliceExclude {
}
@SecondTestSlice
@TypeExcludeFilters(SecondExclude.class)
interface WithSecondTestSliceExclude extends WithThirdTestSliceExclude {
}
@TypeExcludeFilters(ThirdSliceExclude.class)
@TypeExcludeFilters(ThirdExclude.class)
interface WithThirdTestSliceExclude {
}
@@ -235,34 +235,27 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
}
@FirstTestSlice
@TypeExcludeFilters(FirstSliceExclude.class)
@TestSlice
@TypeExcludeFilters(SliceExclude.class)
static class WithDuplicateSliceExclude {
}
@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@TypeExcludeFilters(FirstSliceExclude.class)
@interface FirstTestSlice {
}
@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
@TypeExcludeFilters(SecondSliceExclude.class)
@interface SecondTestSlice {
@TypeExcludeFilters(SliceExclude.class)
@interface TestSlice {
}
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@FirstTestSlice
@TestSlice
@interface ComposedFirstTestSlice {
}
@TypeExcludeFilters(FirstSliceExclude.class)
@TypeExcludeFilters(SliceExclude.class)
static class EnclosingWithOverride {
@NestedTestConfiguration(EnclosingConfiguration.OVERRIDE)
@@ -272,13 +265,13 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
}
@TypeExcludeFilters(FirstSliceExclude.class)
@TypeExcludeFilters(SliceExclude.class)
static class GrandparentEnclosing {
@TypeExcludeFilters(SecondSliceExclude.class)
@TypeExcludeFilters(SecondExclude.class)
class ParentEnclosing {
@TypeExcludeFilters(ThirdSliceExclude.class)
@TypeExcludeFilters(ThirdExclude.class)
class DeepInnerClass {
}
@@ -287,25 +280,25 @@ class TypeExcludeFiltersContextCustomizerFactoryTests {
}
static class FirstSliceExclude extends TestClassAwareExclude {
static class SliceExclude extends TestClassAwareExclude {
FirstSliceExclude(Class<?> testClass) {
SliceExclude(Class<?> testClass) {
super(testClass);
}
}
static class SecondSliceExclude extends TestClassAwareExclude {
static class SecondExclude extends TestClassAwareExclude {
SecondSliceExclude(Class<?> testClass) {
SecondExclude(Class<?> testClass) {
super(testClass);
}
}
static class ThirdSliceExclude extends TestClassAwareExclude {
static class ThirdExclude extends TestClassAwareExclude {
ThirdSliceExclude(Class<?> testClass) {
ThirdExclude(Class<?> testClass) {
super(testClass);
}