Fix code for running trigger task on demand

This should improve the stability of TestStrings.
Evolveum · May 11, 2021 · ac45fc1 · ac45fc1
1 parent 833cece
commit ac45fc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -5632,14 +5632,16 @@ protected List<AuditEventRecord> filter(List<AuditEventRecord> records, AuditEve
                 .collect(Collectors.toList());
     }
 
-    protected void resetTriggerTask(String taskOid, File taskFile, OperationResult result)
+    // Use this when you want to start the task manually.
+    protected void clearTaskSchedule(String taskOid, File taskFile, OperationResult result)
             throws ObjectNotFoundException, SchemaException, ObjectAlreadyExistsException, FileNotFoundException {
         taskManager.suspendAndDeleteTasks(Collections.singletonList(taskOid), 60000L, true, result);
         importObjectFromFile(taskFile, result);
         taskManager.suspendTasks(Collections.singletonList(taskOid), 60000L, result);
         modifySystemObjectInRepo(TaskType.class, taskOid,
                 prismContext.deltaFor(TaskType.class)
                         .item(TaskType.F_SCHEDULE).replace()
+                        .item(TaskType.F_BINDING).replace(TaskBindingType.LOOSE) // tightly-bound tasks must have interval set
                         .asItemDeltas(),
                 result);
         taskManager.resumeTasks(singleton(taskOid), result);

diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestEscalation.java
@@ -187,7 +187,7 @@ public void test200CreateE2ApprovalCase() throws Exception {
         OperationResult result = getTestOperationResult();
 
         clock.resetOverride();
-        resetTriggerTask(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, result);
+        clearTaskSchedule(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, result);
 
         // WHEN
         assignRole(userJackOid, ROLE_E2_OID, task, result);                // should start approval process

diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
@@ -135,7 +135,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         transplantGlobalPolicyRulesAdd(CONFIG_WITH_GLOBAL_RULES_FILE, initTask, initResult);
 
         // we prefer running trigger scanner by hand
-        resetTriggerTask(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, initResult);
+        clearTaskSchedule(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, initResult);
         // and we don't need validity scanner
         taskManager.suspendAndDeleteTasks(Collections.singletonList(TASK_VALIDITY_SCANNER_OID), 60000L, true, initResult);
 
@@ -843,7 +843,7 @@ public void test208SixDaysLater() throws Exception {
 
         // GIVEN
         clock.resetOverride();
-        resetTriggerTask(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, result);
+        clearTaskSchedule(TASK_TRIGGER_SCANNER_OID, TASK_TRIGGER_SCANNER_FILE, result);
         clock.overrideDuration("P6D");
 
         // WHEN