Merged BRANCHES/V3.2 to HEAD:

19286: Fix for https://issues.alfresco.com/jira/browse/ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2010-03-18 13:48:40 +00:00
parent 915ecb52de
commit 5b47e4ea34
3 changed files with 76 additions and 24 deletions

View File

@@ -2488,6 +2488,20 @@ public class PermissionServiceTest extends AbstractPermissionTest
assertTrue("Time was "+(end - start)/1000000000.0f, end == start);
}
public void testClearPermissionNullAuthority()
{
assertEquals(0, permissionService.getAllSetPermissions(rootNodeRef).size());
permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ), "andy", AccessStatus.ALLOWED));
permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CHILDREN), "andy", AccessStatus.ALLOWED));
assertEquals(2, permissionService.getAllSetPermissions(rootNodeRef).size());
permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ), "lemur", AccessStatus.ALLOWED));
permissionService.setPermission(new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ_CHILDREN), "lemur", AccessStatus.ALLOWED));
assertEquals(4, permissionService.getAllSetPermissions(rootNodeRef).size());
permissionService.clearPermission(rootNodeRef, null);
assertEquals(0, permissionService.getAllSetPermissions(rootNodeRef).size());
}
public void testGetAllSetPermissionsFromAllNodes()
{
runAs(AuthenticationUtil.getAdminUserName());