More test stabilizations

flowable · Aug 17, 2021 · 8054e6d · 8054e6d
1 parent e156ddc
commit 8054e6d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/...wable/cmmn/test/itemcontrol/PlanItemRepetitionWithCollectionVariableAndConditionTest.java b/...wable/cmmn/test/itemcontrol/PlanItemRepetitionWithCollectionVariableAndConditionTest.java
@@ -161,6 +161,8 @@ public void testRepetitionOnCollectionTriggeredByUserTask() {
     public void testRepetitionOnCollectionTriggeredByUserTaskSeveralTimes() {
         CaseInstance caseInstance = cmmnRuntimeService.createCaseInstanceBuilder().caseDefinitionKey("repetitionWithCollectionVariableTestTwo").start();
 
+        waitForAsyncHistoryExecutorToProcessAllJobs();
+
         List<PlanItemInstance> planItemInstances = getPlanItemInstances(caseInstance.getId());
         assertThat(planItemInstances).hasSize(3);
         assertPlanItemInstanceState(planItemInstances, "Task A", ACTIVE);
@@ -170,13 +172,17 @@ public void testRepetitionOnCollectionTriggeredByUserTaskSeveralTimes() {
         // enable the condition on Task B upfront -> nothing yet to happen
         cmmnRuntimeService.setVariable(caseInstance.getId(), "enableTaskB", true);
 
+        waitForAsyncHistoryExecutorToProcessAllJobs();
+
         List<String> taskOutputList = Arrays.asList("A", "B", "C", "D");
 
         // complete Task A by providing the collection used for repetition
         cmmnRuntimeService.createPlanItemInstanceTransitionBuilder(getPlanItemInstanceIdByNameAndState(planItemInstances, "Task A", ACTIVE))
                 .variable("taskOutputList", taskOutputList)
                 .trigger();
 
+        waitForAsyncHistoryExecutorToProcessAllJobs();
+
         // now we need to have 4 instances of Task B with adequate local variables
         planItemInstances = getPlanItemInstances(caseInstance.getId());
         assertThat(planItemInstances).hasSize(7);
@@ -201,6 +207,8 @@ public void testRepetitionOnCollectionTriggeredByUserTaskSeveralTimes() {
                 .variable("taskOutputList", taskOutputList)
                 .trigger();
 
+        waitForAsyncHistoryExecutorToProcessAllJobs();
+
         planItemInstances = getPlanItemInstances(caseInstance.getId());
         assertThat(planItemInstances).hasSize(5);
         assertPlanItemInstanceState(planItemInstances, "Task A", ACTIVE);

diff --git a/...test/java/org/flowable/cmmn/test/runtime/TerminateChildPlanItemsOnAutoCompletionTest.java b/...test/java/org/flowable/cmmn/test/runtime/TerminateChildPlanItemsOnAutoCompletionTest.java
@@ -132,14 +132,20 @@ public void terminateChildPlanItemsOnStageAndCaseCompletionTest() {
                 .caseDefinitionKey("caseAndStageCompletionWithChildItemsTest")
                 .start();
 
+            waitForAsyncHistoryExecutorToProcessAllJobs();
+
             List<PlanItemInstance> planItemInstances = getPlanItemInstances(caseInstance.getId());
             assertThat(planItemInstances).hasSize(8);
             assertPlanItemInstanceState(planItemInstances, "Task A", ACTIVE);
             cmmnRuntimeService.triggerPlanItemInstance(getPlanItemInstanceIdByName(planItemInstances, "Task A"));
 
+            waitForAsyncHistoryExecutorToProcessAllJobs();
+
             assertPlanItemInstanceState(planItemInstances, "Ignore after first completion stage task", ACTIVE);
             cmmnRuntimeService.triggerPlanItemInstance(getPlanItemInstanceIdByName(planItemInstances, "Ignore after first completion stage task"));
 
+            waitForAsyncHistoryExecutorToProcessAllJobs();
+
             planItemInstances = getPlanItemInstances(caseInstance.getId());
             assertPlanItemInstanceState(planItemInstances, "Ignore after first completion task", ACTIVE);
             cmmnRuntimeService.triggerPlanItemInstance(getPlanItemInstanceIdByName(planItemInstances, "Ignore after first completion task"));

diff --git a/...-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java b/...-engine/src/test/java/org/flowable/engine/test/api/history/HistoryServiceTaskLogTest.java
@@ -431,6 +431,8 @@ public void createCustomTaskEventLog() {
     public void createCustomTaskEventLog_taskIdIsEnoughToCreateTaskLogEntry() {
         task = taskService.createTaskBuilder().create();
 
+        waitForHistoryJobExecutorToProcessAllJobs(20000, 200);
+
         HistoricTaskLogEntryBuilder historicTaskLogEntryBuilder = historyService.createHistoricTaskLogEntryBuilder(task);
         historicTaskLogEntryBuilder.create();
 
@@ -1043,8 +1045,11 @@ public void queryForTaskLogOrderBy() {
 
         HistoricTaskLogEntryBuilder historicTaskLogEntryBuilder = historyService.createHistoricTaskLogEntryBuilder();
         historicTaskLogEntryBuilder.taskId("1").timeStamp(getInsertDate()).create();
+        waitForHistoryJobExecutorToProcessAllJobs(20000, 200);
         historicTaskLogEntryBuilder.taskId("2").timeStamp(getCompareAfterDate()).create();
+        waitForHistoryJobExecutorToProcessAllJobs(20000, 200);
         historicTaskLogEntryBuilder.taskId("3").timeStamp(getCompareBeforeDate()).create();
+        waitForHistoryJobExecutorToProcessAllJobs(20000, 200);
 
         try {