From 162264a8d786e1b25831076dfaa5319b88e8415e Mon Sep 17 00:00:00 2001 From: pjoshi31 Date: Mon, 7 Nov 2022 18:32:17 +0530 Subject: [PATCH] [MNT-22353]- Added UnitTest Changes. --- .../job/DispositionLifecycleJobExecuter.java | 9 +++++++-- .../job/DispositionLifecycleJobExecuterUnitTest.java | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d98f5e0340..69db66dabb 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -214,8 +214,13 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute // execute search ResultSet results = searchService.query(params); - // filtering out the hold/freezed cases from the result set - resultNodes = results.getNodeRefs().stream().filter(node -> !freezeService.isFrozenOrHasFrozenChildren(node)).collect(Collectors.toList()); + if(results != null) { + // filtering out the hold/freezed cases from the result set + resultNodes = + results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ? + !freezeService.isFrozenOrHasFrozenChildren(node) : + !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList()); + } hasMore = results.hasMore(); skipCount += resultNodes.size(); // increase by page size results.close(); diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java index fa5df76e58..027610f97d 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java @@ -170,7 +170,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest executer.executeImpl(); // then - + verify(mockedNodeService, times(2)).getPrimaryParent(any(NodeRef.class)); // ensure the query is executed and closed verifyQueryTimes(2); @@ -206,7 +206,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest executer.executeImpl(); // then - + verify(mockedNodeService, times(1)).getPrimaryParent(any(NodeRef.class)); // ensure the query is executed and closed verifyQueryTimes(1); @@ -262,11 +262,11 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // ensure each node is process correctly // node1 verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION); - verify(mockedNodeService, times(1)).getPrimaryParent(node1); + verify(mockedNodeService, times(3)).getPrimaryParent(node1); verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(CUTOFF), anyMap()); // node2 verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION); - verify(mockedNodeService, times(1)).getPrimaryParent(node2); + verify(mockedNodeService, times(3)).getPrimaryParent(node2); verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(RETAIN), anyMap()); // ensure no more interactions @@ -329,7 +329,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest // call the service executer.executeImpl(); - // check the loop iterated trough all the elements + // check the loop iterated through all the elements verify(mockedNodeService).exists(node1); verify(mockedNodeService).exists(node2); verify(mockedNodeService).exists(node3);