From a7428c134fe25fd8d2f2deec4d5d2b3d1f1b2365 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Tue, 26 Apr 2016 18:06:11 +0300 Subject: [PATCH 1/5] RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule --- .../disposition/DispositionServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 95f0aae459..04455015dd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -889,6 +889,13 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the current action String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID); currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); + // When the record has multiple disposition schedules the current disposition action may not be found by id + // In this case it will be searched by name + if(currentDispositionActionDefinition == null) + { + String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); + currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); + } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); From f4ac24d41f1b5382ebb1ad9009f1e9500eb93f17 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Tue, 31 May 2016 14:50:27 +0300 Subject: [PATCH 2/5] Added integration test. --- .../UpdateNextDispositionActionTest.java | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java new file mode 100644 index 0000000000..b9d4900133 --- /dev/null +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -0,0 +1,147 @@ +/* + * #%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.disposition; + +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; +import static org.alfresco.util.GUID.generate; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +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.action.impl.TransferAction; +import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; +import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; +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 org.alfresco.service.namespace.QName; +import org.springframework.extensions.webscripts.GUID; + +/** +* Update next disposition step integration tests. +* +* @author Roxana Lucanu +* @since 2.4.1 +*/ + +public class UpdateNextDispositionActionTest extends BaseRMTestCase +{ + + /** + * Given a record with multiple dispositions + * When updating the next step + * Then the action is available + *

