From b36b4e31cb15d4c2cbe7fd5d7c004f783553f6ca Mon Sep 17 00:00:00 2001 From: cagache Date: Mon, 11 Nov 2019 11:21:28 +0200 Subject: [PATCH] Code review comments --- .../community/audit/AuditAddToHoldTests.java | 14 ++++++------ .../community/audit/AuditDeleteHoldTests.java | 22 ------------------- .../audit/AuditRemoveFromHoldTests.java | 15 ++++++------- 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditAddToHoldTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditAddToHoldTests.java index dda74deebb..550e53c78a 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditAddToHoldTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditAddToHoldTests.java @@ -85,7 +85,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest @Autowired private RoleService roleService; - private UserModel rmAdmin, rmManagerNoRightsOnHold, rmManagerNoRightsOnNode; + private UserModel rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode; private SiteModel privateSite; private RecordCategory recordCategory; private RecordCategoryChild recordFolder; @@ -112,9 +112,9 @@ public class AuditAddToHoldTests extends BaseRMRestTest privateSite = dataSite.usingUser(rmAdmin).createPrivateRandomSite(); STEP("Create users without rights to add content to a hold."); - rmManagerNoRightsOnHold = roleService.createUserWithSiteRoleRMRoleAndPermission(privateSite, + rmManagerNoReadOnHold = roleService.createUserWithSiteRoleRMRoleAndPermission(privateSite, UserRole.SiteManager, recordCategory.getId(), UserRoles.ROLE_RM_MANAGER, UserPermissions.PERMISSION_FILING); - rmManagerNoRightsOnNode = roleService.createUserWithRMRoleAndRMNodePermission(UserRoles.ROLE_RM_MANAGER.roleId, + rmManagerNoReadOnNode = roleService.createUserWithRMRoleAndRMNodePermission(UserRoles.ROLE_RM_MANAGER.roleId, hold1NodeRef, UserPermissions.PERMISSION_FILING); } @@ -153,8 +153,8 @@ public class AuditAddToHoldTests extends BaseRMRestTest { return new UserModel[][] { - { rmManagerNoRightsOnHold }, - { rmManagerNoRightsOnNode } + { rmManagerNoReadOnHold }, + { rmManagerNoReadOnNode } }; } @@ -195,7 +195,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest rmAuditService.clearAuditLog(); STEP("Try to add the record to a hold by an user with no rights."); - holdsAPI.addItemsToHolds(rmManagerNoRightsOnHold.getUsername(), rmManagerNoRightsOnHold.getPassword(), + holdsAPI.addItemsToHolds(rmManagerNoReadOnHold.getUsername(), rmManagerNoReadOnHold.getPassword(), SC_INTERNAL_SERVER_ERROR, Collections.singletonList(recordToBeAdded.getId()), Collections.singletonList(hold1NodeRef)); @@ -284,7 +284,7 @@ public class AuditAddToHoldTests extends BaseRMRestTest { holdsList.forEach(hold -> holdsAPI.deleteHold(getAdminUser().getUsername(), getAdminUser().getPassword(), hold)); dataSite.usingAdmin().deleteSite(privateSite); - asList(rmAdmin, rmManagerNoRightsOnHold, rmManagerNoRightsOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user)); + asList(rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user)); getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(recordCategory.getId()); } } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditDeleteHoldTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditDeleteHoldTests.java index b22a71b215..1118f66599 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditDeleteHoldTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditDeleteHoldTests.java @@ -130,28 +130,6 @@ public class AuditDeleteHoldTests extends BaseRMRestTest rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), DELETE_HOLD).isEmpty()); } - /** - * Given a hold is deleted - * When I view the audit log as an user with no Read permissions over the deleted hold - * Then the delete hold entry isn't visible - */ - @Test - public void deleteHoldAuditEntryNotVisible() - { - STEP("Create a new hold."); - String holdRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD2, HOLD_REASON, - HOLD_DESCRIPTION); - - rmAuditService.clearAuditLog(); - - STEP("Delete the created hold."); - holdsAPI.deleteHold(rmAdmin, holdRef); - - STEP("Check that an user with no Read permissions over the hold can't see the entry for the delete hold event."); - assertTrue("The list of events should not contain Delete Hold entry ", - rmAuditService.getAuditEntriesFilteredByEvent(rmManager, DELETE_HOLD).isEmpty()); - } - @AfterClass (alwaysRun = true) public void cleanUpAuditDeleteHoldTests() { diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditRemoveFromHoldTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditRemoveFromHoldTests.java index f56f880b45..dea12fe9b0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditRemoveFromHoldTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditRemoveFromHoldTests.java @@ -87,7 +87,7 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest @Autowired private RoleService roleService; - private UserModel rmAdmin, rmManagerNoRightsOnHold, rmManagerNoRightsOnNode; + private UserModel rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode; private SiteModel privateSite; private RecordCategory recordCategory; private RecordCategoryChild recordFolder, heldRecordFolder; @@ -128,9 +128,9 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest holdsList); STEP("Create users without rights to remove content from a hold."); - rmManagerNoRightsOnHold = roleService.createUserWithSiteRoleRMRoleAndPermission(privateSite, + rmManagerNoReadOnHold = roleService.createUserWithSiteRoleRMRoleAndPermission(privateSite, UserRole.SiteManager, recordCategory.getId(), UserRoles.ROLE_RM_MANAGER, UserPermissions.PERMISSION_FILING); - rmManagerNoRightsOnNode = roleService.createUserWithRMRoleAndRMNodePermission(UserRoles.ROLE_RM_MANAGER.roleId, + rmManagerNoReadOnNode = roleService.createUserWithRMRoleAndRMNodePermission(UserRoles.ROLE_RM_MANAGER.roleId, hold1NodeRef, UserPermissions.PERMISSION_FILING); } @@ -138,7 +138,6 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest * Data provider with valid nodes that can be removed from a hold * * @return the node id and the node name - * @throws Exception */ @DataProvider (name = "validNodesForRemoveFromHold") public Object[][] getValidNodesForRemoveFromHold() @@ -164,8 +163,8 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest { return new UserModel[][] { - { rmManagerNoRightsOnHold }, - { rmManagerNoRightsOnNode } + { rmManagerNoReadOnHold }, + { rmManagerNoReadOnNode } }; } @@ -226,7 +225,7 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest rmAuditService.clearAuditLog(); STEP("Try to remove the record from a hold by an user with no rights."); - holdsAPI.removeItemsFromHolds(rmManagerNoRightsOnHold.getUsername(), rmManagerNoRightsOnHold.getPassword(), + holdsAPI.removeItemsFromHolds(rmManagerNoReadOnHold.getUsername(), rmManagerNoReadOnHold.getPassword(), SC_INTERNAL_SERVER_ERROR, Collections.singletonList(heldRecord.getId()), Collections.singletonList(hold1NodeRef)); @@ -315,7 +314,7 @@ public class AuditRemoveFromHoldTests extends BaseRMRestTest { holdsList.forEach(hold -> holdsAPI.deleteHold(getAdminUser().getUsername(), getAdminUser().getPassword(), hold)); dataSite.usingAdmin().deleteSite(privateSite); - asList(rmAdmin, rmManagerNoRightsOnHold, rmManagerNoRightsOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user)); + asList(rmAdmin, rmManagerNoReadOnHold, rmManagerNoReadOnNode).forEach(user -> getDataUser().usingAdmin().deleteUser(user)); getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(recordCategory.getId()); } }