From 56c93afc665aa392e0d6de885f4181f278f731db Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 28 May 2024 15:25:35 -0600 Subject: [PATCH] Correct Tests About Conflicting Annotations Issue gh-9289 --- .../PostAuthorizeAuthorizationManagerTests.java | 4 ++-- ...AuthorizeReactiveAuthorizationManagerTests.java | 4 ++-- ...tFilterAuthorizationMethodInterceptorTests.java | 14 ++------------ ...uthorizationReactiveMethodInterceptorTests.java | 14 ++------------ .../PreAuthorizeAuthorizationManagerTests.java | 4 ++-- ...AuthorizeReactiveAuthorizationManagerTests.java | 4 ++-- ...eFilterAuthorizationMethodInterceptorTests.java | 14 ++------------ ...uthorizationReactiveMethodInterceptorTests.java | 14 ++------------ .../method/SecuredAuthorizationManagerTests.java | 4 ++-- 9 files changed, 18 insertions(+), 58 deletions(-) diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java index 8d0cbbf61a..6260f862cb 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java @@ -159,8 +159,8 @@ public class PostAuthorizeAuthorizationManagerTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { Supplier authentication = () -> new TestingAuthenticationToken("user", "password", "ROLE_USER"); - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ClassLevelAnnotations(), - ClassLevelAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); MethodInvocationResult result = new MethodInvocationResult(methodInvocation, null); PostAuthorizeAuthorizationManager manager = new PostAuthorizeAuthorizationManager(); assertThatExceptionOfType(AnnotationConfigurationException.class) diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeReactiveAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeReactiveAuthorizationManagerTests.java index d9bb194251..9946565334 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeReactiveAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeReactiveAuthorizationManagerTests.java @@ -165,8 +165,8 @@ public class PostAuthorizeReactiveAuthorizationManagerTests { public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { Mono authentication = Mono .just(new TestingAuthenticationToken("user", "password", "ROLE_USER")); - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ClassLevelAnnotations(), - ClassLevelAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); MethodInvocationResult result = new MethodInvocationResult(methodInvocation, null); PostAuthorizeReactiveAuthorizationManager manager = new PostAuthorizeReactiveAuthorizationManager(); assertThatExceptionOfType(AnnotationConfigurationException.class) diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java index 48eec00618..d68b9ce5d4 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java @@ -120,8 +120,8 @@ public class PostFilterAuthorizationMethodInterceptorTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ConflictingAnnotations(), - ConflictingAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PostFilterAuthorizationMethodInterceptor advice = new PostFilterAuthorizationMethodInterceptor(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> advice.invoke(methodInvocation)); @@ -230,16 +230,6 @@ public class PostFilterAuthorizationMethodInterceptorTests { } - public static class ConflictingAnnotations implements InterfaceAnnotationsThree { - - @Override - @PostFilter("filterObject == 'jack'") - public void inheritedAnnotations() { - - } - - } - public interface InterfaceAnnotationsOne { @PostFilter("filterObject == 'jim'") diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationReactiveMethodInterceptorTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationReactiveMethodInterceptorTests.java index 0235b50464..750cc4b14d 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationReactiveMethodInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationReactiveMethodInterceptorTests.java @@ -116,8 +116,8 @@ public class PostFilterAuthorizationReactiveMethodInterceptorTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ConflictingAnnotations(), - ConflictingAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PostFilterAuthorizationReactiveMethodInterceptor interceptor = new PostFilterAuthorizationReactiveMethodInterceptor(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> interceptor.invoke(methodInvocation)); @@ -155,16 +155,6 @@ public class PostFilterAuthorizationReactiveMethodInterceptorTests { } - public static class ConflictingAnnotations implements InterfaceAnnotationsThree { - - @Override - @PostFilter("filterObject == 'jack'") - public void inheritedAnnotations() { - - } - - } - public interface InterfaceAnnotationsOne { @PostFilter("filterObject == 'jim'") diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java index 6b8153ba61..aa27ca0577 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java @@ -127,8 +127,8 @@ public class PreAuthorizeAuthorizationManagerTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { Supplier authentication = () -> new TestingAuthenticationToken("user", "password", "ROLE_USER"); - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ClassLevelAnnotations(), - ClassLevelAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PreAuthorizeAuthorizationManager manager = new PreAuthorizeAuthorizationManager(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> manager.check(authentication, methodInvocation)); diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeReactiveAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeReactiveAuthorizationManagerTests.java index fa9d75a527..58c841f894 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeReactiveAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeReactiveAuthorizationManagerTests.java @@ -138,8 +138,8 @@ public class PreAuthorizeReactiveAuthorizationManagerTests { public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { Mono authentication = Mono .just(new TestingAuthenticationToken("user", "password", "ROLE_USER")); - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ClassLevelAnnotations(), - ClassLevelAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PreAuthorizeReactiveAuthorizationManager manager = new PreAuthorizeReactiveAuthorizationManager(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> manager.check(authentication, methodInvocation)); diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java index 30d40a369f..3cf5cc033e 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java @@ -180,8 +180,8 @@ public class PreFilterAuthorizationMethodInterceptorTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ConflictingAnnotations(), - ConflictingAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PreFilterAuthorizationMethodInterceptor advice = new PreFilterAuthorizationMethodInterceptor(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> advice.invoke(methodInvocation)); @@ -297,16 +297,6 @@ public class PreFilterAuthorizationMethodInterceptorTests { } - public static class ConflictingAnnotations implements InterfaceAnnotationsThree { - - @Override - @PreFilter("filterObject == 'jack'") - public void inheritedAnnotations() { - - } - - } - public interface InterfaceAnnotationsOne { @PreFilter("filterObject == 'jim'") diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationReactiveMethodInterceptorTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationReactiveMethodInterceptorTests.java index f37e5f83a1..7273be6f66 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationReactiveMethodInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationReactiveMethodInterceptorTests.java @@ -151,8 +151,8 @@ public class PreFilterAuthorizationReactiveMethodInterceptorTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ConflictingAnnotations(), - ConflictingAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); PreFilterAuthorizationReactiveMethodInterceptor interceptor = new PreFilterAuthorizationReactiveMethodInterceptor(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> interceptor.invoke(methodInvocation)); @@ -200,16 +200,6 @@ public class PreFilterAuthorizationReactiveMethodInterceptorTests { } - public static class ConflictingAnnotations implements InterfaceAnnotationsThree { - - @Override - @PreFilter("filterObject == 'jack'") - public void inheritedAnnotations() { - - } - - } - public interface InterfaceAnnotationsOne { @PreFilter("filterObject == 'jim'") diff --git a/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java index 5567ad7ae6..0d4e6a921b 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java @@ -147,8 +147,8 @@ public class SecuredAuthorizationManagerTests { @Test public void checkInheritedAnnotationsWhenConflictingThenAnnotationConfigurationException() throws Exception { Supplier authentication = () -> new TestingAuthenticationToken("user", "password", "ROLE_USER"); - MockMethodInvocation methodInvocation = new MockMethodInvocation(new ClassLevelAnnotations(), - ClassLevelAnnotations.class, "inheritedAnnotations"); + MockMethodInvocation methodInvocation = new MockMethodInvocation(new TestClass(), TestClass.class, + "inheritedAnnotations"); SecuredAuthorizationManager manager = new SecuredAuthorizationManager(); assertThatExceptionOfType(AnnotationConfigurationException.class) .isThrownBy(() -> manager.check(authentication, methodInvocation));