From 1b8095a44291ff16263d710d94a92c45bd0483d8 Mon Sep 17 00:00:00 2001
From: jdotzki <joerg.dotzki@zalando.de>
Date: Fri, 4 Apr 2014 12:01:42 +0200
Subject: [PATCH] feat(bpmnrenderer): add support for DataCollectionObject

---
 lib/draw/BpmnRenderer.js                      |  22 +++
 test/fixtures/bpmn/data-objects.bpmn          | 108 ---------------
 test/fixtures/bpmn/render/data-objects.bpmn   | 126 ++++++++++++++++++
 .../bpmn/{simple => render}/events.bpmn       |   0
 test/fixtures/bpmn/simple/activities.bpmn     |  69 ----------
 test/fixtures/bpmn/simple/data-items.bpmn     |  41 ------
 test/fixtures/bpmn/simple/gateways.bpmn       |  41 ------
 7 files changed, 148 insertions(+), 259 deletions(-)
 delete mode 100644 test/fixtures/bpmn/data-objects.bpmn
 create mode 100644 test/fixtures/bpmn/render/data-objects.bpmn
 rename test/fixtures/bpmn/{simple => render}/events.bpmn (100%)
 delete mode 100644 test/fixtures/bpmn/simple/activities.bpmn
 delete mode 100644 test/fixtures/bpmn/simple/data-items.bpmn
 delete mode 100644 test/fixtures/bpmn/simple/gateways.bpmn

diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js
index e0e3c871..b7167d41 100644
--- a/lib/draw/BpmnRenderer.js
+++ b/lib/draw/BpmnRenderer.js
@@ -299,6 +299,13 @@ function BpmnRenderer(events, styles, bpmnRegistry) {
                              ' 0 0 9.8363 9.8036 0';
 
       var dataObject = drawPath(p, DATA_OBJECT_PATH);
+      if(getObjectRef(data.id, 'isCollection') === true) {
+        var COLLECTION_PATH = 'M  0 0 l 0 15 l 1 0 l  0 -15 z' +
+                              'M  6 0 l 0 15 l 1 0 l  0 -15 z' +
+                              'M 12 0 l 0 15 l 1 0 l  0 -15 z';
+        var collectionIcon = drawPath(p, COLLECTION_PATH);
+        collectionIcon.transform('translate(17.8,42.0)');
+      }
 
       return dataObject;
     },
@@ -380,6 +387,21 @@ function BpmnRenderer(events, styles, bpmnRegistry) {
     }
   }
 
