From 5364779912d605b551fd7bd8b01ee64bf3bf3fac Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Fri, 19 Aug 2016 12:21:50 +0100 Subject: [PATCH] RM-3074: Fixup community integration tests --- .../test/integration/issue/RM1429Test.java | 12 ++++++------ .../test/integration/issue/RM1463Test.java | 12 ++++++------ .../test/integration/issue/RM1464Test.java | 12 ++++++------ .../test/integration/issue/RM1727Test.java | 13 +++++++++++-- .../test/legacy/action/FileReportActionTest.java | 3 +++ .../test/legacy/action/FileToActionTest.java | 11 +++++++++-- 6 files changed, 41 insertions(+), 22 deletions(-) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java index 0795d314b2..6c7560402b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java @@ -44,14 +44,14 @@ public class RM1429Test extends DeleteHoldTest { public void testDeleteHoldWithoutPermissionsOnChildren() { - // Create the test hold - final NodeRef hold = createAndCheckHold(); - - doTestInTransaction(new Test() + final NodeRef hold = doTestInTransaction(new Test() { @Override - public Void run() + public NodeRef run() { + // Create the test hold + NodeRef hold = createAndCheckHold(); + // Add the user to the RM Manager role filePlanRoleService.assignRoleToAuthority(filePlan, FilePlanRoleService.ROLE_RECORDS_MANAGER, userName); @@ -64,7 +64,7 @@ public class RM1429Test extends DeleteHoldTest // Add record folder to the hold holdService.addToHold(hold, rmFolder); - return null; + return hold; } }); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java index c3993d090d..3ed864a61f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java @@ -44,14 +44,14 @@ public class RM1463Test extends DeleteHoldTest { public void testAddRecordFolderToHoldWithoutFilingPermissionOnRecordFolder() { - // Create hold - final NodeRef hold = createAndCheckHold(); - - doTestInTransaction(new Test() + final NodeRef hold = doTestInTransaction(new Test() { @Override - public Void run() + public NodeRef run() { + // Create hold + NodeRef hold = createAndCheckHold(); + // Add the user to the RM Manager role filePlanRoleService.assignRoleToAuthority(filePlan, FilePlanRoleService.ROLE_RECORDS_MANAGER, userName); @@ -61,7 +61,7 @@ public class RM1463Test extends DeleteHoldTest // Give the user only read permissions on the record folder permissionService.setPermission(rmFolder, userName, RMPermissionModel.READ_RECORDS, true); - return null; + return hold; } }); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java index 9f603b23b9..4a9dfa3ccf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java @@ -44,14 +44,14 @@ public class RM1464Test extends DeleteHoldTest { public void testAddRecordFolderToHoldWithoutFilingPermissionOnHold() { - // Create hold - final NodeRef hold = createAndCheckHold(); - - doTestInTransaction(new Test() + final NodeRef hold = doTestInTransaction(new Test() { @Override - public Void run() + public NodeRef run() { + // Create hold + NodeRef hold = createAndCheckHold(); + // Add the user to the RM Manager role filePlanRoleService.assignRoleToAuthority(filePlan, FilePlanRoleService.ROLE_RECORDS_MANAGER, userName); @@ -61,7 +61,7 @@ public class RM1464Test extends DeleteHoldTest // Give the user filing permissions on the record folder permissionService.setPermission(rmFolder, userName, RMPermissionModel.FILING, true); - return null; + return hold; } }); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java index 7ba685e60b..4dc5cd06e8 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java @@ -80,8 +80,17 @@ public class RM1727Test extends BaseRMTestCase public void testRM1727() { - //set read and file permissions for folder - filePlanPermissionService.setPermission(folder, myUser, RMPermissionModel.FILING); + doTestInTransaction(new Test() + { + @Override + public Void run() + { + //set read and file permissions for folder + filePlanPermissionService.setPermission(folder, myUser, RMPermissionModel.FILING); + return null; + } + }); + doTestInTransaction(new Test() { @Override diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileReportActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileReportActionTest.java index 26c46eaab0..31ae795a76 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileReportActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileReportActionTest.java @@ -30,6 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.test.legacy.action; import org.alfresco.module.org_alfresco_module_rm.action.impl.FileReportAction; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.repo.content.MimetypeMap; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.repository.NodeRef; import org.apache.commons.lang.StringUtils; @@ -62,6 +63,8 @@ public class FileReportActionTest extends BaseRMTestCase private void fileReport(final String mimeType) { + AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser(); + // create record folder final NodeRef recordFolder = recordFolderService.createRecordFolder(rmContainer, GUID.generate()); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java index 54660ef58c..c77928b7a1 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java @@ -245,8 +245,15 @@ public class FileToActionTest extends BaseRMTestCase } }, ADMIN_USER); - // execute file-to action - rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); + doTestInTransaction(new Test() + { + public Void run() throws Exception + { + // execute file-to action + rmActionService.executeRecordsManagementAction(dmDocument, FileToAction.NAME, params); + return null; + } + }); doTestInTransaction(new Test() {