diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml index 73c84caaa7..ee5b9527c6 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml @@ -88,5 +88,31 @@ class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.FileableCapabilityCondition"> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml new file mode 100644 index 0000000000..90690c276e --- /dev/null +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + + + + + + + + + + + RECORD_FOLDER + RECORD + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml index 9aa0c39881..6562f36cc8 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml @@ -139,37 +139,7 @@ - - - - - - - - RECORD_FOLDER - RECORD - - - - - - - - - - - - - - - - - - - - + @@ -251,5 +221,24 @@ + + + + + + + RECORD_FOLDER + + + + + + + + + + + \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml index 9fe28aa465..190450be0b 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml @@ -714,13 +714,11 @@ - @@ -764,48 +762,4 @@ class="org.alfresco.module.org_alfresco_module_rm.action.impl.CreateDispositionScheduleAction" parent="rmAction" /> - - - \ No newline at end of file diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml index 303ce83a22..56ba1f2591 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml @@ -53,50 +53,10 @@ - - - - - - RECORD_FOLDER - RECORD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -335,25 +283,6 @@ - - - - - - RECORD_FOLDER - - - - - - - - - - - - @@ -422,6 +351,9 @@ + + + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml index 36052ca0a8..cad53c7cb1 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml @@ -314,13 +314,6 @@ - - - RECORD_CATEGORY - RECORD_FOLDER - RECORD - - diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java index 362bb43a14..30a6bba9e4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityService.java @@ -64,13 +64,21 @@ public interface CapabilityService Set getCapabilities(boolean includePrivate); /** - * Get all the capabilities access state based on the current user. + * Get all the capabilities access state based on the current user for the assignable capabilities. * * @param nodeRef node reference * @return */ Map getCapabilitiesAccessState(NodeRef nodeRef); + /** + * Get all the capabilities access state based on the current user. + * + * @param nodeRef node reference + * @return + */ + Map getCapabilitiesAccessState(NodeRef nodeRef, boolean includePrivate); + /** * * @param nodeRef diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java index 2184de32ec..b33d1b509c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java @@ -94,8 +94,18 @@ public class CapabilityServiceImpl implements CapabilityService */ public Map getCapabilitiesAccessState(NodeRef nodeRef) { + return getCapabilitiesAccessState(nodeRef, false); + } + + /** + * @see org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService#getCapabilitiesAccessState(org.alfresco.service.cmr.repository.NodeRef, boolean) + */ + @Override + public Map getCapabilitiesAccessState(NodeRef nodeRef, boolean includePrivate) + { + Set listOfCapabilites = getCapabilities(includePrivate); HashMap answer = new HashMap(); - for (Capability capability : capabilities.values()) + for (Capability capability : listOfCapabilites) { AccessStatus status = capability.hasPermission(nodeRef); if (answer.put(capability, status) != null) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java new file mode 100644 index 0000000000..c31d91a3f4 --- /dev/null +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2005-2011 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ +package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition; + +import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; + +/** + * @author Roy Wetherall + */ +public class HasAspectCapabilityCondition extends AbstractCapabilityCondition +{ + private String aspectName; + + private NamespaceService namespaceService; + + public void setAspectName(String aspectName) + { + this.aspectName = aspectName; + } + + public void setNamespaceService(NamespaceService namespaceService) + { + this.namespaceService = namespaceService; + } + + /** + * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) + */ + @Override + public boolean evaluate(NodeRef nodeRef) + { + boolean result = false; + if (aspectName != null) + { + QName aspect = QName.createQName(aspectName, namespaceService); + result = nodeService.hasAspect(nodeRef, aspect); + } + + return result; + } + +} diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java index 1f9af16c9d..6781bb76f7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java @@ -24,7 +24,7 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService import org.alfresco.service.cmr.repository.NodeRef; /** - * Indicates whether the given disposition action 'may' be scheduled in the future + * Indicates whether the given disposition action is scheduled next * * @author Roy Wetherall */ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java new file mode 100644 index 0000000000..cb2dcd8056 --- /dev/null +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2005-2011 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ +package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition; + +import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind; +import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; +import org.alfresco.service.cmr.repository.NodeRef; + +/** + * @author Roy Wetherall + */ +public class IsTransferAccessionCapabilityCondition extends AbstractCapabilityCondition +{ + /** + * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) + */ + @Override + public boolean evaluate(NodeRef nodeRef) + { + boolean result = false; + + FilePlanComponentKind kind = rmService.getFilePlanComponentKind(nodeRef); + if (FilePlanComponentKind.TRANSFER.equals(kind) == true) + { + Boolean value = (Boolean)nodeService.getProperty(nodeRef, PROP_TRANSFER_ACCESSION_INDICATOR); + if (value != null) + { + result = value.booleanValue(); + } + } + return result; + } + +} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java index 364825202d..295d3cb9f3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java @@ -424,7 +424,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .getSystemUserName()); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -543,7 +543,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .setFullyAuthenticatedUser(AuthenticationUtil .getAdminUserName()); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -664,7 +664,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(rmAdminName); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -791,7 +791,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(recordsManagerName); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -914,7 +914,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(securityOfficerName); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1032,7 +1032,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(powerUserName); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1150,7 +1150,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(rmUserName); Map access = capabilityService.getCapabilitiesAccessState(filePlan); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1269,7 +1269,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .setFullyAuthenticatedUser(AuthenticationUtil.SYSTEM_USER_NAME); Map access = capabilityService.getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1391,7 +1391,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .setFullyAuthenticatedUser(AuthenticationUtil .getAdminUserName()); Map access = capabilityService.getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1512,7 +1512,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil .setFullyAuthenticatedUser(rmAdminName); Map access = capabilityService.getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1635,7 +1635,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // permissionService.setPermission(recordCategory_1, // rm_records_manager, FILING, true); Map access = capabilityService.getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1759,7 +1759,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // securityOfficerName, FILING, true); Map access = capabilityService .getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -1880,7 +1880,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // powerUserName, FILING, true); Map access = capabilityService .getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -2001,7 +2001,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // rmUserName, FILING, true); Map access = capabilityService .getCapabilitiesAccessState(rmContainer); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -2121,7 +2121,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements Map access = capabilityService .getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2250,7 +2250,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .getAdminUserName()); Map access = capabilityService .getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2373,7 +2373,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .setFullyAuthenticatedUser(rmAdminName); Map access = capabilityService .getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2494,7 +2494,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil.setFullyAuthenticatedUser(recordsManagerName); //setFilingOnRecordFolder(rmFolder, recordsManagerName); Map access = capabilityService.getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2615,7 +2615,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil.setFullyAuthenticatedUser(securityOfficerName); //setFilingOnRecordFolder(rmFolder, securityOfficerName); Map access = capabilityService.getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2733,7 +2733,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements AuthenticationUtil.setFullyAuthenticatedUser(powerUserName); //setFilingOnRecordFolder(rmFolder, powerUserName); Map access = capabilityService.getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.ALLOWED); @@ -2853,7 +2853,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements //setFilingOnRecordFolder(rmFolder, rmUserName); Map access = capabilityService .getCapabilitiesAccessState(rmFolder); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -2970,7 +2970,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements { AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.SYSTEM_USER_NAME); Map access = capabilityService.getCapabilitiesAccessState(record); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3094,7 +3094,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .getAdminUserName()); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3217,7 +3217,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements .setFullyAuthenticatedUser(rmAdminName); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); + assertEquals(59, access.size()); check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3341,7 +3341,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // setFilingOnRecord(record, recordsManagerName); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.ALLOWED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3465,7 +3465,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // setFilingOnRecord(record, securityOfficerName); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3587,7 +3587,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // setFilingOnRecord(record, powerUserName); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED); @@ -3708,7 +3708,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements // setFilingOnRecord(record, rmUserName); Map access = capabilityService .getCapabilitiesAccessState(record); - assertEquals(66, access.size()); // 58 + File + assertEquals(59, access.size()); // 58 + File check(access, ACCESS_AUDIT, AccessStatus.DENIED); check(access, ADD_MODIFY_EVENT_DATES, AccessStatus.DENIED);