+  /**
+   *
+   * @return {Object} returns a specified objectRef
+   */
+  function getObjectRef(id, refName) {
+    var semantic = bpmnRegistry.getSemantic(id);
+
+    if(!semantic || !semantic.dataObjectRef) {
+      return false;
+    }
+
+    return semantic.dataObjectRef[refName];
+  }
+
+
   // hook onto canvas init event to initialize
   // connection start/end markers on paper
   events.on('canvas.init', function(event) {
diff --git a/test/fixtures/bpmn/data-objects.bpmn b/test/fixtures/bpmn/data-objects.bpmn
deleted file mode 100644
index 0cc9625e..00000000
--- a/test/fixtures/bpmn/data-objects.bpmn
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
-  <bpmn:collaboration id="_Collaboration_4">
-    <bpmn:participant id="_Participant_4" name="Pool" processRef="Process_1"/>
-    <bpmn:participant id="Participant_1" name="Pool" processRef="Process_2"/>
-  </bpmn:collaboration>
-  <bpmn:process id="Process_1" isExecutable="false">
-    <bpmn:ioSpecification id="InputOutputSpecification_1">
-      <bpmn:dataInput id="DataInput_1"/>
-      <bpmn:dataOutput id="DataOutput_1"/>
-    </bpmn:ioSpecification>
-    <bpmn:dataObject id="DataObject_1" name="Data Object 1"/>
-    <bpmn:dataStoreReference id="_DataStoreReference_2" name="Data Store" dataStoreRef="DataStore_1"/>
-    <bpmn:task id="Task_1">
-      <bpmn:dataInputAssociation id="DataInputAssociation_3">
-        <bpmn:sourceRef>DataObjectReference_1</bpmn:sourceRef>
-      </bpmn:dataInputAssociation>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_1">
-        <bpmn:targetRef>_DataStoreReference_2</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_2">
-        <bpmn:targetRef>DataOutput_1</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_3">
-        <bpmn:targetRef>DataObjectReference_1</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-    </bpmn:task>
-    <bpmn:dataStoreReference id="_DataStoreReference_3" name="Data Store 2" dataStoreRef="DataStore_2"/>
-    <bpmn:dataObjectReference id="DataObjectReference_1" name="Data Object" dataObjectRef="DataObject_1"/>
-  </bpmn:process>
-  <bpmn:dataStore id="DataStore_1" name="Data Store 1"/>
-  <bpmn:dataStore id="DataStore_2" name="Data Store 2"/>
-  <bpmn:process id="Process_2" isExecutable="false">
-    <bpmn:task id="Task_2">
-      <bpmn:dataInputAssociation id="DataInputAssociation_1">
-        <bpmn:sourceRef>_DataStoreReference_2</bpmn:sourceRef>
-      </bpmn:dataInputAssociation>
-    </bpmn:task>
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="_Collaboration_4">
-      <bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_2" bpmnElement="DataObjectReference_1">
-        <dc:Bounds height="50.0" width="36.0" x="396.0" y="231.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="75.0" x="377.0" y="286.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataStoreReference_2" bpmnElement="_DataStoreReference_2">
-        <dc:Bounds height="50.0" width="50.0" x="762.0" y="72.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="68.0" x="753.0" y="127.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataInput_2" bpmnElement="DataInput_1">
-        <dc:Bounds height="50.0" width="36.0" x="355.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="373.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataOutput_2" bpmnElement="DataOutput_1">
-        <dc:Bounds height="50.0" width="36.0" x="480.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="498.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_11" bpmnElement="Task_1">
-        <dc:Bounds height="80.0" width="100.0" x="516.0" y="216.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Participant_4" bpmnElement="_Participant_4" isHorizontal="true">
-        <dc:Bounds height="277.0" width="529.0" x="132.0" y="60.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataStoreReference_3" bpmnElement="_DataStoreReference_3">
-        <dc:Bounds height="50.0" width="50.0" x="209.0" y="78.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="79.0" x="195.0" y="133.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_1" bpmnElement="DataOutputAssociation_1" sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataStoreReference_2">
-        <di:waypoint xsi:type="dc:Point" x="616.0" y="220.0"/>
-        <di:waypoint xsi:type="dc:Point" x="762.0" y="115.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="_BPMNShape_Participant_5" bpmnElement="Participant_1" isHorizontal="true">
-        <dc:Bounds height="165.0" width="600.0" x="888.0" y="28.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Task_12" bpmnElement="Task_2">
-        <dc:Bounds height="80.0" width="100.0" x="1029.0" y="68.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation_1" bpmnElement="DataInputAssociation_1" sourceElement="_BPMNShape_DataStoreReference_2" targetElement="_BPMNShape_Task_12">
-        <di:waypoint xsi:type="dc:Point" x="812.0" y="98.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1029.0" y="106.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_2" bpmnElement="DataOutputAssociation_2" sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataOutput_2">
-        <di:waypoint xsi:type="dc:Point" x="547.0" y="216.0"/>
-        <di:waypoint xsi:type="dc:Point" x="510.0" y="134.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation_3" bpmnElement="DataInputAssociation_3" sourceElement="_BPMNShape_DataObjectReference_2" targetElement="_BPMNShape_Task_11">
-        <di:waypoint xsi:type="dc:Point" x="432.0" y="244.0"/>
-        <di:waypoint xsi:type="dc:Point" x="478.0" y="215.0"/>
-        <di:waypoint xsi:type="dc:Point" x="516.0" y="233.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_3" bpmnElement="DataOutputAssociation_3" sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataObjectReference_2">
-        <di:waypoint xsi:type="dc:Point" x="516.0" y="277.0"/>
-        <di:waypoint xsi:type="dc:Point" x="471.0" y="296.0"/>
-        <di:waypoint xsi:type="dc:Point" x="432.0" y="269.0"/>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/render/data-objects.bpmn b/test/fixtures/bpmn/render/data-objects.bpmn
new file mode 100644
index 00000000..973e5646
--- /dev/null
+++ b/test/fixtures/bpmn/render/data-objects.bpmn
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+                  xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+                  xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+                  xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram"
+                  targetNamespace="http://bpmn.io/schema/bpmn">
+    <bpmn:collaboration id="_Collaboration_4">
+        <bpmn:participant id="_Participant_4" name="Pool" processRef="Process_1"/>
+        <bpmn:participant id="Participant_1" name="Pool" processRef="Process_2"/>
+    </bpmn:collaboration>
+    <bpmn:process id="Process_1" isExecutable="false">
+        <bpmn:ioSpecification id="InputOutputSpecification_1">
+            <bpmn:dataInput id="DataInput_1"/>
+            <bpmn:dataOutput id="DataOutput_1"/>
+        </bpmn:ioSpecification>
+        <bpmn:dataObject id="DataObject_1" name="Data Object 1"/>
+        <bpmn:dataObject id="DataObject_5" name="Data Object 5" isCollection="true"/>
+        <bpmn:dataStoreReference id="_DataStoreReference_2" name="Data Store" dataStoreRef="DataStore_1"/>
+        <bpmn:task id="Task_1">
+            <bpmn:dataInputAssociation id="DataInputAssociation_3">
+                <bpmn:sourceRef>DataObjectReference_1</bpmn:sourceRef>
+            </bpmn:dataInputAssociation>
+            <bpmn:dataOutputAssociation id="DataOutputAssociation_1">
+                <bpmn:targetRef>_DataStoreReference_2</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+            <bpmn:dataOutputAssociation id="DataOutputAssociation_2">
+                <bpmn:targetRef>DataOutput_1</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+            <bpmn:dataOutputAssociation id="DataOutputAssociation_3">
+                <bpmn:targetRef>DataObjectReference_1</bpmn:targetRef>
+            </bpmn:dataOutputAssociation>
+        </bpmn:task>
+        <bpmn:dataStoreReference id="_DataStoreReference_3" name="Data Store 2" dataStoreRef="DataStore_2"/>
+        <bpmn:dataObjectReference id="DataObjectReference_1" name="Data Object" dataObjectRef="DataObject_1"/>
+        <bpmn:dataObjectReference id="DataObjectReference_5" name="Data Object" dataObjectRef="DataObject_5"/>
+    </bpmn:process>
+    <bpmn:dataStore id="DataStore_1" name="Data Store 1"/>
+    <bpmn:dataStore id="DataStore_2" name="Data Store 2"/>
+    <bpmn:process id="Process_2" isExecutable="false">
+        <bpmn:task id="Task_2">
+            <bpmn:dataInputAssociation id="DataInputAssociation_1">
+                <bpmn:sourceRef>_DataStoreReference_2</bpmn:sourceRef>
+            </bpmn:dataInputAssociation>
+        </bpmn:task>
+    </bpmn:process>
+    <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+        <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="_Collaboration_4">
+            <bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_2" bpmnElement="DataObjectReference_1">
+                <dc:Bounds height="50.0" width="36.0" x="396.0" y="231.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="22.0" width="75.0" x="377.0" y="286.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_5" bpmnElement="DataObjectReference_5">
+                <dc:Bounds height="50.0" width="36.0" x="300.0" y="231.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="22.0" width="75.0" x="377.0" y="286.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_DataStoreReference_2" bpmnElement="_DataStoreReference_2">
+                <dc:Bounds height="50.0" width="50.0" x="762.0" y="72.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="22.0" width="68.0" x="753.0" y="127.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_DataInput_2" bpmnElement="DataInput_1">
+                <dc:Bounds height="50.0" width="36.0" x="355.0" y="84.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="0.0" width="0.0" x="373.0" y="139.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_DataOutput_2" bpmnElement="DataOutput_1">
+                <dc:Bounds height="50.0" width="36.0" x="480.0" y="84.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="0.0" width="0.0" x="498.0" y="139.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_Task_11" bpmnElement="Task_1">
+                <dc:Bounds height="80.0" width="100.0" x="516.0" y="216.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_Participant_4" bpmnElement="_Participant_4" isHorizontal="true">
+                <dc:Bounds height="277.0" width="529.0" x="132.0" y="60.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_DataStoreReference_3" bpmnElement="_DataStoreReference_3">
+                <dc:Bounds height="50.0" width="50.0" x="209.0" y="78.0"/>
+                <bpmndi:BPMNLabel>
+                    <dc:Bounds height="22.0" width="79.0" x="195.0" y="133.0"/>
+                </bpmndi:BPMNLabel>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_1" bpmnElement="DataOutputAssociation_1"
+                             sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataStoreReference_2">
+                <di:waypoint xsi:type="dc:Point" x="616.0" y="220.0"/>
+                <di:waypoint xsi:type="dc:Point" x="762.0" y="115.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNShape id="_BPMNShape_Participant_5" bpmnElement="Participant_1" isHorizontal="true">
+                <dc:Bounds height="165.0" width="600.0" x="888.0" y="28.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNShape id="_BPMNShape_Task_12" bpmnElement="Task_2">
+                <dc:Bounds height="80.0" width="100.0" x="1029.0" y="68.0"/>
+            </bpmndi:BPMNShape>
+            <bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation_1" bpmnElement="DataInputAssociation_1"
+                             sourceElement="_BPMNShape_DataStoreReference_2" targetElement="_BPMNShape_Task_12">
+                <di:waypoint xsi:type="dc:Point" x="812.0" y="98.0"/>
+                <di:waypoint xsi:type="dc:Point" x="1029.0" y="106.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_2" bpmnElement="DataOutputAssociation_2"
+                             sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataOutput_2">
+                <di:waypoint xsi:type="dc:Point" x="547.0" y="216.0"/>
+                <di:waypoint xsi:type="dc:Point" x="510.0" y="134.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge id="BPMNEdge_DataInputAssociation_3" bpmnElement="DataInputAssociation_3"
+                             sourceElement="_BPMNShape_DataObjectReference_2" targetElement="_BPMNShape_Task_11">
+                <di:waypoint xsi:type="dc:Point" x="432.0" y="244.0"/>
+                <di:waypoint xsi:type="dc:Point" x="478.0" y="215.0"/>
+                <di:waypoint xsi:type="dc:Point" x="516.0" y="233.0"/>
+            </bpmndi:BPMNEdge>
+            <bpmndi:BPMNEdge id="BPMNEdge_DataOutputAssociation_3" bpmnElement="DataOutputAssociation_3"
+                             sourceElement="_BPMNShape_Task_11" targetElement="_BPMNShape_DataObjectReference_2">
+                <di:waypoint xsi:type="dc:Point" x="516.0" y="277.0"/>
+                <di:waypoint xsi:type="dc:Point" x="471.0" y="296.0"/>
+                <di:waypoint xsi:type="dc:Point" x="432.0" y="269.0"/>
+            </bpmndi:BPMNEdge>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/simple/events.bpmn b/test/fixtures/bpmn/render/events.bpmn
similarity index 100%
rename from test/fixtures/bpmn/simple/events.bpmn
rename to test/fixtures/bpmn/render/events.bpmn
diff --git a/test/fixtures/bpmn/simple/activities.bpmn b/test/fixtures/bpmn/simple/activities.bpmn
deleted file mode 100644
index f51828b1..00000000
--- a/test/fixtures/bpmn/simple/activities.bpmn
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
-  <bpmn:process id="Process_1" isExecutable="false">
-    <bpmn:task id="Task_1"/>
-    <bpmn:userTask id="UserTask_1"/>
-    <bpmn:serviceTask id="ServiceTask_1"/>
-    <bpmn:sendTask id="SendTask_1"/>
-    <bpmn:receiveTask id="ReceiveTask_1"/>
-    <bpmn:scriptTask id="ScriptTask_1"/>
-    <bpmn:businessRuleTask id="BusinessRuleTask_1"/>
-    <bpmn:manualTask id="ManualTask_1"/>
-    <bpmn:subProcess id="SubProcess_2"/>
-    <bpmn:subProcess id="SubProcess_1"/>
-    <bpmn:transaction id="Transaction_1"/>
-    <bpmn:transaction id="Transaction_2"/>
-    <bpmn:adHocSubProcess id="AdHocSubProcess_1"/>
-    <bpmn:adHocSubProcess id="AdHocSubProcess_2"/>
-    <bpmn:callActivity id="CallActivity_1"/>
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
-      <bpmndi:BPMNShape id="_BPMNShape_Task_4" bpmnElement="Task_1">
-        <dc:Bounds height="80.0" width="100.0" x="112.0" y="105.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ManualTask_2" bpmnElement="ManualTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="264.0" y="348.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_UserTask_2" bpmnElement="UserTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="112.0" y="225.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_2" bpmnElement="ScriptTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="264.0" y="105.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_BusinessRuleTask_2" bpmnElement="BusinessRuleTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="264.0" y="228.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_2" bpmnElement="ServiceTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="112.0" y="348.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ReceiveTask_2" bpmnElement="ReceiveTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="264.0" y="468.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_SendTask_2" bpmnElement="SendTask_1">
-        <dc:Bounds height="80.0" width="100.0" x="264.0" y="591.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_2" bpmnElement="SubProcess_1">
-        <dc:Bounds height="80.0" width="100.0" x="672.0" y="105.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_3" bpmnElement="SubProcess_2" isExpanded="true">
-        <dc:Bounds height="157.0" width="217.0" x="420.0" y="105.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Transaction_2" bpmnElement="Transaction_1" isExpanded="true">
-        <dc:Bounds height="162.0" width="217.0" x="420.0" y="348.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_Transaction_3" bpmnElement="Transaction_2">
-        <dc:Bounds height="80.0" width="100.0" x="672.0" y="348.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_AdHocSubProcess_2" bpmnElement="AdHocSubProcess_1" isExpanded="true">
-        <dc:Bounds height="166.0" width="217.0" x="420.0" y="591.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_AdHocSubProcess_3" bpmnElement="AdHocSubProcess_2">
-        <dc:Bounds height="80.0" width="100.0" x="672.0" y="591.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_CallActivity_2" bpmnElement="CallActivity_1">
-        <dc:Bounds height="80.0" width="100.0" x="828.0" y="105.0"/>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/simple/data-items.bpmn b/test/fixtures/bpmn/simple/data-items.bpmn
deleted file mode 100644
index 4c9f5619..00000000
--- a/test/fixtures/bpmn/simple/data-items.bpmn
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
-  <bpmn:process id="Process_1" isExecutable="false">
-    <bpmn:ioSpecification id="InputOutputSpecification_1">
-      <bpmn:dataInput id="DataInput_1"/>
-      <bpmn:dataOutput id="DataOutput_1"/>
-    </bpmn:ioSpecification>
-    <bpmn:dataObject id="DataObject_1" name="Data Object 1"/>
-    <bpmn:dataObjectReference id="DataObjectReference_1" name="Data Object" dataObjectRef="DataObject_1"/>
-    <bpmn:dataStoreReference id="_DataStoreReference_2" name="Data Store" dataStoreRef="DataStore_1"/>
-  </bpmn:process>
-  <bpmn:dataStore id="DataStore_1" name="Data Store 1"/>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
-      <bpmndi:BPMNShape id="_BPMNShape_DataObjectReference_2" bpmnElement="DataObjectReference_1">
-        <dc:Bounds height="50.0" width="36.0" x="108.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="148.0" x="52.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataStoreReference_2" bpmnElement="_DataStoreReference_2">
-        <dc:Bounds height="50.0" width="50.0" x="228.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="79.0" x="214.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataInput_2" bpmnElement="DataInput_1">
-        <dc:Bounds height="50.0" width="36.0" x="355.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="373.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_DataOutput_2" bpmnElement="DataOutput_1">
-        <dc:Bounds height="50.0" width="36.0" x="462.0" y="84.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="480.0" y="139.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/simple/gateways.bpmn b/test/fixtures/bpmn/simple/gateways.bpmn
deleted file mode 100644
index 379577bb..00000000
--- a/test/fixtures/bpmn/simple/gateways.bpmn
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
-  <bpmn:process id="Process_1" isExecutable="false">
-    <bpmn:inclusiveGateway id="InclusiveGateway_1"/>
-    <bpmn:exclusiveGateway id="ExclusiveGateway_1"/>
-    <bpmn:parallelGateway id="ParallelGateway_1"/>
-    <bpmn:eventBasedGateway id="EventBasedGateway_1"/>
-    <bpmn:complexGateway id="ComplexGateway_1"/>
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
-      <bpmndi:BPMNShape id="_BPMNShape_InclusiveGateway_2" bpmnElement="InclusiveGateway_1">
-        <dc:Bounds height="50.0" width="50.0" x="114.0" y="99.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_2" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds height="50.0" width="50.0" x="229.0" y="99.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="254.0" y="154.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ParallelGateway_2" bpmnElement="ParallelGateway_1">
-        <dc:Bounds height="50.0" width="50.0" x="336.0" y="99.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="361.0" y="154.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_EventBasedGateway_2" bpmnElement="EventBasedGateway_1">
-        <dc:Bounds height="50.0" width="50.0" x="456.0" y="99.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="481.0" y="154.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="_BPMNShape_ComplexGateway_2" bpmnElement="ComplexGateway_1">
-        <dc:Bounds height="50.0" width="50.0" x="576.0" y="99.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="601.0" y="154.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
\ No newline at end of file