+ * relates to https://issues.alfresco.com/jira/browse/RM-3060 + */ + public void testUpdateNextDispositionAction_RM3060() throws Exception + { + doBehaviourDrivenTest(new BehaviourDrivenTest() + { + NodeRef record; + + @Override + public void given() + { + // create first category + NodeRef category1 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category1 + DispositionSchedule ds1 = utils.createDispositionSchedule(category1, DEFAULT_DISPOSITION_INSTRUCTIONS, + "ds1", true, false, false); + + // create the properties for CUTOFF action + Map adCutOff = new HashMap(3); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "CutOffDesc"); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); + + dispositionService.addDispositionActionDefinition(ds1, adCutOff); + + // create the properties for TRANSFER action + Map adTransfer = new HashMap(3); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "TransferDesc"); + List eventsList = new ArrayList(1); + eventsList.add("study_complete"); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable)eventsList); + + dispositionService.addDispositionActionDefinition(ds1, adTransfer); + + // create the properties for DESTROY action + Map adDestroy = new HashMap(3); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "DestroyDesc"); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, "week|1"); + + dispositionService.addDispositionActionDefinition(ds1, adDestroy); + + // create folder1 > record inside category1 + NodeRef firstFolder = recordFolderService.createRecordFolder(category1, GUID.generate()); + record = utils.createRecord(firstFolder, GUID.generate(), "title"); + + // create second category + NodeRef category2 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category2 + DispositionSchedule ds2 = utils.createDispositionSchedule(category2, DEFAULT_DISPOSITION_INSTRUCTIONS, + "ds2", true, false, true); + // add disposition actions + dispositionService.addDispositionActionDefinition(ds2, adCutOff); + dispositionService.addDispositionActionDefinition(ds2, adTransfer); + dispositionService.addDispositionActionDefinition(ds2, adDestroy); + + // create folder2 inside category2 + NodeRef folder2 = recordFolderService.createRecordFolder(category2, GUID.generate()); + + // link the record to folder2 + recordService.link(record, folder2); + + // complete record + utils.completeRecord(record); + } + + @Override + public void when() + { + // complete event + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + } + + @Override + public void then() + { + // ensure the record folder is cut off + assertTrue(dispositionService.isDisposableItemCutoff(record)); + } + }); + + } +} From e9bb18f9f5d33814403a0abb071a1c80a5544481 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Wed, 1 Jun 2016 17:41:36 +0300 Subject: [PATCH 3/5] Changed test class and commented initial fix. --- .../disposition/DispositionServiceImpl.java | 10 +- .../UpdateNextDispositionActionTest.java | 108 ++++++++---------- 2 files changed, 54 insertions(+), 64 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 04455015dd..76d476b8f4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -891,11 +891,11 @@ public class DispositionServiceImpl extends ServiceBaseImpl currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); // When the record has multiple disposition schedules the current disposition action may not be found by id // In this case it will be searched by name - if(currentDispositionActionDefinition == null) - { - String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); - currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); - } +// if(currentDispositionActionDefinition == null) +// { +// String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); +// currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); +// } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index b9d4900133..edd76ccdbf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -26,25 +26,22 @@ */ package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_IMMEDIATELY; import static org.alfresco.util.GUID.generate; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; 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.action.impl.TransferAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; 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 org.alfresco.service.namespace.QName; -import org.springframework.extensions.webscripts.GUID; /** * Update next disposition step integration tests. @@ -52,10 +49,8 @@ import org.springframework.extensions.webscripts.GUID; * @author Roxana Lucanu * @since 2.4.1 */ - public class UpdateNextDispositionActionTest extends BaseRMTestCase { - /** * Given a record with multiple dispositions * When updating the next step @@ -68,59 +63,36 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase doBehaviourDrivenTest(new BehaviourDrivenTest() { NodeRef record; + NodeRef folder2; @Override public void given() { - // create first category + // create category1 NodeRef category1 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category1 - DispositionSchedule ds1 = utils.createDispositionSchedule(category1, DEFAULT_DISPOSITION_INSTRUCTIONS, - "ds1", true, false, false); + createDispositionSchedule(category1); - // create the properties for CUTOFF action - Map adCutOff = new HashMap(3); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "CutOffDesc"); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); - - dispositionService.addDispositionActionDefinition(ds1, adCutOff); - - // create the properties for TRANSFER action - Map adTransfer = new HashMap(3); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "TransferDesc"); - List eventsList = new ArrayList(1); - eventsList.add("study_complete"); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable)eventsList); - - dispositionService.addDispositionActionDefinition(ds1, adTransfer); - - // create the properties for DESTROY action - Map adDestroy = new HashMap(3); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "DestroyDesc"); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, "week|1"); - - dispositionService.addDispositionActionDefinition(ds1, adDestroy); - - // create folder1 > record inside category1 - NodeRef firstFolder = recordFolderService.createRecordFolder(category1, GUID.generate()); - record = utils.createRecord(firstFolder, GUID.generate(), "title"); - - // create second category + // create category2 NodeRef category2 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category2 - DispositionSchedule ds2 = utils.createDispositionSchedule(category2, DEFAULT_DISPOSITION_INSTRUCTIONS, - "ds2", true, false, true); - // add disposition actions - dispositionService.addDispositionActionDefinition(ds2, adCutOff); - dispositionService.addDispositionActionDefinition(ds2, adTransfer); - dispositionService.addDispositionActionDefinition(ds2, adDestroy); + createDispositionSchedule(category2); // create folder2 inside category2 - NodeRef folder2 = recordFolderService.createRecordFolder(category2, GUID.generate()); + folder2 = recordFolderService.createRecordFolder(category2, generate()); + // create folder1 inside category1 + NodeRef folder1 = recordFolderService.createRecordFolder(category1, generate()); + + // create record inside folder1 + record = utils.createRecord(folder1, generate(), generate()); + } + + @Override + public void when() + { // link the record to folder2 recordService.link(record, folder2); @@ -129,19 +101,37 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase } @Override - public void when() + public void then() throws Exception { - // complete event + // cut off rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } - - @Override - public void then() - { - // ensure the record folder is cut off - assertTrue(dispositionService.isDisposableItemCutoff(record)); - } }); - } -} + + private void createDispositionSchedule(NodeRef category) + { + DispositionSchedule ds = utils.createDispositionSchedule(category, DEFAULT_DISPOSITION_INSTRUCTIONS, DEFAULT_DISPOSITION_DESCRIPTION, true, false, false); + + // create the properties for CUTOFF action and add it to the disposition action definition + Map cutOff = new HashMap(3); + cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); + cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate()); + cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, cutOff); + + // create the properties for TRANSFER action and add it to the disposition action definition + Map transfer = new HashMap(3); + transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); + transfer.put(PROP_DISPOSITION_DESCRIPTION, generate()); + transfer.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, transfer); + + // create the properties for DESTROY action and add it to the disposition action definition + Map destroy = new HashMap(3); + destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); + destroy.put(PROP_DISPOSITION_DESCRIPTION, generate()); + destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, destroy); + } +} \ No newline at end of file From 563cae7555c8793921323cd52be97b5cc7852c0b Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 9 Jun 2016 13:53:07 +1000 Subject: [PATCH 4/5] Changes to integration to better reflect the scenario to be tested --- .../EditDispositionActionAsOfDateAction.java | 3 ++ .../UpdateNextDispositionActionTest.java | 33 ++++++++++++------- .../test/util/CommonRMTestUtils.java | 1 + 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java index d7ff27e995..071b3a2da2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java @@ -47,6 +47,9 @@ public class EditDispositionActionAsOfDateAction extends RMActionExecuterAbstrac private static final String MSG_VALID_DATE_DISP_ASOF = "rm.action.valid-date-disp-asof"; private static final String MSG_DISP_ASOF_LIFECYCLE_APPLIED = "rm.action.disp-asof-lifecycle-applied"; + /** Action name */ + public static final String NAME = "editDispositionActionAsOfDate"; + /** Action parameters */ public static final String PARAM_AS_OF_DATE = "asOfDate"; diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index edd76ccdbf..9e63033e32 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -28,15 +28,19 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; -import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_IMMEDIATELY; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_EVENT_NAME; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_ONE_WEEK; import static org.alfresco.util.GUID.generate; import java.io.Serializable; +import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.Map; 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.action.impl.EditDispositionActionAsOfDateAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; @@ -88,23 +92,30 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase // create record inside folder1 record = utils.createRecord(folder1, generate(), generate()); - } - - @Override - public void when() - { + // link the record to folder2 recordService.link(record, folder2); // complete record utils.completeRecord(record); + + // set the disposition as of date to now on the record + rmActionService.executeRecordsManagementAction(record, + EditDispositionActionAsOfDateAction.NAME, + Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); + } + + @Override + public void when() + { + // cut off + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } @Override public void then() throws Exception { - // cut off - rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + assertTrue(nodeService.hasAspect(record, ASPECT_CUT_OFF)); } }); } @@ -117,21 +128,21 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase Map cutOff = new HashMap(3); cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate()); - cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK); dispositionService.addDispositionActionDefinition(ds, cutOff); // create the properties for TRANSFER action and add it to the disposition action definition Map transfer = new HashMap(3); transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); transfer.put(PROP_DISPOSITION_DESCRIPTION, generate()); - transfer.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + transfer.put(PROP_DISPOSITION_EVENT, (Serializable)Collections.singletonList(DEFAULT_EVENT_NAME)); dispositionService.addDispositionActionDefinition(ds, transfer); // create the properties for DESTROY action and add it to the disposition action definition Map destroy = new HashMap(3); destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); destroy.put(PROP_DISPOSITION_DESCRIPTION, generate()); - destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK); dispositionService.addDispositionActionDefinition(ds, destroy); } } \ No newline at end of file diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java index 8f4ddd7969..1938535988 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java @@ -86,6 +86,7 @@ public class CommonRMTestUtils implements RecordsManagementModel public static final String DEFAULT_EVENT_NAME = "case_closed"; public static final String PERIOD_NONE = "none|0"; public static final String PERIOD_IMMEDIATELY = "immediately|0"; + public static final String PERIOD_ONE_WEEK = "week|1"; /** * Constructor From 85b965dea9302a51a4806fe2db578b2ae85d37f5 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Thu, 16 Jun 2016 15:50:35 +0300 Subject: [PATCH 5/5] Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. --- .../disposition/DispositionServiceImpl.java | 10 +++++----- .../UpdateNextDispositionActionTest.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 76d476b8f4..04455015dd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -891,11 +891,11 @@ public class DispositionServiceImpl extends ServiceBaseImpl currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); // When the record has multiple disposition schedules the current disposition action may not be found by id // In this case it will be searched by name -// if(currentDispositionActionDefinition == null) -// { -// String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); -// currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); -// } + if(currentDispositionActionDefinition == null) + { + String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); + currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); + } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index 9e63033e32..462198f5a7 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -92,24 +92,24 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase // create record inside folder1 record = utils.createRecord(folder1, generate(), generate()); - + + } + @Override + public void when() throws Exception + { // link the record to folder2 recordService.link(record, folder2); // complete record utils.completeRecord(record); - + // set the disposition as of date to now on the record rmActionService.executeRecordsManagementAction(record, - EditDispositionActionAsOfDateAction.NAME, - Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); - } + EditDispositionActionAsOfDateAction.NAME, + Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); - @Override - public void when() - { // cut off - rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } @Override