Skip to content
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

Jump to bottom

[WX-1629] Add metadata value type tests #7433

Merged
merged 39 commits into from
May 29, 2024
Merged

[WX-1629] Add metadata value type tests #7433

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e60257d
[WX-1629] Add metadata value type tests
rsaperst May 14, 2024
9b57ed5
Updated print
rsaperst May 14, 2024
a3266a5
Changed print to log
rsaperst May 14, 2024
ec872ad
Add additional centaur test and unit test
rsaperst May 14, 2024
6b80c83
Add extra key to sanitize
rsaperst May 14, 2024
724c363
Test that true != "true" in Centaur
rsaperst May 14, 2024
bd434e2
Added additional unit tests.
rsaperst May 15, 2024
b177495
Modify Centaur so that "true" != true
rsaperst May 15, 2024
f0f07c5
scalafmt
rsaperst May 15, 2024
5c5c627
Make new test suite to run only metadata tests (temporary)
rsaperst May 15, 2024
a562b86
Modify testCentaurLocal.sh to only run metadata tests (temporary)
rsaperst May 15, 2024
8e6899a
Slight modification to test suite
rsaperst May 15, 2024
57075c3
Add additional printing
rsaperst May 15, 2024
1be792d
Added more logging
rsaperst May 15, 2024
0ade3ea
More logging
rsaperst May 16, 2024
1539221
Modified Centaur to make comparisons taking data type into account
rsaperst May 17, 2024
38b0a42
Merge branch 'develop' into wx1629
rsaperst May 17, 2024
81f5f80
scalafmt
rsaperst May 17, 2024
77fe961
Reverted yml change
rsaperst May 17, 2024
97630aa
Reverted extraneous change
rsaperst May 17, 2024
6f340e3
Fixed most failing tests
rsaperst May 20, 2024
697d926
Parse lists from .test files
rsaperst May 21, 2024
b783831
Fixed remaining failing tests
rsaperst May 22, 2024
645e4c7
Merge branch 'develop' into wx1629
rsaperst May 22, 2024
76a9f1f
Remove extraneous log
rsaperst May 22, 2024
6542a5d
Fixed last failing test
rsaperst May 22, 2024
f45d300
Review comments
rsaperst May 23, 2024
08d7d8d
Revert whitespace change
rsaperst May 23, 2024
6c32f1a
Test to see if this resolves timeout errors
rsaperst May 23, 2024
8675777
Reverted test
rsaperst May 24, 2024
1f3adb1
Added SSH step to integration tests
rsaperst May 24, 2024
9f10bd1
Don't run lots_of_inputs on Papi
rsaperst May 24, 2024
9b72152
Fix failing test
rsaperst May 24, 2024
f0329b9
Modify Papi config and re-enable lots_of_inputs test
rsaperst May 24, 2024
1e589e8
Test lots_of_inputs instead of lots_of_inputs_papiv2
rsaperst May 28, 2024
06e4850
Switch from if statements to pattern matching
rsaperst May 28, 2024
dd5872a
Switch to lots_of_inputs instead of lots_of_inputs_papiv2 on Horicrom…
rsaperst May 28, 2024
32810b0
Cleanup
rsaperst May 28, 2024
3ed63d2
Review fixes
rsaperst May 29, 2024
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
18 changes: 9 additions & 9 deletions centaur/src/main/resources/standardTestCases/aliased_subworkflows.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ files {
metadata {
workflowName: aliased_subworkflows
status: Succeeded
"outputs.aliased_subworkflows.initial.0": "0"
"outputs.aliased_subworkflows.initial.1": "1"
"outputs.aliased_subworkflows.initial.2": "2"
"outputs.aliased_subworkflows.intermediate.0": "1"
"outputs.aliased_subworkflows.intermediate.1": "2"
"outputs.aliased_subworkflows.intermediate.2": "3"
"outputs.aliased_subworkflows.result.0": "2"
"outputs.aliased_subworkflows.result.1": "3"
"outputs.aliased_subworkflows.result.2": "4"
"outputs.aliased_subworkflows.initial.0": 0
"outputs.aliased_subworkflows.initial.1": 1
"outputs.aliased_subworkflows.initial.2": 2
"outputs.aliased_subworkflows.intermediate.0": 1
"outputs.aliased_subworkflows.intermediate.1": 2
"outputs.aliased_subworkflows.intermediate.2": 3
"outputs.aliased_subworkflows.result.0": 2
"outputs.aliased_subworkflows.result.1": 3
"outputs.aliased_subworkflows.result.2": 4
}
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/biscayne_new_runtime_attributes_tes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ files {

metadata {
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.docker": "debian:latest",
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": 4
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.cpu": "4"
"calls.runtime_attributes_wf.runtime_attributes_task.runtimeAttributes.memory": "4 GB"
}
6 changes: 3 additions & 3 deletions ...ur/src/main/resources/standardTestCases/biscayne_read_functions_windows_line_endings.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ metadata {
"outputs.biscayne_read_functions_windows_line_endings.map.y": 600
"outputs.biscayne_read_functions_windows_line_endings.map.z": 700
"outputs.biscayne_read_functions_windows_line_endings.map.x": 500
"outputs.biscayne_read_functions_windows_line_endings.tsv.0": "[\"line1\",\"line one\"]"
"outputs.biscayne_read_functions_windows_line_endings.tsv.1": "[\"line2\",\"line two\"]"
"outputs.biscayne_read_functions_windows_line_endings.tsv.2": "[\"line3\",\"line three\"]"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is super nice, I've definitely been annoyed in the past about having to craft just the right escape sequence for a test.

"outputs.biscayne_read_functions_windows_line_endings.tsv.0": ["line1","line one"]
"outputs.biscayne_read_functions_windows_line_endings.tsv.1": ["line2","line two"]
"outputs.biscayne_read_functions_windows_line_endings.tsv.2": ["line3","line three"]
"outputs.biscayne_read_functions_windows_line_endings.lines.0": "line1"
"outputs.biscayne_read_functions_windows_line_endings.lines.1": "line2"
"outputs.biscayne_read_functions_windows_line_endings.lines.2": "line3"
Expand Down
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/conditionals.declarations_in_ifs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ files {

metadata {
workflowName: declarations_in_ifs
"outputs.declarations_in_ifs.singles.0": "5"
"outputs.declarations_in_ifs.singles.0": 5
"outputs.declarations_in_ifs.singles.1": null
"outputs.declarations_in_ifs.doubles.0": "10"
"outputs.declarations_in_ifs.doubles.0": 10
"outputs.declarations_in_ifs.doubles.1": null
}
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/conditionals.ifs_in_scatters.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ files {
metadata {
workflowName: ifs_in_scatters
"outputs.ifs_in_scatters.mirrors.0": null
"outputs.ifs_in_scatters.mirrors.1": "5"
"outputs.ifs_in_scatters.mirrors.1": 5
"outputs.ifs_in_scatters.mirrors.2": null
"outputs.ifs_in_scatters.mirrors.3": "7"
"outputs.ifs_in_scatters.mirrors.3": 7
"outputs.ifs_in_scatters.mirrors.4": null
}
44 changes: 22 additions & 22 deletions centaur/src/main/resources/standardTestCases/conditionals.lots_of_nesting.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@ files {
metadata {
workflowName: lots_of_nesting
"outputs.lots_of_nesting.a.0": null
"outputs.lots_of_nesting.a.1": "5"
"outputs.lots_of_nesting.a.1": 5
"outputs.lots_of_nesting.a.2": null
"outputs.lots_of_nesting.a.3": "7"
"outputs.lots_of_nesting.a.3": 7
"outputs.lots_of_nesting.a.4": null
"outputs.lots_of_nesting.b.0": "5"
"outputs.lots_of_nesting.b.1": "7"
"outputs.lots_of_nesting.c.0.left": "5"
"outputs.lots_of_nesting.c.0.right": "5"
"outputs.lots_of_nesting.c.1.left": "5"
"outputs.lots_of_nesting.c.1.right": "7"
"outputs.lots_of_nesting.c.2.left": "7"
"outputs.lots_of_nesting.c.2.right": "5"
"outputs.lots_of_nesting.c.3.left": "7"
"outputs.lots_of_nesting.c.3.right": "7"
"outputs.lots_of_nesting.d.0.left": "5"
"outputs.lots_of_nesting.b.0": 5
"outputs.lots_of_nesting.b.1": 7
"outputs.lots_of_nesting.c.0.left": 5
"outputs.lots_of_nesting.c.0.right": 5
"outputs.lots_of_nesting.c.1.left": 5
"outputs.lots_of_nesting.c.1.right": 7
"outputs.lots_of_nesting.c.2.left": 7
"outputs.lots_of_nesting.c.2.right": 5
"outputs.lots_of_nesting.c.3.left": 7
"outputs.lots_of_nesting.c.3.right": 7
"outputs.lots_of_nesting.d.0.left": 5
"outputs.lots_of_nesting.d.0.right": null
"outputs.lots_of_nesting.d.1.left": "5"
"outputs.lots_of_nesting.d.1.right": "7"
"outputs.lots_of_nesting.d.2.left": "7"
"outputs.lots_of_nesting.d.2.right": "5"
"outputs.lots_of_nesting.d.3.left": "7"
"outputs.lots_of_nesting.d.1.left": 5
"outputs.lots_of_nesting.d.1.right": 7
"outputs.lots_of_nesting.d.2.left": 7
"outputs.lots_of_nesting.d.2.right": 5
"outputs.lots_of_nesting.d.3.left": 7
"outputs.lots_of_nesting.d.3.right": null
"outputs.lots_of_nesting.e.0": null
"outputs.lots_of_nesting.e.1.left": "5"
"outputs.lots_of_nesting.e.1.right": "7"
"outputs.lots_of_nesting.e.2.left": "7"
"outputs.lots_of_nesting.e.2.right": "5"
"outputs.lots_of_nesting.e.1.left": 5
"outputs.lots_of_nesting.e.1.right": 7
"outputs.lots_of_nesting.e.2.left": 7
"outputs.lots_of_nesting.e.2.right": 5
"outputs.lots_of_nesting.e.3": null
}
6 changes: 3 additions & 3 deletions centaur/src/main/resources/standardTestCases/conditionals.scatters_in_ifs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ files {

metadata {
workflowName: scatters_in_ifs
"outputs.scatters_in_ifs.inTruth.0": "0"
"outputs.scatters_in_ifs.inTruth.1": "1"
"outputs.scatters_in_ifs.inTruth.2": "2"
"outputs.scatters_in_ifs.inTruth.0": 0
"outputs.scatters_in_ifs.inTruth.1": 1
"outputs.scatters_in_ifs.inTruth.2": 2
"outputs.scatters_in_ifs.inLies": null
}
6 changes: 3 additions & 3 deletions centaur/src/main/resources/standardTestCases/conditionals.subworkflows_in_ifs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ files {

metadata {
workflowName: subworkflows_in_ifs
"outputs.subworkflows_in_ifs.tjs.0": "1"
"outputs.subworkflows_in_ifs.tjs.1": "2"
"outputs.subworkflows_in_ifs.tjs.2": "3"
"outputs.subworkflows_in_ifs.tjs.0": 1
"outputs.subworkflows_in_ifs.tjs.1": 2
"outputs.subworkflows_in_ifs.tjs.2": 3
"outputs.subworkflows_in_ifs.fjs": null
}
20 changes: 10 additions & 10 deletions centaur/src/main/resources/standardTestCases/copy_workflow_outputs_scattered_local.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ outputExpectations: {

allowOtherOutputs = false
metadata {
"outputs.wfoutputs.A.outs.0": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-0/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-0/execution/B2\"]"
"outputs.wfoutputs.A.outs.1": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-1/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-1/execution/B2\"]"
"outputs.wfoutputs.A.outs.2": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-2/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-2/execution/B2\"]"
"outputs.wfoutputs.A.outs.3": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-3/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-3/execution/B2\"]"
"outputs.wfoutputs.A.outs.4": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-4/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-4/execution/B2\"]"
"outputs.wfoutputs.A.outs.5": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-5/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-5/execution/B2\"]"
"outputs.wfoutputs.A.outs.6": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-6/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-6/execution/B2\"]"
"outputs.wfoutputs.A.outs.7": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-7/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-7/execution/B2\"]"
"outputs.wfoutputs.A.outs.8": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-8/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-8/execution/B2\"]"
"outputs.wfoutputs.A.outs.9": ~>"[\"<<WORKFLOW_ROOT>>/call-A/shard-9/execution/B1\",\"<<WORKFLOW_ROOT>>/call-A/shard-9/execution/B2\"]"
"outputs.wfoutputs.A.outs.0": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-0/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-0/execution/B2]"
"outputs.wfoutputs.A.outs.1": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-1/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-1/execution/B2]"
"outputs.wfoutputs.A.outs.2": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-2/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-2/execution/B2]"
"outputs.wfoutputs.A.outs.3": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-3/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-3/execution/B2]"
"outputs.wfoutputs.A.outs.4": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-4/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-4/execution/B2]"
"outputs.wfoutputs.A.outs.5": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-5/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-5/execution/B2]"
"outputs.wfoutputs.A.outs.6": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-6/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-6/execution/B2]"
"outputs.wfoutputs.A.outs.7": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-7/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-7/execution/B2]"
"outputs.wfoutputs.A.outs.8": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-8/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-8/execution/B2]"
"outputs.wfoutputs.A.outs.9": ~>"[<<WORKFLOW_ROOT>>/call-A/shard-9/execution/B1,<<WORKFLOW_ROOT>>/call-A/shard-9/execution/B2]"
}
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/draft3_infer_version.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ metadata {
status: Succeeded
"outputs.draft3_infer_version.j": 660
"actualWorkflowLanguage": WDL
"actualWorkflowLanguageVersion": 1.0
"actualWorkflowLanguageVersion": "1.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one 😂

}
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/draft3_lots_of_nesting.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ files {
metadata {
workflowName: lots_of_nesting
status: Succeeded
"outputs.lots_of_nesting.s_out.0": "[[\"helloworld\",\"helloworld\"],[\"helloworld\",\"helloworld\"]]"
"outputs.lots_of_nesting.s_out.1": "[[\"helloworld\",\"helloworld\"],[\"helloworld\",\"helloworld\"]]"
"outputs.lots_of_nesting.s_out.0": [["helloworld","helloworld"],["helloworld","helloworld"]]
"outputs.lots_of_nesting.s_out.1": [["helloworld","helloworld"],["helloworld","helloworld"]]
}
6 changes: 3 additions & 3 deletions centaur/src/main/resources/standardTestCases/draft3_nested_scatter.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ files {
metadata {
workflowName: nested_scatter
status: Succeeded
"outputs.nested_scatter.ks.0": "[[60,61,62],[62,63,64],[64,65,66]]"
"outputs.nested_scatter.ks.1": "[[62,63,64],[64,65,66],[66,67,68]]"
"outputs.nested_scatter.ks.2": "[[64,65,66],[66,67,68],[68,69,70]]"
"outputs.nested_scatter.ks.0": [[60,61,62],[62,63,64],[64,65,66]]
"outputs.nested_scatter.ks.1": [[62,63,64],[64,65,66],[66,67,68]]
"outputs.nested_scatter.ks.2": [[64,65,66],[66,67,68],[68,69,70]]
"outputs.nested_scatter.strings_in_if_in_scatter.0": null
"outputs.nested_scatter.strings_in_if_in_scatter.1": "hello 2"
"outputs.nested_scatter.strings_in_if_in_scatter.2": "hello 3"
Expand Down
6 changes: 3 additions & 3 deletions centaur/src/main/resources/standardTestCases/draft3_read_write_functions_local.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ metadata {
"outputs.read_write_functions.lines.0": "line1"
"outputs.read_write_functions.lines.1": "line2"
"outputs.read_write_functions.lines.2": "line3"
"outputs.read_write_functions.tsv.0": "[\"line1\",\"line one\"]"
"outputs.read_write_functions.tsv.1": "[\"line2\",\"line two\"]"
"outputs.read_write_functions.tsv.2": "[\"line3\",\"line three\"]"
"outputs.read_write_functions.tsv.0": ["line1","line one"]
"outputs.read_write_functions.tsv.1": ["line2","line two"]
"outputs.read_write_functions.tsv.2": ["line3","line three"]
"outputs.read_write_functions.map.key1": "value1"
"outputs.read_write_functions.map.key2": "value2"
"outputs.read_write_functions.map.key3": "value3"
Expand Down
10 changes: 5 additions & 5 deletions centaur/src/main/resources/standardTestCases/draft3_taskless_engine_functions.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ metadata {
"outputs.taskless_engine_functions.int_cross_string.3.left": 2
"outputs.taskless_engine_functions.int_cross_string.3.right": "b"

"outputs.taskless_engine_functions.transposed_matrix.0": "[1,1]"
"outputs.taskless_engine_functions.transposed_matrix.1": "[0,0]"
"outputs.taskless_engine_functions.transposed_matrix.0": [1,1]
"outputs.taskless_engine_functions.transposed_matrix.1": [0,0]

"outputs.taskless_engine_functions.flattened_matrix.0": 1
"outputs.taskless_engine_functions.flattened_matrix.1": 0
Expand All @@ -41,7 +41,7 @@ metadata {
"outputs.taskless_engine_functions.file_basename": "file.txt"
"outputs.taskless_engine_functions.file_basename_extensionless": "file"

"outputs.taskless_engine_functions.f_floor": "1"
"outputs.taskless_engine_functions.f_ceiling": "2"
"outputs.taskless_engine_functions.f_round": "1"
"outputs.taskless_engine_functions.f_floor": 1
"outputs.taskless_engine_functions.f_ceiling": 2
"outputs.taskless_engine_functions.f_round": 1
}
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/empty_scatter.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ files {
metadata {
workflowName: empty_scatter
status: Succeeded
"outputs.empty_scatter.task_outs_length" : "0"
"outputs.empty_scatter.decls_length" : "0"
"outputs.empty_scatter.task_outs_length" : 0
"outputs.empty_scatter.decls_length" : 0
}
8 changes: 4 additions & 4 deletions centaur/src/main/resources/standardTestCases/globbingindex.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ metadata {
"outputs.globbingindex.staticFilesContent": "staticFile"
"outputs.globbingindex.staticRefContent": "staticFile"
"outputs.globbingindex.staticArrayContent": "staticArray"
"outputs.globbingindex.staticFilesLength": "1"
"outputs.globbingindex.staticRefLength": "1"
"outputs.globbingindex.staticArrayLength": "1"
"outputs.globbingindex.globArrayLength": "1"
"outputs.globbingindex.staticFilesLength": 1
"outputs.globbingindex.staticRefLength": 1
"outputs.globbingindex.staticArrayLength": 1
"outputs.globbingindex.globArrayLength": 1
}
4 changes: 2 additions & 2 deletions ...rc/main/resources/standardTestCases/if_then_else_expressions/if_then_else_expressions.wdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ workflow if_then_else_expressions {
call only_evaluate_correct_side

output {
String a = fiveVsTen.maxOrMin
String b = sixVsTen.maxOrMin
Int a = fiveVsTen.maxOrMin
Int b = sixVsTen.maxOrMin
String c = if a == b then only_evaluate_correct_side.only_lhs_works else only_evaluate_correct_side.only_rhs_works
String d = if a != b then only_evaluate_correct_side.only_lhs_works else only_evaluate_correct_side.only_rhs_works
}
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/lots_of_inputs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ files {
metadata {
workflowName: lots_of_inputs
status: Succeeded
"outputs.lots_of_inputs.out_count": "400"
"outputs.lots_of_inputs.out_count": 400
"outputs.lots_of_inputs.nothing_out": "no-op"
}
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/member_access.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ metadata {
workflowName: test
status: Succeeded
"outputs.test.left_out": "bar 2 left 27"
"outputs.test.triple_left": "4"
"outputs.test.triple_left": 4
}
15 changes: 15 additions & 0 deletions centaur/src/main/resources/standardTestCases/metadata_type_validation.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: metadata_type_validation
testFormat: workflowsuccess

files {
workflow: metadata_type_validation/metadata_type_validation.wdl
}

metadata {
workflowName: metadata_type_validation
status: Succeeded
"outputs.metadata_type_validation.validate_string.string_output": "hello world"
"outputs.metadata_type_validation.validate_int.int_output": 5
"outputs.metadata_type_validation.validate_boolean.boolean_output": "true"
"outputs.metadata_type_validation.validate_float.float_output": 5.5
}
60 changes: 60 additions & 0 deletions ...rc/main/resources/standardTestCases/metadata_type_validation/metadata_type_validation.wdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
task validate_string {
command {
exit 0
}
output {
String string_output = "hello world"
}
runtime {
docker: "ubuntu:latest"
}
}

task validate_int {
command {
exit 0
}
output {
Int int_output = 5
}
runtime {
docker: "ubuntu:latest"
}
}

task validate_boolean {
command {
exit 0
}
output {
Boolean boolean_output = true
}
runtime {
docker: "ubuntu:latest"
}
}

task validate_float {
command {
exit 0
}
output {
Float float_output = 5.5
}
runtime {
docker: "ubuntu:latest"
}
}

workflow metadata_type_validation {
call validate_string
call validate_int
call validate_boolean
call validate_float
output {
validate_string.string_output
validate_int.int_output
validate_boolean.boolean_output
validate_float.float_output
}
}
rsaperst marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/object_access.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ metadata {
"outputs.object_access.lines.0": "1",
"outputs.object_access.lines.1": "2",
"outputs.object_access.lines.2": "3",
"outputs.object_access.int_a": "1",
"outputs.object_access.int_b": "2",
"outputs.object_access.int_a": 1,
"outputs.object_access.int_b": 2,
}
18 changes: 9 additions & 9 deletions centaur/src/main/resources/standardTestCases/public_http_import.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ files {
metadata {
workflowName: public_http_import
status: Succeeded
"outputs.public_http_import.initial.0": "0"
"outputs.public_http_import.initial.1": "1"
"outputs.public_http_import.initial.2": "2"
"outputs.public_http_import.intermediate.0": "1"
"outputs.public_http_import.intermediate.1": "2"
"outputs.public_http_import.intermediate.2": "3"
"outputs.public_http_import.result.0": "2"
"outputs.public_http_import.result.1": "3"
"outputs.public_http_import.result.2": "4"
"outputs.public_http_import.initial.0": 0
"outputs.public_http_import.initial.1": 1
"outputs.public_http_import.initial.2": 2
"outputs.public_http_import.intermediate.0": 1
"outputs.public_http_import.intermediate.1": 2
"outputs.public_http_import.intermediate.2": 3
"outputs.public_http_import.result.0": 2
"outputs.public_http_import.result.1": 3
"outputs.public_http_import.result.2": 4
}
Loading
Loading