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-6930 review updates

Browse Source
This commit is contained in:
Sara Aspery
2019-11-18 01:25:34 +00:00
parent e0d96d3219
commit b2ae5242e9
2 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -578,7 +578,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
} }
catch (AccessDeniedException ade) catch (AccessDeniedException ade)
{ {
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_ERR_HOLD_PERMISSION_GENERIC_ERROR), ade); throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_HOLD_PERMISSION_GENERIC_ERROR), ade);
} }
} }
@@ -592,7 +592,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
sb.append(name); sb.append(name);
sb.append("'"); sb.append("'");
} }
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_ERR_HOLD_PERMISSION_DETAILED_ERROR) + sb.toString()); throw new AccessDeniedException(I18NUtil.getMessage(MSG_ERR_HOLD_PERMISSION_DETAILED_ERROR) + sb.toString());
} }
invokeBeforeDeleteHold(hold); invokeBeforeDeleteHold(hold);

78
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
View File

@@ -222,9 +222,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
when(mockedNodeService.createNode(eq(holdContainer), eq(ContentModel.ASSOC_CONTAINS), any(QName.class) , eq(TYPE_HOLD), any(Map.class))) when(mockedNodeService.createNode(eq(holdContainer), eq(ContentModel.ASSOC_CONTAINS), any(QName.class) , eq(TYPE_HOLD), any(Map.class)))
.thenReturn(new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, holdContainer, generateQName(), hold)); .thenReturn(new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, holdContainer, generateQName(), hold));
// mocks for policies mockPoliciesForCreateHold();
doNothing().when(holdService).invokeBeforeCreateHold(any(), anyString(), anyString());
doNothing().when(holdService).invokeOnCreateHold(any());
// create hold // create hold
NodeRef newHold = holdService.createHold(filePlan, HOLD_NAME, HOLD_REASON, HOLD_DESCRIPTION); NodeRef newHold = holdService.createHold(filePlan, HOLD_NAME, HOLD_REASON, HOLD_DESCRIPTION);
@@ -312,9 +310,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test @Test
public void deleteHold() public void deleteHold()
{ {
// mocks for policies mockPoliciesForDeleteHold();
doNothing().when(holdService).invokeBeforeDeleteHold(any());
doNothing().when(holdService).invokeOnDeleteHold(any(), any());
// delete hold // delete hold
holdService.deleteHold(hold); holdService.deleteHold(hold);
@@ -597,17 +593,14 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test (expected = AlfrescoRuntimeException.class) @Test (expected = AlfrescoRuntimeException.class)
public void testDeleteHoldThrowsExceptionForActiveContentWithoutReadPermission() public void testDeleteHoldThrowsExceptionForActiveContentWithoutReadPermission()
{ {
NodeRef holdNode = generateNodeRef(TYPE_HOLD);
NodeRef heldContent = generateNodeRef(TYPE_CONTENT); NodeRef heldContent = generateNodeRef(TYPE_CONTENT);
List<ChildAssociationRef> holds = new ArrayList<>(2); List<ChildAssociationRef> holds = createListOfHoldAssociations(heldContent);
holds.add(new ChildAssociationRef(ASSOC_FROZEN_CONTENT, holdNode, ASSOC_FROZEN_CONTENT, heldContent, true, 1));
when(mockedNodeService.getChildAssocs(holdNode, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds); when(mockedNodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds);
when(mockedRecordService.isRecord(heldContent)).thenReturn(false);
when(mockedRecordFolderService.isRecordFolder(heldContent)).thenReturn(false);
when(mockedPermissionService.hasPermission(heldContent, PermissionService.READ)).thenReturn(AccessStatus.DENIED); when(mockedPermissionService.hasPermission(heldContent, PermissionService.READ)).thenReturn(AccessStatus.DENIED);
when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo"); when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo");
holdService.deleteHold(holdNode); holdService.deleteHold(hold);
} }
/** /**
@@ -616,15 +609,13 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test (expected = AlfrescoRuntimeException.class) @Test (expected = AlfrescoRuntimeException.class)
public void testDeleteHoldThrowsExceptionForARecordWithoutReadPermission() public void testDeleteHoldThrowsExceptionForARecordWithoutReadPermission()
{ {
NodeRef holdNode = generateNodeRef(TYPE_HOLD);
NodeRef heldContent = generateNodeRef(); NodeRef heldContent = generateNodeRef();
List<ChildAssociationRef> holds = new ArrayList<>(2); List<ChildAssociationRef> holds = createListOfHoldAssociations(heldContent);
holds.add(new ChildAssociationRef(ASSOC_FROZEN_CONTENT, holdNode, ASSOC_FROZEN_CONTENT, heldContent, true, 1));
when(mockedNodeService.getChildAssocs(holdNode, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds); when(mockedNodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds);
when(mockedRecordService.isRecord(heldContent)).thenThrow(new AccessDeniedException("")); when(mockedRecordService.isRecord(heldContent)).thenThrow(new AccessDeniedException(""));
holdService.deleteHold(holdNode); holdService.deleteHold(hold);
} }
/** /**
@@ -633,16 +624,15 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test (expected = AlfrescoRuntimeException.class) @Test (expected = AlfrescoRuntimeException.class)
public void testDeleteHoldThrowsExceptionForARecordWithoutFilePermission() public void testDeleteHoldThrowsExceptionForARecordWithoutFilePermission()
{ {
NodeRef holdNode = generateNodeRef(TYPE_HOLD);
NodeRef heldContent = generateNodeRef(); NodeRef heldContent = generateNodeRef();
List<ChildAssociationRef> holds = new ArrayList<>(2); List<ChildAssociationRef> holds = createListOfHoldAssociations(heldContent);
holds.add(new ChildAssociationRef(ASSOC_FROZEN_CONTENT, holdNode, ASSOC_FROZEN_CONTENT, heldContent, true, 1));
when(mockedNodeService.getChildAssocs(holdNode, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds); when(mockedNodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds);
when(mockedRecordService.isRecord(heldContent)).thenReturn(true); when(mockedRecordService.isRecord(heldContent)).thenReturn(true);
when(mockedPermissionService.hasPermission(heldContent, RMPermissionModel.FILING)).thenReturn(AccessStatus.DENIED); when(mockedPermissionService.hasPermission(heldContent, RMPermissionModel.FILING)).thenReturn(AccessStatus.DENIED);
when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo"); when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo");
holdService.deleteHold(holdNode); holdService.deleteHold(hold);
} }
/** /**
@@ -651,19 +641,47 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test @Test
public void testDeleteHoldChecksReadPermissionForActiveContent() public void testDeleteHoldChecksReadPermissionForActiveContent()
{ {
NodeRef holdNode = generateNodeRef(TYPE_HOLD);
NodeRef heldContent = generateNodeRef(TYPE_CONTENT); NodeRef heldContent = generateNodeRef(TYPE_CONTENT);
List<ChildAssociationRef> holds = new ArrayList<>(2); List<ChildAssociationRef> holds = createListOfHoldAssociations(heldContent);
holds.add(new ChildAssociationRef(ASSOC_FROZEN_CONTENT, holdNode, ASSOC_FROZEN_CONTENT, heldContent, true, 1));
when(mockedNodeService.getChildAssocs(holdNode, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds); mockPoliciesForDeleteHold();
when(mockedNodeService.getChildAssocs(hold, ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL)).thenReturn(holds);
when(mockedRecordService.isRecord(heldContent)).thenReturn(false); when(mockedRecordService.isRecord(heldContent)).thenReturn(false);
when(mockedRecordFolderService.isRecordFolder(heldContent)).thenReturn(false); when(mockedRecordFolderService.isRecordFolder(heldContent)).thenReturn(false);
when(mockedPermissionService.hasPermission(heldContent, PermissionService.READ)).thenReturn(AccessStatus.ALLOWED); when(mockedPermissionService.hasPermission(heldContent, PermissionService.READ)).thenReturn(AccessStatus.ALLOWED);
when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo"); when(mockedNodeService.getProperty(heldContent, ContentModel.PROP_NAME)).thenReturn("foo");
holdService.deleteHold(holdNode); holdService.deleteHold(hold);
verify(mockedNodeService, times(1)).deleteNode(holdNode); verify(mockedNodeService, times(1)).deleteNode(hold);
}
/**
* Helper method to create hold and associations with given content
*/
private List<ChildAssociationRef> createListOfHoldAssociations(NodeRef heldContent)
{
List<ChildAssociationRef> holds = new ArrayList<>(2);
holds.add(new ChildAssociationRef(ASSOC_FROZEN_CONTENT, hold, ASSOC_FROZEN_CONTENT, heldContent, true, 1));
return holds;
}
/**
* mocks policies for create hold
*/
private void mockPoliciesForCreateHold()
{
doNothing().when(holdService).invokeBeforeCreateHold(any(), anyString(), anyString());
doNothing().when(holdService).invokeOnCreateHold(any());
}
/**
* mocks policies for delete hold
*/
private void mockPoliciesForDeleteHold()
{
doNothing().when(holdService).invokeBeforeDeleteHold(any());
doNothing().when(holdService).invokeOnDeleteHold(any(), any());
} }
/** /**