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

Added clearContext() in @After. Test was leaving a TestingAuthenticationToken in the context.

This commit is contained in:
Luke Taylor 2008-11-16 00:09:35 +00:00
parent 18e74e7d3f
commit 13caa48a24
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/test/java/org/springframework/security/intercept/method/aspectj/AspectJSecurityInterceptorTests.java
View File

@ -15,10 +15,12 @@
package org.springframework.security.intercept.method.aspectj; package org.springframework.security.intercept.method.aspectj;
import static org.junit.Assert.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import junit.framework.TestCase; import org.junit.After;
import org.junit.Test;
import org.springframework.security.AccessDeniedException; import org.springframework.security.AccessDeniedException;
import org.springframework.security.GrantedAuthority; import org.springframework.security.GrantedAuthority;
import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.GrantedAuthorityImpl;
@ -41,10 +43,16 @@ import org.springframework.security.util.AuthorityUtils;
* @author Ben Alex * @author Ben Alex
* @version $Id$ * @version $Id$
*/ */
public class AspectJSecurityInterceptorTests extends TestCase { public class AspectJSecurityInterceptorTests {
//~ Methods ======================================================================================================== //~ Methods ========================================================================================================
@After
public void clearContext() {
SecurityContextHolder.clearContext();
}
@Test
public void testCallbackIsInvokedWhenPermissionGranted() throws Exception { public void testCallbackIsInvokedWhenPermissionGranted() throws Exception {
AspectJSecurityInterceptor si = new AspectJSecurityInterceptor(); AspectJSecurityInterceptor si = new AspectJSecurityInterceptor();
si.setApplicationEventPublisher(new MockApplicationEventPublisher(true)); si.setApplicationEventPublisher(new MockApplicationEventPublisher(true));
@ -76,6 +84,7 @@ public class AspectJSecurityInterceptorTests extends TestCase {
assertEquals("object proceeded", result); assertEquals("object proceeded", result);
} }
@Test(expected=AccessDeniedException.class)
public void testCallbackIsNotInvokedWhenPermissionDenied() throws Exception { public void testCallbackIsNotInvokedWhenPermissionDenied() throws Exception {
AspectJSecurityInterceptor si = new AspectJSecurityInterceptor(); AspectJSecurityInterceptor si = new AspectJSecurityInterceptor();
si.setApplicationEventPublisher(new MockApplicationEventPublisher(true)); si.setApplicationEventPublisher(new MockApplicationEventPublisher(true));
@ -98,16 +107,11 @@ public class AspectJSecurityInterceptorTests extends TestCase {
MockAspectJCallback aspectJCallback = new MockAspectJCallback(); MockAspectJCallback aspectJCallback = new MockAspectJCallback();
aspectJCallback.setThrowExceptionIfInvoked(true); aspectJCallback.setThrowExceptionIfInvoked(true);
SecurityContextHolder.getContext() SecurityContextHolder.getContext().setAuthentication(
.setAuthentication(new TestingAuthenticationToken("rod", "koala", new TestingAuthenticationToken("rod", "koala", AuthorityUtils.NO_AUTHORITIES ));
AuthorityUtils.NO_AUTHORITIES ));
try {
si.invoke(joinPoint, aspectJCallback); si.invoke(joinPoint, aspectJCallback);
fail("Should have thrown AccessDeniedException"); fail("Should have thrown AccessDeniedException");
} catch (AccessDeniedException expected) {
assertTrue(true);
}
} }
//~ Inner Classes ================================================================================================== //~ Inner Classes ==================================================================================================