Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1257: Some additional API changes to use Collection instead of List...

Browse Source
This commit is contained in:
Luke Taylor
2009-10-07 21:08:20 +00:00
parent 9bece3bc9a
commit 4dcb9de67a
11 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodDefinitionSourceTests.java
View File

@@ -2,7 +2,7 @@ package org.springframework.security.access.annotation;
import static org.junit.Assert.assertEquals;
import java.util.List;
import java.util.Collection;
import javax.annotation.security.DenyAll;
import javax.annotation.security.PermitAll;
@@ -12,7 +12,6 @@ import junit.framework.Assert;
import org.junit.Test;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
/**
* @author Luke Taylor
@@ -25,51 +24,55 @@ public class Jsr250MethodDefinitionSourceTests {
UserAllowedClass userAllowed = new UserAllowedClass();
DenyAllClass denyAll = new DenyAllClass();
private ConfigAttribute[] findAttributes(String methodName) throws Exception {
return mds.findAttributes(a.getClass().getMethod(methodName), null).toArray(new ConfigAttribute[0]);
}
@Test
public void methodWithRolesAllowedHasCorrectAttribute() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass().getMethod("adminMethod"), null);
assertEquals(1, accessAttributes.size());
assertEquals("ADMIN", accessAttributes.get(0).toString());
ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
assertEquals(1, accessAttributes.length);
assertEquals("ADMIN", accessAttributes[0].toString());
}
@Test
public void permitAllMethodHasPermitAllAttribute() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass().getMethod("permitAllMethod"), null);
assertEquals(1, accessAttributes.size());
assertEquals("javax.annotation.security.PermitAll", accessAttributes.get(0).toString());
ConfigAttribute[] accessAttributes = findAttributes("permitAllMethod");
assertEquals(1, accessAttributes.length);
assertEquals("javax.annotation.security.PermitAll", accessAttributes[0].toString());
}
@Test
public void noRoleMethodHasDenyAllAttributeWithDenyAllClass() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(denyAll.getClass());
assertEquals(1, accessAttributes.size());
assertEquals("javax.annotation.security.DenyAll", accessAttributes.get(0).toString());
ConfigAttribute[] accessAttributes = mds.findAttributes(denyAll.getClass()).toArray(new ConfigAttribute[0]);
assertEquals(1, accessAttributes.length);
assertEquals("javax.annotation.security.DenyAll", accessAttributes[0].toString());
}
@Test
public void adminMethodHasAdminAttributeWithDenyAllClass() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(denyAll.getClass().getMethod("adminMethod"), null);
Collection<ConfigAttribute> accessAttributes = mds.findAttributes(denyAll.getClass().getMethod("adminMethod"), null);
assertEquals(1, accessAttributes.size());
assertEquals("ADMIN", accessAttributes.get(0).toString());
assertEquals("ADMIN", accessAttributes.toArray()[0].toString());
}
@Test
public void noRoleMethodHasNoAttributes() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass().getMethod("noRoleMethod"), null);
Collection<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass().getMethod("noRoleMethod"), null);
Assert.assertNull(accessAttributes);
}
@Test
public void classRoleIsAppliedToNoRoleMethod() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("noRoleMethod"), null);
Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("noRoleMethod"), null);
Assert.assertNull(accessAttributes);
}
@Test
public void methodRoleOverridesClassRole() throws Exception {
List<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("adminMethod"), null);
Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("adminMethod"), null);
assertEquals(1, accessAttributes.size());
assertEquals("ADMIN", accessAttributes.get(0).toString());
assertEquals("ADMIN", accessAttributes.toArray()[0].toString());
}
//~ Inner Classes ======================================================================================================

13
core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataDefinitionSourceTests.java
View File

@@ -15,7 +15,7 @@
package org.springframework.security.access.annotation;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Collection;
import junit.framework.TestCase;
@@ -23,7 +23,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.SecurityConfig;
import org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource;
import org.springframework.util.StringUtils;
@@ -52,7 +51,7 @@ public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends Test
fail("Should be a superMethod called 'someUserMethod3' on class!");
}
List<ConfigAttribute> attrs = mds.findAttributes(method, DepartmentServiceImpl.class);
Collection<ConfigAttribute> attrs = mds.findAttributes(method, DepartmentServiceImpl.class);
assertNotNull(attrs);
@@ -76,7 +75,7 @@ public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends Test
fail("Should be a superMethod called 'someUserMethod3' on class!");
}
List<ConfigAttribute> superAttrs = this.mds.findAttributes(superMethod, DepartmentServiceImpl.class);
Collection<ConfigAttribute> superAttrs = this.mds.findAttributes(superMethod, DepartmentServiceImpl.class);
assertNotNull(superAttrs);
@@ -94,7 +93,7 @@ public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends Test
}
public void testGetAttributesClass() {
List<ConfigAttribute> attrs = this.mds.findAttributes(BusinessService.class);
Collection<ConfigAttribute> attrs = this.mds.findAttributes(BusinessService.class);
assertNotNull(attrs);
@@ -102,7 +101,7 @@ public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends Test
assertEquals(1, attrs.size());
// should have 1 SecurityConfig
SecurityConfig sc = ((SecurityConfig) attrs.get(0));
SecurityConfig sc = (SecurityConfig) attrs.toArray()[0];
assertEquals("ROLE_USER", sc.getAttribute());
}
@@ -116,7 +115,7 @@ public class SecuredAnnotationSecurityMetadataDefinitionSourceTests extends Test
fail("Should be a method called 'someUserAndAdminMethod' on class!");
}
List<ConfigAttribute> attrs = this.mds.findAttributes(method, BusinessService.class);
Collection<ConfigAttribute> attrs = this.mds.findAttributes(method, BusinessService.class);
assertNotNull(attrs);

2
core/src/test/java/org/springframework/security/access/intercept/method/MockMethodSecurityMetadataSource.java
View File

@@ -68,7 +68,7 @@ public class MockMethodSecurityMetadataSource implements MethodSecurityMetadataS
throw new UnsupportedOperationException("mock method not implemented");
}
public List<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
throw new UnsupportedOperationException("mock method not implemented");
}