Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-7020_AllowUpdateOfPropertiesForSystemNamespaceURIRefactor

This commit is contained in:
Rodica Sutu
2019-11-05 11:37:56 +02:00
5 changed files with 564 additions and 219 deletions

View File

@@ -71,7 +71,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.invocation.InvocationOnMock;
@@ -340,6 +339,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test
public void addToHoldNotInHold()
{
mockPoliciesForAddToHold();
holdService.addToHold(hold, recordFolder);
verify(mockedNodeService).addChild(hold, recordFolder, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_CONTENT);
@@ -387,6 +388,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_FROZEN);
doReturn(true).when(mockedNodeService).hasAspect(activeContent, ASPECT_FROZEN);
mockPoliciesForAddToHold();
holdService.addToHold(hold, recordFolder);
verify(mockedNodeService).addChild(hold, recordFolder, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_CONTENT);
@@ -448,6 +451,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
}).when(mockedNodeService).addAspect(any(NodeRef.class), eq(ASPECT_FROZEN), any(Map.class));
mockPoliciesForAddToHold();
// build a list of holds
List<NodeRef> holds = new ArrayList<>(2);
holds.add(hold);
@@ -473,6 +478,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
@Test
public void removeFromHoldNotInHold()
{
mockPoliciesForRemoveFromHold();
holdService.removeFromHold(hold, recordFolder);
verify(mockedNodeService, never()).removeChild(hold, recordFolder);
@@ -488,6 +495,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
doReturn(true).when(mockedNodeService).hasAspect(recordFolder, ASPECT_FROZEN);
doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_FROZEN);
mockPoliciesForRemoveFromHold();
holdService.removeFromHold(hold, recordFolder);
verify(mockedNodeService, times(1)).removeChild(hold, recordFolder);
@@ -504,6 +513,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
doReturn(true).when(mockedNodeService).hasAspect(recordFolder, ASPECT_FROZEN);
doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_FROZEN);
mockPoliciesForRemoveFromHold();
// build a list of holds
List<NodeRef> holds = new ArrayList<>(2);
holds.add(hold);
@@ -536,6 +547,8 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
}).when(mockedNodeService).removeChild(hold, recordFolder);
mockPoliciesForRemoveFromHold();
doAnswer(new Answer<Void>()
{
public Void answer(InvocationOnMock invocation)
@@ -576,4 +589,22 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
holds.add(hold2);
holdService.removeFromHolds(holds, activeContent);
}
/**
* mocks policies for add to hold
*/
private void mockPoliciesForAddToHold()
{
doNothing().when(holdService).invokeBeforeAddToHold(any(), any());
doNothing().when(holdService).invokeOnAddToHold(any(), any());
}
/**
* mocks policies for remove from hold
*/
private void mockPoliciesForRemoveFromHold()
{
doNothing().when(holdService).invokeBeforeRemoveFromHold(any(), any());
doNothing().when(holdService).invokeOnRemoveFromHold(any(), any());
}
}