From 448a6a66ea4be83a88af94f80f5da583e78804ae Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Thu, 31 Mar 2016 10:44:57 +0300 Subject: [PATCH 1/3] RM-2925 - made Delete action available for destroyed record folder, added unit test class --- .../rm-capabilities-recordfolder-context.xml | 9 +- .../recordfolder/DeleteRecordFolderTest.java | 97 +++++++++++++++++++ .../recordfolder/MoveRecordFolderTest.java | 2 +- 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml index 81658b0db5..18a2564e58 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml @@ -112,9 +112,10 @@ - + @@ -129,6 +130,12 @@ + + + + + + diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java new file mode 100644 index 0000000000..20e03dd4ab --- /dev/null +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java @@ -0,0 +1,97 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * 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 . + * #L% + */ +package org.alfresco.module.org_alfresco_module_rm.test.integration.recordfolder; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import org.alfresco.module.org_alfresco_module_rm.action.impl.CompleteEventAction; +import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; +import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; +import org.alfresco.module.org_alfresco_module_rm.capability.Capability; +import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; +import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; +import org.alfresco.service.cmr.repository.NodeRef; + +import net.sf.acegisecurity.vote.AccessDecisionVoter; + +/** + * Delete record folder test. + * + * @author Roxana Lucanu + * @since 2.4 + * + */ +public class DeleteRecordFolderTest extends BaseRMTestCase { + + // delete a destroyed record folder + public void testDeleteDestroyedRecordFolder() throws Exception + { + + final NodeRef testFolder = doTestInTransaction(new Test() + { + @Override + public NodeRef run() + { + // create folder + NodeRef testFolder = recordFolderService.createRecordFolder(rmContainer, "Peter Edward Francis"); + + // complete event + Map params = new HashMap(1); + params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); + rmActionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params); + + // cutoff folder + rmActionService.executeRecordsManagementAction(testFolder, CutOffAction.NAME); + + // destroy folder + rmActionService.executeRecordsManagementAction(testFolder, DestroyAction.NAME); + + return testFolder; + } + + @Override + public void test(NodeRef testFolder) throws Exception + { + // take a look at delete capability + Capability deleteCapability = capabilityService.getCapability("DeleteRecordFolder"); + assertEquals(AccessDecisionVoter.ACCESS_GRANTED, deleteCapability.evaluate(testFolder)); + } + }); + + doTestInTransaction(new FailureTest() + { + @Override + public void run() throws Exception + { + fileFolderService.delete(testFolder); + } + }); + } + +} diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java index 21f1965ecd..0d35057d2f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java @@ -431,7 +431,7 @@ public class MoveRecordFolderTest extends BaseRMTestCase public void test(NodeRef testFolder) throws Exception { // take a look at the move capability - Capability moveCapability = capabilityService.getCapability("Move"); + Capability moveCapability = capabilityService.getCapability("MoveRecordFolder"); assertEquals(AccessDecisionVoter.ACCESS_DENIED, moveCapability.evaluate(testFolder, destination)); } }); From 28541c9cae5d97c25bacdd1a023f66fc9fe83bc5 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Fri, 1 Apr 2016 09:21:21 +0300 Subject: [PATCH 2/3] removed comments --- .../capability/rm-capabilities-recordfolder-context.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml index 18a2564e58..dbb0c48acb 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml @@ -113,9 +113,6 @@ - From bc5f60c5a02d1bff7ba2b4b53de88df133ad38bb Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Thu, 7 Apr 2016 10:02:03 +0300 Subject: [PATCH 3/3] RM-2925 - changed test type for delete action --- .../recordfolder/DeleteRecordFolderTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java index 20e03dd4ab..5f3f46a556 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.recordfolder import java.io.Serializable; import java.util.HashMap; import java.util.Map; - import org.alfresco.module.org_alfresco_module_rm.action.impl.CompleteEventAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; @@ -37,7 +36,6 @@ import org.alfresco.module.org_alfresco_module_rm.capability.Capability; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; import org.alfresco.service.cmr.repository.NodeRef; - import net.sf.acegisecurity.vote.AccessDecisionVoter; /** @@ -47,8 +45,8 @@ import net.sf.acegisecurity.vote.AccessDecisionVoter; * @since 2.4 * */ -public class DeleteRecordFolderTest extends BaseRMTestCase { - +public class DeleteRecordFolderTest extends BaseRMTestCase +{ // delete a destroyed record folder public void testDeleteDestroyedRecordFolder() throws Exception { @@ -84,12 +82,13 @@ public class DeleteRecordFolderTest extends BaseRMTestCase { } }); - doTestInTransaction(new FailureTest() + doTestInTransaction(new Test() { @Override - public void run() throws Exception + public Void run() throws Exception { fileFolderService.delete(testFolder); + return null; } }); }