Unwrap variable instance list of values for contains element check

Activiti · Nov 16, 2024 · c725f8a · c725f8a
1 parent 6bf785a
commit c725f8a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...e-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/query/ProcessQuerySteps.java b/...e-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/query/ProcessQuerySteps.java
@@ -34,6 +34,7 @@
 import org.activiti.cloud.acc.shared.service.BaseService;
 import org.activiti.cloud.api.model.shared.CloudVariableInstance;
 import org.activiti.cloud.api.process.model.CloudProcessInstance;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.hateoas.PagedModel;
@@ -128,8 +129,12 @@ public void checkProcessInstanceHasVariableValue(
                         .stream()
                         .filter(it -> it.getName().equals(variableName))
                         .map(CloudVariableInstance::getValue)
-                        .toList()
+                        .map(value -> value instanceof List<?> listOfValues ? listOfValues : List.of(value))
+                        .findFirst()
                 )
+                    .isNotEmpty()
+                    .get()
+                    .asInstanceOf(InstanceOfAssertFactories.LIST)
                     .containsExactlyInAnyOrderElementsOf(
                         variableValue instanceof List<?> variableValues ? variableValues : List.of(variableValue)
                     );