From 391134ad333ee80df56487791137955c8f54fe51 Mon Sep 17 00:00:00 2001
From: burnettk <burnettk@users.noreply.github.com>
Date: Sun, 4 Dec 2022 14:40:34 -0500
Subject: [PATCH] remove dup test process model

---
 .../tests/data/hello_world/hello_world.bpmn   |  6 ++-
 .../process_instance_metadata.bpmn            | 40 -------------------
 .../integration/test_process_api.py           | 17 ++++----
 3 files changed, 14 insertions(+), 49 deletions(-)
 delete mode 100644 spiffworkflow-backend/tests/data/test-process-instance-metadata-report/process_instance_metadata.bpmn

diff --git a/spiffworkflow-backend/tests/data/hello_world/hello_world.bpmn b/spiffworkflow-backend/tests/data/hello_world/hello_world.bpmn
index 1e5bc853..4be5adba 100644
--- a/spiffworkflow-backend/tests/data/hello_world/hello_world.bpmn
+++ b/spiffworkflow-backend/tests/data/hello_world/hello_world.bpmn
@@ -19,7 +19,11 @@
       <bpmn:scriptTask id="hot_script_task_OH_YEEEEEEEEEEEEEEEEEEEEAH" name="OHHHHHHHHHHYEEEESSSSSSSSSS">
         <bpmn:incoming>Flow_0bazl8x</bpmn:incoming>
         <bpmn:outgoing>Flow_1mcaszp</bpmn:outgoing>
-        <bpmn:script>a = 1</bpmn:script>
+        <bpmn:script>a = 1
+b = 2
+outer = {}
+outer["inner"] = 'sweet1'
+      </bpmn:script>
       </bpmn:scriptTask>
       <bpmn:endEvent id="Event_1vch1y0">
         <bpmn:incoming>Flow_1mcaszp</bpmn:incoming>
diff --git a/spiffworkflow-backend/tests/data/test-process-instance-metadata-report/process_instance_metadata.bpmn b/spiffworkflow-backend/tests/data/test-process-instance-metadata-report/process_instance_metadata.bpmn
deleted file mode 100644
index f371a350..00000000
--- a/spiffworkflow-backend/tests/data/test-process-instance-metadata-report/process_instance_metadata.bpmn
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions 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" id="Definitions_96f6665" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.0.0-dev">
-  <bpmn:process id="Process_zqd49ox" isExecutable="true">
-    <bpmn:startEvent id="StartEvent_1">
-      <bpmn:outgoing>Flow_0fmt4q1</bpmn:outgoing>
-    </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_0fmt4q1" sourceRef="StartEvent_1" targetRef="save_metadata" />
-    <bpmn:scriptTask id="save_metadata" name="Save Metadata">
-      <bpmn:incoming>Flow_0fmt4q1</bpmn:incoming>
-      <bpmn:outgoing>Flow_0hhrkce</bpmn:outgoing>
-      <bpmn:script>save_process_instance_metadata({"key1": "value1", "key2": "value2"})</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:endEvent id="Event_10onn1h">
-      <bpmn:incoming>Flow_0hhrkce</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_0hhrkce" sourceRef="save_metadata" targetRef="Event_10onn1h" />
-  </bpmn:process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_zqd49ox">
-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
-        <dc:Bounds x="179" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0e0gdj6_di" bpmnElement="save_metadata">
-        <dc:Bounds x="270" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_10onn1h_di" bpmnElement="Event_10onn1h">
-        <dc:Bounds x="432" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_0fmt4q1_di" bpmnElement="Flow_0fmt4q1">
-        <di:waypoint x="215" y="177" />
-        <di:waypoint x="270" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0hhrkce_di" bpmnElement="Flow_0hhrkce">
-        <di:waypoint x="370" y="177" />
-        <di:waypoint x="432" y="177" />
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</bpmn:definitions>
diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
index 0b2c254b..a17a3875 100644
--- a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
+++ b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
@@ -2563,9 +2563,9 @@ class TestProcessApi(BaseTest):
     ) -> None:
         """Test_can_get_process_instance_list_with_report_metadata."""
         process_model = load_test_spec(
-            process_model_id="test-process-instance-metadata-report",
-            bpmn_file_name="process_instance_metadata.bpmn",
-            process_model_source_directory="test-process-instance-metadata-report",
+            process_model_id="save_process_instance_metadata/save_process_instance_metadata",
+            bpmn_file_name="save_process_instance_metadata.bpmn",
+            process_model_source_directory="save_process_instance_metadata",
         )
         process_instance = self.create_process_instance_from_process_model(
             process_model=process_model, user=with_super_admin_user
@@ -2576,7 +2576,7 @@ class TestProcessApi(BaseTest):
         process_instance_metadata = ProcessInstanceMetadataModel.query.filter_by(
             process_instance_id=process_instance.id
         ).all()
-        assert len(process_instance_metadata) == 2
+        assert len(process_instance_metadata) == 3
 
         report_metadata = {
             "columns": [
@@ -2620,9 +2620,9 @@ class TestProcessApi(BaseTest):
     ) -> None:
         """Test_can_get_process_instance_list_with_report_metadata."""
         process_model = load_test_spec(
-            process_model_id="test-process-instance-metadata-report",
-            bpmn_file_name="process_instance_metadata.bpmn",
-            process_model_source_directory="test-process-instance-metadata-report",
+            process_model_id="save_process_instance_metadata/save_process_instance_metadata",
+            bpmn_file_name="save_process_instance_metadata.bpmn",
+            process_model_source_directory="save_process_instance_metadata",
         )
         process_instance = self.create_process_instance_from_process_model(
             process_model=process_model, user=with_super_admin_user
@@ -2633,7 +2633,7 @@ class TestProcessApi(BaseTest):
         process_instance_metadata = ProcessInstanceMetadataModel.query.filter_by(
             process_instance_id=process_instance.id
         ).all()
-        assert len(process_instance_metadata) == 2
+        assert len(process_instance_metadata) == 3
 
         response = client.get(
             "/v1.0/process-instances/reports/columns",
@@ -2655,4 +2655,5 @@ class TestProcessApi(BaseTest):
             {"Header": "Status", "accessor": "status", "filterable": False},
             {"Header": "key1", "accessor": "key1", "filterable": True},
             {"Header": "key2", "accessor": "key2", "filterable": True},
+            {"Header": "key3", "accessor": "key3", "filterable": True},
         ]