From de2ea98daa2c0f75dd12246588601bd33b64617b Mon Sep 17 00:00:00 2001 From: burnettk Date: Wed, 19 Jul 2023 11:43:17 -0400 Subject: [PATCH] Revert "fix tests for waiting_event_can_be_skipped" This reverts commit 1e8a8d969c50fe0a9ad606d3a19f8e3d056e7937. --- .../services/process_instance_service.py | 4 +-- .../unit/test_process_instance_service.py | 33 +++++++------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py index c91663ac..27efee96 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py @@ -10,7 +10,6 @@ from urllib.parse import unquote import sentry_sdk from flask import current_app from flask import g -from SpiffWorkflow.bpmn.event import PendingBpmnEvent # type: ignore from SpiffWorkflow.bpmn.specs.control import BoundaryEventSplit # type: ignore from SpiffWorkflow.bpmn.specs.event_definitions.timer import TimerEventDefinition # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore @@ -145,8 +144,9 @@ class ProcessInstanceService: db.session.add(cycle) db.session.commit() + # TODO: test me @classmethod - def waiting_event_can_be_skipped(cls, waiting_event: PendingBpmnEvent, now_in_utc: datetime) -> bool: + def waiting_event_can_be_skipped(cls, waiting_event: dict[str, Any], now_in_utc: datetime) -> bool: # # over time this function can gain more knowledge of different event types, # for now we are just handling Duration Timer events. diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_service.py b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_service.py index 910cf577..e034e5ca 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_service.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_service.py @@ -2,7 +2,6 @@ from datetime import datetime from datetime import timezone from flask.app import Flask -from SpiffWorkflow.bpmn.event import PendingBpmnEvent # type: ignore from spiffworkflow_backend.models.process_instance_file_data import ProcessInstanceFileDataModel from spiffworkflow_backend.services.process_instance_service import ProcessInstanceService @@ -199,47 +198,39 @@ class TestProcessInstanceService(BaseTest): self._check_sample_file_data_model("File", 1, models[1]) def test_does_not_skip_events_it_does_not_know_about(self) -> None: - name = None - event_type = "Unknown" - value = "2023-04-27T20:15:10.626656+00:00" - pending_event = PendingBpmnEvent(name, event_type, value) assert not ( ProcessInstanceService.waiting_event_can_be_skipped( - pending_event, + {"event_type": "Unknown", "name": None, "value": "2023-04-27T20:15:10.626656+00:00"}, datetime.now(timezone.utc), ) ) def test_does_skip_duration_timer_events_for_the_future(self) -> None: - name = None - event_type = "DurationTimerEventDefinition" - value = "2023-04-27T20:15:10.626656+00:00" - pending_event = PendingBpmnEvent(name, event_type, value) assert ProcessInstanceService.waiting_event_can_be_skipped( - pending_event, + {"event_type": "DurationTimerEventDefinition", "name": None, "value": "2023-04-27T20:15:10.626656+00:00"}, datetime.fromisoformat("2023-04-26T20:15:10.626656+00:00"), ) def test_does_not_skip_duration_timer_events_for_the_past(self) -> None: - name = None - event_type = "DurationTimerEventDefinition" - value = "2023-04-27T20:15:10.626656+00:00" - pending_event = PendingBpmnEvent(name, event_type, value) assert not ( ProcessInstanceService.waiting_event_can_be_skipped( - pending_event, + { + "event_type": "DurationTimerEventDefinition", + "name": None, + "value": "2023-04-27T20:15:10.626656+00:00", + }, datetime.fromisoformat("2023-04-28T20:15:10.626656+00:00"), ) ) def test_does_not_skip_duration_timer_events_for_now(self) -> None: - name = None - event_type = "DurationTimerEventDefinition" - value = "2023-04-27T20:15:10.626656+00:00" - pending_event = PendingBpmnEvent(name, event_type, value) assert not ( ProcessInstanceService.waiting_event_can_be_skipped( - pending_event, + { + "event_type": "DurationTimerEventDefinition", + "name": None, + "value": "2023-04-27T20:15:10.626656+00:00", + }, datetime.fromisoformat("2023-04-27T20:15:10.626656+00:00"), ) )