inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-1099 (Refactor Transfer and Accession reports)

Browse Source 
* Fixed failing test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@58417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-11-28 23:00:21 +00:00
parent 3fc7c64032
commit 5dfbaf9263
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/action/FileReportAction.java
View File

@@ -38,8 +38,8 @@ import org.springframework.extensions.surf.util.I18NUtil;
public class FileReportAction extends RMActionExecuterAbstractBase implements ReportModel public class FileReportAction extends RMActionExecuterAbstractBase implements ReportModel
{ {
/** Constants for the parameters passed from the UI */ /** Constants for the parameters passed from the UI */
private static final String REPORT_TYPE = "reportType"; public static final String REPORT_TYPE = "reportType";
private static final String DESTINATION = "destination"; public static final String DESTINATION = "destination";
/** I18N */ /** I18N */
private static final String MSG_PARAM_NOT_SUPPLIED = "rm.action.parameter-not-supplied"; private static final String MSG_PARAM_NOT_SUPPLIED = "rm.action.parameter-not-supplied";

7
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java
View File

@@ -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.action.impl.DestroyAction;
import org.alfresco.module.org_alfresco_module_rm.report.Report; 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.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.BaseRMTestCase;
import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils;
import org.alfresco.service.cmr.repository.NodeRef; 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 public void testFileDestructionReportAction() throws Exception
{ {
doTestInTransaction(new Test<Void>() doTestInTransaction(new Test<Void>()
@@ -117,7 +119,10 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel
rmActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params); rmActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params);
rmActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME);
rmActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME);
rmActionService.executeRecordsManagementAction(rmFolder, "fileDestructionReport"); Map<String, Serializable> fileReportParams = new HashMap<String, Serializable>(2);
fileReportParams.put(FileReportAction.REPORT_TYPE, "rmr:destructionReport");
fileReportParams.put(FileReportAction.DESTINATION, filePlan.toString());
rmActionService.executeRecordsManagementAction(rmFolder, "fileReport", fileReportParams);
return null; return null;
} }
}); });