Use sequential multi instance in the JPA tests to avoid a potential r…

…ace condition
flowable · Jul 18, 2023 · 3f5005e · 3f5005e
1 parent d788659
commit 3f5005e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...-samples/flowable-spring-boot-sample-jpa-all/src/main/resources/processes/doge.bpmn20.xml b/...-samples/flowable-spring-boot-sample-jpa-all/src/main/resources/processes/doge.bpmn20.xml
@@ -3,7 +3,7 @@
     <process id="dogeProcess" name="DogeProcess" isExecutable="true">
         <startEvent id="startEvent1"></startEvent>
         <subProcess id="sid-1AA38D08-310B-4BFE-A6AD-F32488643000" name="subProcess">
-            <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="photos" flowable:elementVariable="photo"></multiInstanceLoopCharacteristics>
+            <multiInstanceLoopCharacteristics isSequential="true" flowable:collection="photos" flowable:elementVariable="photo"></multiInstanceLoopCharacteristics>
             <serviceTask id="sid-FCFA0F9D-8796-43E2-ACFD-13AF3465F929" name="Send to photo processing service" flowable:expression="${photoService.processPhoto(photo.id)}"></serviceTask>
             <startEvent id="sid-821438D0-CD00-43F1-A847-42112E44BA12"></startEvent>
             <receiveTask id="wait" name="Wait for completion"></receiveTask>

diff --git a/...g-boot-sample-jpa-all/src/test/java/org/flowable/test/spring/boot/JpaApplicationTest.java b/...g-boot-sample-jpa-all/src/test/java/org/flowable/test/spring/boot/JpaApplicationTest.java
@@ -93,10 +93,6 @@ public void photosArePersistedAsJpaEntities() {
 
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("dogeProcess", variables);
 
-        List<Execution> waitingExecutions = runtimeService.createExecutionQuery().activityId("wait").list();
-        assertThat(waitingExecutions)
-            .hasSize(2);
-
         Map<String, Object> processInstanceVariables = runtimeService.getVariables(processInstance.getId());
         assertThat(processInstanceVariables).containsOnlyKeys("photos");
         List<Photo> processPhotos = (List<Photo>) processInstanceVariables.get("photos");
@@ -107,11 +103,13 @@ public void photosArePersistedAsJpaEntities() {
                 "two"
             );
 
-        for (Execution waitingExecution : waitingExecutions) {
+        Execution waitingExecution = runtimeService.createExecutionQuery().activityId("wait").singleResult();
+        while (waitingExecution != null) {
             Photo executionPhoto = runtimeService.getVariable(waitingExecution.getId(), "photo", Photo.class);
             assertThat(executionPhoto).isNotNull();
             assertThat(executionPhoto.getLabel()).isIn("one", "two");
             runtimeService.trigger(waitingExecution.getId());
+            waitingExecution = runtimeService.createExecutionQuery().activityId("wait").singleResult();
         }
 
         Task reviewTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();