Use Clock in DefaultHistoryCleaningManager and DefaultCmmnHistoryCleaningManager (#4091)

Author: amporsim

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/DefaultCmmnHistoryCleaningManager.java

@@ -48,7 +48,7 @@ public BatchQuery createBatchCleaningQuery() {
 
     protected Date getEndedBefore() {
         Duration endedAfterDuration = cmmnEngineConfiguration.getCleanInstancesEndedAfter();
-        Instant endedBefore = Instant.now().minus(endedAfterDuration);
+        Instant endedBefore = cmmnEngineConfiguration.getClock().getCurrentTime().toInstant().minus(endedAfterDuration);
         return Date.from(endedBefore);
     }
 }

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/history/HistoricDataEngineDeleteTest.java

@@ -139,6 +139,8 @@ public void testHistoryCleanupTimerJob() {
                             });
                 }
 
+                cmmnEngineConfiguration.resetClock();
+
                 assertThat(cmmnManagementService.createTimerJobQuery().handlerType(CmmnHistoryCleanupJobHandler.TYPE).count()).isEqualTo(1);
 
                 Job executableJob = cmmnManagementService.moveTimerToExecutableJob(

modules/flowable-engine/src/main/java/org/flowable/engine/DefaultHistoryCleaningManager.java

@@ -45,7 +45,7 @@ public BatchQuery createBatchCleaningQuery() {
 
     protected Date getEndedBefore() {
         Duration endedAfterDuration = processEngineConfiguration.getCleanInstancesEndedAfter();
-        Instant endedBefore = Instant.now().minus(endedAfterDuration);
+        Instant endedBefore = processEngineConfiguration.getClock().getCurrentTime().toInstant().minus(endedAfterDuration);
         return Date.from(endedBefore);
     }
 }

modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataDeleteTest.java

@@ -980,7 +980,9 @@ public void testHistoryCleanupTimerJob() {
                 if (processEngineConfiguration.isAsyncHistoryEnabled()) {
                     waitForHistoryJobExecutorToProcessAllJobs(7000, 300);
                 }
-                        
+
+                processEngineConfiguration.resetClock();
+
                 managementService.handleHistoryCleanupTimerJob();
 
                 assertThat(managementService.createTimerJobQuery().handlerType(BpmnHistoryCleanupJobHandler.TYPE).count()).isEqualTo(1);

modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/HistoricDataEngineDeleteTest.java

@@ -142,6 +142,7 @@ public void testHistoryCleanupTimerJob() {
 
                 assertThat(managementService.createTimerJobQuery().handlerType(BpmnHistoryCleanupJobHandler.TYPE).count()).isEqualTo(1);
 
+                processEngineConfiguration.getClock().reset();
                 Job executableJob = managementService.moveTimerToExecutableJob(managementService.createTimerJobQuery().handlerType(BpmnHistoryCleanupJobHandler.TYPE).singleResult().getId());
                 managementService.executeJob(executableJob.getId());