Skip to content

Task artifact output dir int tests #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 4, 2022
Merged

Task artifact output dir int tests #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abbd050
Integration tests for output_dir artifacts
JoeBatt1989 Aug 3, 2022
e9f76f2
Updated task artifact int tests
JoeBatt1989 Aug 4, 2022
ca6b7b7
Updated based on review comment
JoeBatt1989 Aug 4, 2022
59206f1
Updated based on failing test
JoeBatt1989 Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions ...IntegrationTests/WorkflowExecutor.IntegrationTests/Features/WorkflowTaskArtifacts.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,40 @@ Scenario: Task with context.executions.task_id.artifacts.artifact_name is trigge
Examples:
| testData | taskUpdateMessage |
| TwoTask_Context.Executions.Task_id.Artifact.Artifact_Name_Mandatory=False | TwoTask_Context.Executions.Task_id.Artifact.Artifact_Name_Mandatory=False_No_Outputs |

@TaskArtifacts_TaskUpdate
Scenario: Task with context.executions.task_id.output_dir is triggered when mandatory files exist resulting in a Sucessful Task Dispatch
Given I have a clinical workflow <testData>
And I have a Workflow Instance <testData> with artifacts full_patient_metadata in minio
When I publish a Task Update Message <testData> with artifacts output_metadata in minio
Then I can see Workflow Instance is updated with Task Update Information
And 1 Task Dispatch event is published
And I can see Workflow Instance is updated with Task Dispatch Information
Examples:
| testData |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null |

@TaskArtifacts_TaskUpdate
Scenario: Task with context.executions.task_id.output_dir is not triggered when mandatory files are missing
Given I have a clinical workflow <testData>
And I have a Workflow Instance <testData> with artifacts full_patient_metadata in minio
When I publish a Task Update Message <testData> with no artifacts
Then A Task Dispatch event is not published
Examples:
| testData |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null |

@TaskArtifacts_TaskUpdate
Scenario: Task with context.executions.task_id.output_dir is triggered when non mandatory files are missing
Given I have a clinical workflow <testData>
And I have a Workflow Instance <testData> with artifacts full_patient_metadata in minio
When I publish a Task Update Message <taskUpdateMessage> with no artifacts
Then I can see Workflow Instance is updated with Task Update Information
And 1 Task Dispatch event is published
And I can see Workflow Instance is updated with Task Dispatch Information
Examples:
| testData | taskUpdateMessage |
| TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False | TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False_No_Outputs |
21 changes: 18 additions & 3 deletions tests/IntegrationTests/WorkflowExecutor.IntegrationTests/Support/Assertions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,27 @@ public void AssertTaskDispatchEvent(TaskDispatchEvent taskDispatchEvent, Workflo
taskDispatchEvent.PayloadId.Should().Match(workflowInstance.PayloadId);
taskDispatchEvent.ExecutionId.Should().Match(workflowInstanceTask?.ExecutionId);

var previousTaskExecution = workflowInstance.Tasks.FirstOrDefault(x => x.TaskId.Equals
(workflowInstance?.Tasks?.FirstOrDefault(x => !string.IsNullOrEmpty(x.PreviousTaskId))?.PreviousTaskId));

if (taskDispatchEvent.Inputs.Count > 0)
{

if (taskUpdateEvent != null)
{
AssertInputArtifactsForTaskDispatch(workflowRevisionTask, workflowInstance.PayloadId, taskDispatchEvent.Inputs, taskUpdateEvent);
AssertInputArtifactsForTaskDispatch(workflowRevisionTask,
workflowInstance.PayloadId,
taskDispatchEvent.Inputs,
taskUpdateEvent,
previousTaskExecution?.OutputDirectory);
}
else
{
AssertInputArtifactsForTaskDispatch(workflowRevisionTask, workflowInstance.PayloadId, taskDispatchEvent.Inputs);
AssertInputArtifactsForTaskDispatch(workflowRevisionTask,
workflowInstance.PayloadId,
taskDispatchEvent.Inputs,
null,
previousTaskExecution?.OutputDirectory);
}
}

Expand Down Expand Up @@ -190,7 +202,10 @@ internal void AssertWorkflowInstanceAfterTaskDispatch(WorkflowInstance workflowI
workflowInstanceTask?.Status.Should().Be(TaskExecutionStatus.Dispatched);
workflowInstanceTask?.TaskType.Should().Be(workflowRevisionTask?.Type);
AssertOutputDirectory(workflowInstanceTask, taskDispatchEvent.PayloadId, workflowInstance.Id);
AssertInputArtifactsForWorkflowInstance(workflowRevisionTask, taskDispatchEvent.PayloadId, workflowInstanceTask, previousTaskExecution);
if (workflowInstanceTask.InputArtifacts.Any())
{
AssertInputArtifactsForWorkflowInstance(workflowRevisionTask, taskDispatchEvent.PayloadId, workflowInstanceTask, previousTaskExecution);
}
}

public void AssertPayload(Payload payload, Payload? actualPayload)
Expand Down
62 changes: 62 additions & 0 deletions tests/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/TaskUpdateTestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,37 @@ public static string GetRelativePathForOutputArtifacts(string name)
return $"{workflowInstance?.PayloadId}/workflows/{workflowInstance?.Id}/{executionId}";
}

