Adding tests around parallel which pass great, but ran into a bug down in Spiff that I'm passing back to Kelly with a test in that repo. More coming on this.
This commit is contained in:
parent
bec59a71d7
commit
7c743d65ed
|
@ -1,22 +1,13 @@
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
import string
|
|
||||||
import random
|
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
from SpiffWorkflow.bpmn.specs.EndEvent import EndEvent
|
from crc import session
|
||||||
|
|
||||||
from crc import session, db, app
|
|
||||||
from crc.api.common import ApiError
|
|
||||||
from crc.models.api_models import MultiInstanceType
|
from crc.models.api_models import MultiInstanceType
|
||||||
from crc.models.file import FileModel, FileDataModel, CONTENT_TYPES
|
|
||||||
from crc.models.study import StudyModel
|
from crc.models.study import StudyModel
|
||||||
from crc.models.workflow import WorkflowSpecModel, WorkflowStatus, WorkflowModel
|
from crc.models.workflow import WorkflowStatus
|
||||||
from crc.services.file_service import FileService
|
|
||||||
from crc.services.study_service import StudyService
|
from crc.services.study_service import StudyService
|
||||||
|
from crc.services.workflow_processor import WorkflowProcessor
|
||||||
from crc.services.workflow_service import WorkflowService
|
from crc.services.workflow_service import WorkflowService
|
||||||
from tests.base_test import BaseTest
|
from tests.base_test import BaseTest
|
||||||
from crc.services.workflow_processor import WorkflowProcessor
|
|
||||||
|
|
||||||
|
|
||||||
class TestWorkflowProcessorMultiInstance(BaseTest):
|
class TestWorkflowProcessorMultiInstance(BaseTest):
|
||||||
|
@ -96,3 +87,66 @@ class TestWorkflowProcessorMultiInstance(BaseTest):
|
||||||
task.data['StudyInfo']['investigators'])
|
task.data['StudyInfo']['investigators'])
|
||||||
|
|
||||||
self.assertEqual(WorkflowStatus.complete, processor.get_status())
|
self.assertEqual(WorkflowStatus.complete, processor.get_status())
|
||||||
|
|
||||||
|
|
||||||
|
@patch('crc.services.protocol_builder.requests.get')
|
||||||
|
def test_create_and_complete_workflow_parallel(self, mock_get):
|
||||||
|
"""Unlike the test above, the parallel task allows us to complete the items in any order."""
|
||||||
|
|
||||||
|
mock_get.return_value.ok = True
|
||||||
|
mock_get.return_value.text = self.protocol_builder_response('investigators.json')
|
||||||
|
|
||||||
|
self.load_example_data()
|
||||||
|
workflow_spec_model = self.load_test_spec("multi_instance_parallel")
|
||||||
|
study = session.query(StudyModel).first()
|
||||||
|
processor = self.get_processor(study, workflow_spec_model)
|
||||||
|
processor.bpmn_workflow.do_engine_steps()
|
||||||
|
|
||||||
|
# In the Parallel instance, there should be three tasks, all of them in the ready state.
|
||||||
|
next_user_tasks = processor.next_user_tasks()
|
||||||
|
self.assertEqual(3, len(next_user_tasks))
|
||||||
|
|
||||||
|
# We can complete the tasks out of order.
|
||||||
|
task = next_user_tasks[2]
|
||||||
|
|
||||||
|
self.assertEquals(
|
||||||
|
{
|
||||||
|
'DC': {'user_id': 'asd3v', 'type_full': 'Department Contact'},
|
||||||
|
'IRBC': {'user_id': 'asdf32', 'type_full': 'IRB Coordinator'},
|
||||||
|
'PI': {'user_id': 'dhf8r', 'type_full': 'Primary Investigator'}
|
||||||
|
},
|
||||||
|
task.data['StudyInfo']['investigators'])
|
||||||
|
|
||||||
|
self.assertEqual(WorkflowStatus.user_input_required, processor.get_status())
|
||||||
|
self.assertEquals("dhf8r", task.data["investigator"]["user_id"]) # The last of the tasks
|
||||||
|
|
||||||
|
api_task = WorkflowService.spiff_task_to_api_task(task)
|
||||||
|
self.assertEquals(MultiInstanceType.parallel, api_task.mi_type)
|
||||||
|
task.update_data({"email":"dhf8r@virginia.edu"})
|
||||||
|
processor.complete_task(task)
|
||||||
|
processor.do_engine_steps()
|
||||||
|
|
||||||
|
task = next_user_tasks[0]
|
||||||
|
api_task = WorkflowService.spiff_task_to_api_task(task)
|
||||||
|
self.assertEqual("MutiInstanceTask", api_task.name)
|
||||||
|
task.update_data({"email":"asd3v@virginia.edu"})
|
||||||
|
processor.complete_task(task)
|
||||||
|
processor.do_engine_steps()
|
||||||
|
|
||||||
|
task = next_user_tasks[1]
|
||||||
|
api_task = WorkflowService.spiff_task_to_api_task(task)
|
||||||
|
self.assertEqual("MutiInstanceTask", task.get_name())
|
||||||
|
task.update_data({"email":"asdf32@virginia.edu"})
|
||||||
|
processor.complete_task(task)
|
||||||
|
processor.do_engine_steps()
|
||||||
|
|
||||||
|
# Completing the tasks out of order, still provides the correct information.
|
||||||
|
self.assertEquals(
|
||||||
|
{
|
||||||
|
'DC': {'user_id': 'asd3v', 'type_full': 'Department Contact', 'email': 'asd3v@virginia.edu'},
|
||||||
|
'IRBC': {'user_id': 'asdf32', 'type_full': 'IRB Coordinator', "email": "asdf32@virginia.edu"},
|
||||||
|
'PI': {'user_id': 'dhf8r', 'type_full': 'Primary Investigator', "email": "dhf8r@virginia.edu"}
|
||||||
|
},
|
||||||
|
task.data['StudyInfo']['investigators'])
|
||||||
|
|
||||||
|
self.assertEqual(WorkflowStatus.complete, processor.get_status())
|
||||||
|
|
Loading…
Reference in New Issue