From c40d3e4310ad090d833da3cb8ace1da6b33a7852 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Tue, 17 Sep 2013 02:39:51 +0000 Subject: [PATCH] RM: Fix unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../action/impl/CompleteEventAction.java | 1 + .../action/impl/CutOffAction.java | 3 +++ .../test/service/ReportServiceImplTest.java | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java index 2d94bb510d..c461bfde2d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java @@ -41,6 +41,7 @@ import org.alfresco.service.namespace.QName; */ public class CompleteEventAction extends RMActionExecuterAbstractBase { + public static final String NAME = "completeEvent"; public static final String PARAM_EVENT_NAME = "eventName"; public static final String PARAM_EVENT_COMPLETED_BY = "eventCompletedBy"; public static final String PARAM_EVENT_COMPLETED_AT = "eventCompletedAt"; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java index 195817ce78..613c8c840f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CutOffAction.java @@ -36,6 +36,9 @@ import org.alfresco.service.namespace.QName; */ public class CutOffAction extends RMDispositionActionExecuterAbstractBase { + /** Action name */ + public static final String NAME = "cutoff"; + /** * @see org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase#executeRecordFolderLevelDisposition(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java index 787188e96d..74bb6b9a60 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java @@ -18,14 +18,20 @@ */ package org.alfresco.module.org_alfresco_module_rm.test.service; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; import java.util.Set; import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService; +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.report.Report; import org.alfresco.module.org_alfresco_module_rm.report.ReportModel; import org.alfresco.module.org_alfresco_module_rm.report.ReportService; 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; @@ -120,6 +126,10 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel @Override public Void run() throws Exception { + Map params = new HashMap(1); + params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); + recordsManagementActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params); + recordsManagementActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME); recordsManagementActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME); recordsManagementActionService.executeRecordsManagementAction(rmFolder, "fileDestructionReport"); return null;