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

APPS-659 [Upgrade] Search Result points to incorrect link to Folder on Hold

Browse Source 
--fixed test
This commit is contained in:
estan
2021-01-25 10:20:58 +02:00
parent b8b1e47354
commit 2e568c1328
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- RM v3.4 Patches -->
<!-- RM v3.5 Patches -->
<bean id="rm.holdChildAssocPatch"
parent="rm.parentModulePatch"

69
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatchUnitTest.java
View File

@@ -27,11 +27,16 @@
package org.alfresco.module.org_alfresco_module_rm.patch.v35;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyMap;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -42,6 +47,7 @@ import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
@@ -56,16 +62,16 @@ import org.mockito.MockitoAnnotations;
public class RMv35HoldNewChildAssocPatchUnitTest
{
@Mock
private FilePlanService filePlanService;
private FilePlanService mockFilePlanService;
@Mock
private HoldService holdService;
private HoldService mockHoldService;
@Mock
private NodeService nodeService;
private NodeService mockNodeService;
@Mock
private BehaviourFilter behaviourFilter;
private BehaviourFilter mockBehaviourFilter;
@InjectMocks
private RMv35HoldNewChildAssocPatch patch;
@@ -100,34 +106,53 @@ public class RMv35HoldNewChildAssocPatchUnitTest
@Test
public void testAHoldIsRemovedAndReplacedDuringUpgrade()
{
when(filePlanService.getFilePlans()).thenReturn(fileplans);
when(holdService.getHolds(filePlanRef)).thenReturn(holds);
when(mockFilePlanService.getFilePlans()).thenReturn(fileplans);
when(mockHoldService.getHolds(filePlanRef)).thenReturn(holds);
when(childAssociationRef.getChildRef()).thenReturn(heldItemRef);
when(nodeService.getChildAssocs(holdRef)).thenReturn(childAssocs);
when(mockNodeService.getChildAssocs(holdRef)).thenReturn(childAssocs);
patch.applyInternal();
verify(holdService, times(1)).removeFromHold(holdRef, heldItemRef);
verify(holdService, times(1)).addToHold(holdRef, heldItemRef);
verify(mockHoldService, times(1)).removeFromHold(holdRef, heldItemRef);
verify(mockHoldService, times(1)).addToHold(holdRef, heldItemRef);
}
@Test
public void patchRunWithSuccessWhenNoHoldEntries()
public void patchRunWithSuccessWhenNoHoldChilds()
{
List<NodeRef> holdList = new ArrayList<>();
holdList.add(holdRef);
when(childAssociationRef.getChildRef()).thenReturn(heldItemRef);
when(mockNodeService.getChildAssocs(holdRef)).thenReturn(new ArrayList<>());
patch.applyInternal();
verify(mockHoldService, times(0)).removeFromHold(holdRef, heldItemRef);
verify(mockHoldService, times(0)).addToHold(holdRef, heldItemRef);
}
@Test
public void patchRunWithSuccessWhenNoHolds()
{
//no holds
List<NodeRef> holdList = new ArrayList<>();
when(filePlanService.getFilePlans()).thenReturn(fileplans);
when(holdService.getHolds(filePlanRef)).thenReturn(holdList);
verify(holdService, times(0)).removeFromHold(holdRef, heldItemRef);
verify(holdService, times(0)).addToHold(holdRef, heldItemRef);
//child assocs
holdList.add(holdRef);
when(childAssociationRef.getChildRef()).thenReturn(heldItemRef);
when(nodeService.getChildAssocs(holdRef)).thenReturn(new ArrayList<>());
when(mockFilePlanService.getFilePlans()).thenReturn(fileplans);
when(mockHoldService.getHolds(filePlanRef)).thenReturn(holdList);
patch.applyInternal();
verify(holdService, times(0)).removeFromHold(holdRef, heldItemRef);
verify(holdService, times(0)).addToHold(holdRef, heldItemRef);
verify(mockHoldService, times(0)).removeFromHold(holdRef, heldItemRef);
verify(mockHoldService, times(0)).addToHold(holdRef, heldItemRef);
}
@Test
public void patchRunWithSuccessWhenNoFilePlan()
{
// given
doReturn(Collections.EMPTY_SET).when(mockFilePlanService).getFilePlans();
// when
patch.applyInternal();
// then
verifyZeroInteractions(mockHoldService);
verify(mockNodeService, times(0)).addAspect(any(NodeRef.class), any(QName.class), anyMap());
}
}