public static TaskUpdateEvent CreateTaskUpdateEvent(string workflowInstanceName)
{
return new TaskUpdateEvent()
{
WorkflowInstanceId = Helper.GetWorkflowInstanceByName(workflowInstanceName).WorkflowInstance.Id,
ExecutionId = Helper.GetWorkflowInstanceByName(workflowInstanceName).WorkflowInstance.Tasks[0].ExecutionId,
CorrelationId = Guid.NewGuid().ToString(),
Reason = FailureReason.None,
Message = "Task Message",
TaskId = Helper.GetWorkflowInstanceByName(workflowInstanceName).WorkflowInstance.Tasks[0].TaskId,
Outputs = new List<Messaging.Common.Storage>
{
new Messaging.Common.Storage()
{
Name = "output",
Endpoint = "//output.dcm",
Credentials = new Messaging.Common.Credentials()
{
AccessKey = "test1",
AccessToken = "test",
},
Bucket = "bucket1",
RelativeRootPath = GetRelativePathForOutputArtifacts(workflowInstanceName)
}
},
Metadata = new Dictionary<string, object>()
{
}
};
}

public static List<TaskUpdateTestData> TestData = new List<TaskUpdateTestData>()
{
new TaskUpdateTestData()
Expand Down Expand Up @@ -656,6 +687,37 @@ public static string GetRelativePathForOutputArtifacts(string name)
}
}
},
new TaskUpdateTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True",
TaskUpdateEvent = CreateTaskUpdateEvent("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True")
},
new TaskUpdateTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False",
TaskUpdateEvent = CreateTaskUpdateEvent("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False")
},
new TaskUpdateTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null",
TaskUpdateEvent = CreateTaskUpdateEvent("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null")
},
new TaskUpdateTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False_No_Outputs",
TaskUpdateEvent = new TaskUpdateEvent()
{
WorkflowInstanceId = Helper.GetWorkflowInstanceByName("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False").WorkflowInstance.Id,
ExecutionId = Helper.GetWorkflowInstanceByName("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False").WorkflowInstance.Tasks[0].ExecutionId,
CorrelationId = Guid.NewGuid().ToString(),
Reason = FailureReason.None,
Message = "Task Message",
TaskId = Helper.GetWorkflowInstanceByName("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False").WorkflowInstance.Tasks[0].TaskId,
Metadata = new Dictionary<string, object>()
{
}
}
},
};
}
}
Expand Down
50 changes: 50 additions & 0 deletions ...s/IntegrationTests/WorkflowExecutor.IntegrationTests/TestData/WorkflowInstanceTestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,41 @@ public class WorkflowInstanceTestData

public static class WorkflowInstancesTestData
{
public static WorkflowInstance CreateWorkflowInstance(string workflowName)
{
var id = Guid.NewGuid().ToString();
var payloadId = Guid.NewGuid().ToString();
var executionId = Guid.NewGuid().ToString();
return new WorkflowInstance()
{
Id = id,
AeTitle = Helper.GetWorkflowByName(workflowName).WorkflowRevision.Workflow.InformaticsGateway.AeTitle,
WorkflowId = Helper.GetWorkflowByName(workflowName).WorkflowRevision.WorkflowId,
PayloadId = payloadId,
StartTime = DateTime.Now,
Status = Status.Created,
BucketId = TestExecutionConfig.MinioConfig.Bucket,
InputMetaData = new Dictionary<string, string>()
{
{ "", "" }
},
Tasks = new List<TaskExecution>
{
new TaskExecution()
{
ExecutionId = executionId,
TaskId = Helper.GetWorkflowByName(workflowName).WorkflowRevision.Workflow.Tasks[0].Id,
TaskType = Helper.GetWorkflowByName(workflowName).WorkflowRevision?.Workflow.Tasks[0].Type,
Status = TaskExecutionStatus.Accepted,
InputArtifacts = null,
OutputArtifacts = null,
OutputDirectory = $"{payloadId}/workflows/{id}/{executionId}"
}
}
};
}


public static List<WorkflowInstanceTestData> TestData = new List<WorkflowInstanceTestData>()
{
new WorkflowInstanceTestData()
Expand Down Expand Up @@ -967,6 +1002,21 @@ public static class WorkflowInstancesTestData
}
}
},
new WorkflowInstanceTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True",
WorkflowInstance = CreateWorkflowInstance("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=True")
},
new WorkflowInstanceTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False",
WorkflowInstance = CreateWorkflowInstance("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=False")
},
new WorkflowInstanceTestData()
{
Name = "TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null",
WorkflowInstance = CreateWorkflowInstance("TwoTask_Context.Executions.Task_id.Output_Dir_Mandatory=Null")
},
};
}
}
Expand Down
Loading