Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-24 13:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to support incompatible collaborator detection now in AbstractSecurityInterceptor.

Browse Source
This commit is contained in:
Ben Alex 2004-11-15 00:36:12 +00:00
parent e83c66bb37
commit ef2e45df77
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/test/java/org/acegisecurity/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
View File

@ -28,7 +28,6 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
import net.sf.acegisecurity.ITargetObject; import net.sf.acegisecurity.ITargetObject;
import net.sf.acegisecurity.MockAccessDecisionManager; import net.sf.acegisecurity.MockAccessDecisionManager;
import net.sf.acegisecurity.MockAuthenticationManager; import net.sf.acegisecurity.MockAuthenticationManager;
import net.sf.acegisecurity.MockMethodInvocation;
import net.sf.acegisecurity.MockRunAsManager; import net.sf.acegisecurity.MockRunAsManager;
import net.sf.acegisecurity.RunAsManager; import net.sf.acegisecurity.RunAsManager;
import net.sf.acegisecurity.context.ContextHolder; import net.sf.acegisecurity.context.ContextHolder;
@ -246,7 +245,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
si.afterPropertiesSet(); si.afterPropertiesSet();
fail("Should have thrown IllegalArgumentException"); fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
assertEquals("AccessDecisionManager does not support MethodInvocation", assertEquals("AccessDecisionManager does not support secure object class: interface org.aopalliance.intercept.MethodInvocation",
expected.getMessage()); expected.getMessage());
} }
} }
@ -255,12 +254,16 @@ public class MethodSecurityInterceptorTests extends TestCase {
throws Throwable { throws Throwable {
MethodSecurityInterceptor interceptor = new MethodSecurityInterceptor(); MethodSecurityInterceptor interceptor = new MethodSecurityInterceptor();
interceptor.setObjectDefinitionSource(new MockObjectDefinitionSourceWhichOnlySupportsStrings()); interceptor.setObjectDefinitionSource(new MockObjectDefinitionSourceWhichOnlySupportsStrings());
interceptor.setAccessDecisionManager(new MockAccessDecisionManager());
interceptor.setAuthenticationManager(new MockAuthenticationManager());
interceptor.setRunAsManager(new MockRunAsManager());
try { try {
interceptor.invoke(new MockMethodInvocation()); interceptor.afterPropertiesSet();
fail("Should have thrown IllegalArgumentException"); fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
assertTrue(expected.getMessage().startsWith("ObjectDefinitionSource does not support objects of type")); assertEquals("ObjectDefinitionSource does not support secure object class: interface org.aopalliance.intercept.MethodInvocation",
expected.getMessage());
} }
} }
@ -286,7 +289,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
si.afterPropertiesSet(); si.afterPropertiesSet();
fail("Should have thrown IllegalArgumentException"); fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
assertEquals("RunAsManager does not support MethodInvocation", assertEquals("RunAsManager does not support secure object class: interface org.aopalliance.intercept.MethodInvocation",
expected.getMessage()); expected.getMessage());
} }
} }
@ -430,8 +433,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
private class MockObjectDefinitionSourceWhichOnlySupportsStrings private class MockObjectDefinitionSourceWhichOnlySupportsStrings
extends AbstractMethodDefinitionSource { extends AbstractMethodDefinitionSource {
public Iterator getConfigAttributeDefinitions() { public Iterator getConfigAttributeDefinitions() {
throw new UnsupportedOperationException( return null;
"mock method not implemented");
} }
public boolean supports(Class clazz) { public boolean supports(Class clazz) {

4
core/src/test/java/org/acegisecurity/intercept/web/FilterSecurityInterceptorTests.java
View File

@ -101,7 +101,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
interceptor.afterPropertiesSet(); interceptor.afterPropertiesSet();
fail("Should have thrown IllegalArgumentException"); fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
assertEquals("AccessDecisionManager does not support FilterInvocation", assertEquals("AccessDecisionManager does not support secure object class: class net.sf.acegisecurity.intercept.web.FilterInvocation",
expected.getMessage()); expected.getMessage());
} }
} }
@ -133,7 +133,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
interceptor.afterPropertiesSet(); interceptor.afterPropertiesSet();
fail("Should have thrown IllegalArgumentException"); fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) { } catch (IllegalArgumentException expected) {
assertEquals("RunAsManager does not support FilterInvocation", assertEquals("RunAsManager does not support secure object class: class net.sf.acegisecurity.intercept.web.FilterInvocation",
expected.getMessage()); expected.getMessage());
} }
} }