Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Annotation Test 

This new arrangement of the test better matches the class
hierarchy described by the original ticket.

Issue gh-13234
This commit is contained in:
Josh Cummings 2024-07-31 13:25:40 -06:00
parent 90335bd0a6
commit 77bce14462
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/test/java/org/springframework/security/core/annotation/UniqueMergedAnnotationSynthesizerTests.java
View File

@ -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() {