Merge pull request #444 from sartography/bugfix/loop-condition

reverse loop condition check

Author: essweine

SpiffWorkflow/bpmn/specs/mixins/multiinstance_task.py

@@ -83,7 +83,7 @@ def merge_child(self, workflow, child):
     def loop_complete(self, my_task):
         merged = my_task.internal_data.get('merged', [])
         max_complete = self.maximum is not None and len(merged) >= self.maximum
-        cond_complete = self.condition is not None and my_task.workflow.script_engine.evaluate(my_task, self.condition)
+        cond_complete = self.condition is not None and not my_task.workflow.script_engine.evaluate(my_task, self.condition)
         return max_complete or cond_complete
 
 
@@ -350,4 +350,4 @@ def create_children(self, my_task):
             self.create_child(my_task, item, key_or_index)
 
     def children_complete(self, my_task):
-        return all(c.state == TaskState.COMPLETED for c in self._instances(my_task))
+        return all(c.state == TaskState.COMPLETED for c in self._instances(my_task))

tests/SpiffWorkflow/bpmn/data/standard_loop.bpmn

@@ -8,7 +8,7 @@
       <bpmn:incoming>Flow_0m77cxj</bpmn:incoming>
       <bpmn:outgoing>Flow_1jbp2el</bpmn:outgoing>
       <bpmn:standardLoopCharacteristics testBefore="true" loopMaximum="3">
-        <bpmn:loopCondition>done</bpmn:loopCondition>
+        <bpmn:loopCondition>not done</bpmn:loopCondition>
       </bpmn:standardLoopCharacteristics>
     </bpmn:task>
     <bpmn:sequenceFlow id="Flow_0m77cxj" sourceRef="StartEvent_1" targetRef="any_task" />