More generification to remove last warnings in Acl package.

This commit is contained in:
Luke Taylor 2009-04-26 10:05:55 +00:00
parent 8570d864dc
commit a5792b094a

View File

@ -1,12 +1,10 @@
package org.springframework.security.acls.expression; package org.springframework.security.acls.expression;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
import java.util.List; import java.util.List;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.security.acls.Acl; import org.springframework.security.acls.Acl;
@ -24,7 +22,6 @@ import org.springframework.security.core.Authentication;
* @since 2.5 * @since 2.5
*/ */
public class AclPermissionEvaluatorTests { public class AclPermissionEvaluatorTests {
Mockery jmock = new JUnit4Mockery();
Authentication user; Authentication user;
private AclService service; private AclService service;
private ObjectIdentityRetrievalStrategy oidStrategy; private ObjectIdentityRetrievalStrategy oidStrategy;
@ -32,28 +29,22 @@ public class AclPermissionEvaluatorTests {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
user = jmock.mock(Authentication.class); user = mock(Authentication.class);
service = jmock.mock(AclService.class); service = mock(AclService.class);
oidStrategy = jmock.mock(ObjectIdentityRetrievalStrategy.class); oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
sidStrategy = jmock.mock(SidRetrievalStrategy.class); sidStrategy = mock(SidRetrievalStrategy.class);
} }
@Test @Test
@SuppressWarnings("unchecked")
public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception { public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
AclPermissionEvaluator pe = new AclPermissionEvaluator(service); AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
final Acl acl = jmock.mock(Acl.class); final Acl acl = mock(Acl.class);
pe.setObjectIdentityRetrievalStrategy(oidStrategy); pe.setObjectIdentityRetrievalStrategy(oidStrategy);
pe.setSidRetrievalStrategy(sidStrategy); pe.setSidRetrievalStrategy(sidStrategy);
jmock.checking(new Expectations() {{ when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(acl);
ignoring(user); when(acl.isGranted(any(List.class), any(List.class), false)).thenReturn(true);
ignoring(oidStrategy);
ignoring(sidStrategy);
oneOf(service).readAclById(with(any(ObjectIdentity.class)), with(any(List.class)));
will(returnValue(acl));
oneOf(acl).isGranted(with(any(List.class)), with(any(List.class)), with(equal(false)));
will(returnValue(true));
}});
assertTrue(pe.hasPermission(user, new Object(), "READ")); assertTrue(pe.hasPermission(user, new Object(), "READ"));
} }