From b917f2ed93e5f903adbd0cd2eba8a0c8bd00eda4 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Fri, 29 Jun 2012 07:38:49 +0000
Subject: [PATCH] Fix up RM unit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@38535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../test/capabilities/CapabilitiesTest.java            | 10 +++++-----
 .../test/capabilities/DeclarativeCapabilityTest.java   |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

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 295d3cb9f3..dee257b836 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
@@ -814,7 +814,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements
                         check(access, CREATE_MODIFY_DESTROY_EVENTS,
                                 AccessStatus.ALLOWED);
                         check(access, CREATE_MODIFY_DESTROY_FILEPLAN_METADATA,
-                                AccessStatus.DENIED);
+                                AccessStatus.ALLOWED);
                         check(access, CREATE_MODIFY_DESTROY_FILEPLAN_TYPES,
                                 AccessStatus.ALLOWED);
                         check(access, CREATE_MODIFY_DESTROY_FOLDERS,
@@ -2200,7 +2200,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements
                         check(access, MANAGE_ACCESS_RIGHTS,
                                 AccessStatus.ALLOWED);
                         check(access, MANUALLY_CHANGE_DISPOSITION_DATES,
-                                AccessStatus.ALLOWED);
+                                AccessStatus.DENIED);
                         check(access, MAP_CLASSIFICATION_GUIDE_METADATA,
                                 AccessStatus.ALLOWED);
                         check(access, MAP_EMAIL_METADATA, AccessStatus.ALLOWED);
@@ -2324,7 +2324,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements
                         check(access, MANAGE_ACCESS_RIGHTS,
                                 AccessStatus.ALLOWED);
                         check(access, MANUALLY_CHANGE_DISPOSITION_DATES,
-                                AccessStatus.ALLOWED);
+                                AccessStatus.DENIED);
                         check(access, MAP_CLASSIFICATION_GUIDE_METADATA,
                                 AccessStatus.ALLOWED);
                         check(access, MAP_EMAIL_METADATA, AccessStatus.ALLOWED);
@@ -2447,7 +2447,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements
                         check(access, MANAGE_ACCESS_RIGHTS,
                                 AccessStatus.ALLOWED);
                         check(access, MANUALLY_CHANGE_DISPOSITION_DATES,
-                                AccessStatus.ALLOWED);
+                                AccessStatus.DENIED);
                         check(access, MAP_CLASSIFICATION_GUIDE_METADATA,
                                 AccessStatus.ALLOWED);
                         check(access, MAP_EMAIL_METADATA, AccessStatus.ALLOWED);
@@ -2568,7 +2568,7 @@ public class CapabilitiesTest extends BaseRMTestCase implements
                         check(access, MANAGE_ACCESS_RIGHTS,
                                 AccessStatus.ALLOWED);
                         check(access, MANUALLY_CHANGE_DISPOSITION_DATES,
-                                AccessStatus.ALLOWED);
+                                AccessStatus.DENIED);
                         check(access, MAP_CLASSIFICATION_GUIDE_METADATA,
                                 AccessStatus.ALLOWED);
                         check(access, MAP_EMAIL_METADATA, AccessStatus.ALLOWED);
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
index 15b795df01..587b4e965c 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
@@ -30,6 +30,7 @@ import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition;
+import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability;
 import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability;
 import org.alfresco.module.org_alfresco_module_rm.security.Role;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
@@ -145,6 +146,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
         for (Capability capability : capabilities)
         {
             if (capability instanceof DeclarativeCapability && 
+                capability instanceof CompositeCapability == false &&
                 capability.isPrivate() == false &&
                 capability.getName().equals("MoveRecords") == false &&
                 capability.getName().equals("DeleteLinks") == false &&