Merge branch 'master' into 2521-Enrich_links_between_edges_and_shapes…

…_in_the_internal_model_
process-analytics · May 3, 2023 · f2c963a · f2c963a
2 parents 1ad20e5 + 9accbab
commit f2c963a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/...2e/__image_snapshots__/bpmn-rendering/labels.05.default.position.activities.png b/...2e/__image_snapshots__/bpmn-rendering/labels.05.default.position.activities.png
diff --git a/test/e2e/bpmn.rendering.test.ts b/test/e2e/bpmn.rendering.test.ts
@@ -84,6 +84,13 @@ class ImageSnapshotThresholds extends MultiBrowserImageSnapshotThresholds {
           windows: 0.21 / 100, // 0.2083830906789208%
         },
       ],
+      [
+        'labels.05.default.position.activities',
+        {
+          macos: 0.28 / 100, // 0.2780854945044653%
+          windows: 0.47 / 100, // 0.46907051252580434%
+        },
+      ],
       [
         'pools.01.labels.and.lanes',
         {
@@ -186,6 +193,15 @@ class ImageSnapshotThresholds extends MultiBrowserImageSnapshotThresholds {
           windows: 1.68 / 100, // 1.6735128438225666%
         },
       ],
+      [
+        'labels.05.default.position.activities',
+        {
+          linux: 0.46 / 100, // 0.45753886693361556%
+          macos: 0.7 / 100, // 0.6908428450721038%
+          // high value due to font rendering discrepancies with chromium rendering
+          windows: 2.87 / 100, // 2.869412475926314%
+        },
+      ],
       [
         'pools.01.labels.and.lanes',
         {
@@ -270,6 +286,12 @@ class ImageSnapshotThresholds extends MultiBrowserImageSnapshotThresholds {
           macos: 0.71 / 100, // 0.703880504764276%
         },
       ],
+      [
+        'labels.05.default.position.activities',
+        {
+          macos: 1.2 / 100, // 1.192492604936246%
+        },
+      ],
       [
         'pools.01.labels.and.lanes',
         {

diff --git a/test/fixtures/bpmn/bpmn-rendering/labels.05.default.position.activities.bpmn b/test/fixtures/bpmn/bpmn-rendering/labels.05.default.position.activities.bpmn
@@ -0,0 +1,32 @@
+<?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" id="Definitions_0x0opj6" targetNamespace="http://example.bpmn.com/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="7.3.0">
+  <bpmn:process id="Process_1" isExecutable="false">
+    <bpmn:subProcess id="Activity_11" name="Collapsed sub-process" />
+    <bpmn:subProcess id="Activity_12" name="Expanded sub-process" />
+    <bpmn:callActivity id="Activity_1" name="Collapsed call activity" />
+    <bpmn:callActivity id="Activity_2" name="Expanded call activity" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+      <bpmndi:BPMNShape id="Activity_2_di" bpmnElement="Activity_2" isExpanded="true">
+        <dc:Bounds x="260" y="210" width="180" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_11_di" bpmnElement="Activity_11" isExpanded="false">
+        <dc:Bounds x="480" y="59" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_12_di" bpmnElement="Activity_12" isExpanded="true">
+        <dc:Bounds x="480" y="210" width="180" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1_di" bpmnElement="Activity_1">
+        <dc:Bounds x="330" y="59" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+  <bpmndi:BPMNDiagram>
+    <bpmndi:BPMNPlane bpmnElement="Activity_11" />
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>