From 77bce144620695bd87bb67f81fd1628bc123a43e Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 31 Jul 2024 13:25:40 -0600 Subject: [PATCH] Polish Annotation Test This new arrangement of the test better matches the class hierarchy described by the original ticket. Issue gh-13234 --- .../UniqueMergedAnnotationSynthesizerTests.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/test/java/org/springframework/security/core/annotation/UniqueMergedAnnotationSynthesizerTests.java b/core/src/test/java/org/springframework/security/core/annotation/UniqueMergedAnnotationSynthesizerTests.java index 0728cd6383..56fe18c52b 100644 --- a/core/src/test/java/org/springframework/security/core/annotation/UniqueMergedAnnotationSynthesizerTests.java +++ b/core/src/test/java/org/springframework/security/core/annotation/UniqueMergedAnnotationSynthesizerTests.java @@ -71,7 +71,8 @@ public class UniqueMergedAnnotationSynthesizerTests { @Test void synthesizeWhenInterfaceOverridingMultipleInterfaceInheritanceThenResolves() throws Exception { - Method method = ClassInheritingInterfaceOverridingMultipleInterfaceInheritance.class.getDeclaredMethod("method"); + Method method = ClassInheritingInterfaceOverridingMultipleInterfaceInheritance.class + .getDeclaredMethod("method"); PreAuthorize preAuthorize = this.synthesizer.synthesize(method); assertThat(preAuthorize.value()).isEqualTo("ten"); } @@ -198,10 +199,10 @@ public class UniqueMergedAnnotationSynthesizerTests { // gh-13234 @Test - void synthesizeWhenClassInheritingGrandparentInterfaceAnnotationThenResolves() throws Exception { - Method method = ClassInheritingGrandparentInterfaceAnnotation.class.getDeclaredMethod("method"); + void synthesizeWhenClassInheritingInterfaceAnnotationThenResolves() throws Exception { + Method method = ClassInheritingInterfaceMethodAnnotation.class.getDeclaredMethod("method"); PreAuthorize preAuthorize = this.synthesizer.synthesize(method); - assertThat(preAuthorize.value()).isEqualTo("one"); + assertThat(preAuthorize.value()).isEqualTo("three"); } @Test @@ -312,10 +313,12 @@ public class UniqueMergedAnnotationSynthesizerTests { private static class ClassInheritingInterfaceOverridingMultipleInterfaceInheritance implements InterfaceOverridingMultipleInterfaceInheritance { + @Override public String method() { return "ok"; } + } private interface InterfaceMethodOverridingMultipleInterfaceInheritance @@ -498,8 +501,7 @@ public class UniqueMergedAnnotationSynthesizerTests { } - private static class ClassInheritingGrandparentInterfaceAnnotation - implements InterfaceInheritingInterfaceAnnotation { + private static class ClassInheritingInterfaceMethodAnnotation implements AnnotationOnInterfaceMethod { @Override public String method() {