From 97469ddcf0f37f30065e0f3c5c8721cbe624f76c Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Tue, 17 Sep 2013 06:17:04 +0000
Subject: [PATCH] RM: Unit test fix

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55376 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../capability/rm-capabilities-recordfolder-context.xml      | 5 -----
 .../test/capabilities/DeclarativeCapabilityTest.java         | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 54d76d7938..afc80e15bb 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -80,10 +80,5 @@
          </list>
       </property>
       <property name="targetCapability" ref="rmCreateModifyDestroyFoldersCapability"/>
-      <property name="conditions">
-         <map>
-            <entry key="capabilityCondition.isClassified" value="false"/>
-         </map>
-      </property>
    </bean>
 </beans>
\ No newline at end of file
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 1cc4a00a70..948770e112 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
@@ -413,7 +413,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
             {
                 // first take a look at just the record
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(rmContainer));
-                assertEquals(AccessStatus.DENIED, capability.hasPermission(rmFolder));
+                assertEquals(AccessStatus.UNDETERMINED, capability.hasPermission(rmFolder));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(record));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(declaredRecord));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(frozenRecordFolder));
@@ -447,7 +447,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
             public Void run()
             {
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(rmContainer));
-                assertEquals(AccessStatus.DENIED, capability.hasPermission(rmFolder));
+                assertEquals(AccessStatus.UNDETERMINED, capability.hasPermission(rmFolder));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(record));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(declaredRecord));
                 assertEquals(AccessStatus.DENIED, capability.hasPermission(frozenRecordFolder));