diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/FileReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/FileReportAction.java index 186160dbb6..a8b9f1f3b8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/FileReportAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/FileReportAction.java @@ -38,8 +38,8 @@ import org.springframework.extensions.surf.util.I18NUtil; public class FileReportAction extends RMActionExecuterAbstractBase implements ReportModel { /** Constants for the parameters passed from the UI */ - private static final String REPORT_TYPE = "reportType"; - private static final String DESTINATION = "destination"; + public static final String REPORT_TYPE = "reportType"; + public static final String DESTINATION = "destination"; /** I18N */ private static final String MSG_PARAM_NOT_SUPPLIED = "rm.action.parameter-not-supplied"; 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 a201e22e4d..8722c08536 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 @@ -28,6 +28,7 @@ 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.action.FileReportAction; 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; @@ -105,6 +106,7 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel }); } + // FIXME!!! FileDestructionReport vs FileReport public void testFileDestructionReportAction() throws Exception { doTestInTransaction(new Test() @@ -117,7 +119,10 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel rmActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params); rmActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME); - rmActionService.executeRecordsManagementAction(rmFolder, "fileDestructionReport"); + Map fileReportParams = new HashMap(2); + fileReportParams.put(FileReportAction.REPORT_TYPE, "rmr:destructionReport"); + fileReportParams.put(FileReportAction.DESTINATION, filePlan.toString()); + rmActionService.executeRecordsManagementAction(rmFolder, "fileReport", fileReportParams); return null; } });