Fix issue with condition extension elements

flowable · Nov 20, 2023 · f2656ac · f2656ac
1 parent ac508d9
commit f2656ac
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/...wable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/child/ConditionParser.java b/...wable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/child/ConditionParser.java
@@ -36,4 +36,9 @@ public void parseChildElement(XMLStreamReader xtr, BaseElement parentElement, Bp
 
         ((ConditionalEventDefinition) parentElement).setConditionExpression(xtr.getElementText().trim());
     }
+
+    @Override
+    public boolean accepts(BaseElement element) {
+        return element instanceof ConditionalEventDefinition;
+    }
 }
diff --git a/...pmn-converter/src/test/java/org/flowable/editor/language/xml/ExtensionsConverterTest.java b/...pmn-converter/src/test/java/org/flowable/editor/language/xml/ExtensionsConverterTest.java
@@ -19,6 +19,7 @@
 import org.flowable.bpmn.model.BpmnModel;
 import org.flowable.bpmn.model.ExtensionElement;
 import org.flowable.bpmn.model.FlowElement;
+import org.flowable.bpmn.model.SequenceFlow;
 import org.flowable.editor.language.xml.util.BpmnXmlConverterTest;
 import org.flowable.editor.language.xml.util.ConversionDirection;
 
@@ -32,6 +33,18 @@ void validateModel(BpmnModel bpmnModel) {
         FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement("theTask");
         List<ExtensionElement> extensionElements = flowElement.getExtensionElements().get("test");
         assertThat(extensionElements).hasSize(1);
+
+        SequenceFlow sequenceFlow = (SequenceFlow) bpmnModel.getMainProcess().getFlowElement("flow1");
+        assertThat(sequenceFlow.getExtensionElements()).hasSize(2);
+
+        List<ExtensionElement> myElements = sequenceFlow.getExtensionElements().get("condition");
+        assertThat(myElements).hasSize(1);
+        ExtensionElement myElement = myElements.get(0);
+        assertThat(myElement.getAttributeValue(null, "name")).isEqualTo("test");
+        myElements = myElement.getChildElements().get("condition");
+        assertThat(myElements).hasSize(1);
+        myElement = myElements.get(0);
+        assertThat(myElement.getAttributeValue(null, "ref")).isEqualTo("test");
     }
 
     // We are only converting one direction since the XML location changes when we do it both ways

diff --git a/modules/flowable-bpmn-converter/src/test/resources/extensions.bpmn20.xml b/modules/flowable-bpmn-converter/src/test/resources/extensions.bpmn20.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:flowable="http://flowable.org/bpmn" 
     xmlns:custom="http://custom.org/bpmn"
     targetNamespace="ExamplesCategory">
     <process id="oneTaskProcess">
+        <extensionElements>
+            <custom:test name="test">test</custom:test>
+        </extensionElements>
         <startEvent id="theStart" />
-        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="theTask" />
+        <sequenceFlow id="flow1" sourceRef="theStart" targetRef="theTask">
+            <extensionElements>
+                <flowable:condition name="test">
+                    <flowable:condition ref="test"></flowable:condition>
+                </flowable:condition>
+                <custom:test name="test"><![CDATA[test]]></custom:test>
+            </extensionElements>
+            <conditionExpression xsi:type="tFormalExpression"><![CDATA[${test}]]></conditionExpression>
+        </sequenceFlow>
         <userTask id="theTask" name="my task">
             <extensionElements>
-                <custom:test name="test" />
+                <custom:test name="test"></custom:test>
             </extensionElements>
         </userTask>
         <sequenceFlow id="flow2" sourceRef="theTask" targetRef="theEnd" />