This repository was archived by the owner on Jan 24, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
Expressions in command blocks #17
Open
mcovarr
wants to merge
1
commit into
openwdl:master
Choose a base branch
from
mcovarr:mlc_expressions_command_blocks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
67 changes: 67 additions & 0 deletions
67
pytest-wdl-tests/tests/expr/commands/test_expressions_commands.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| def test_expressions_commands(workflow_runner): | ||
| """ | ||
| Expression evaluation in commands. | ||
| """ | ||
| inputs = { } | ||
| """ | ||
| Expectations are possibly not 100% as Cromwell 48 doesn't come close to being able to deal | ||
| with this workflow. | ||
| """ | ||
| expected = { | ||
| "exprs.string": "string", | ||
| "exprs.parens": "string", | ||
| "exprs.left": "left", | ||
| "exprs.var_left": "left", | ||
| "exprs.array_element": "string", | ||
| "exprs.true_": "true", | ||
| "exprs.false_": "false", | ||
| "exprs.negated": "false", | ||
| "exprs.true_var": "true", | ||
| "exprs.false_var": "false", | ||
| "exprs.negated_var": "false", | ||
| "exprs.forty_two": "42", | ||
| "exprs.plus_forty_two": "42", | ||
| "exprs.minus_forty_two": "-42", | ||
| "exprs.i": "42", | ||
| "exprs.plus_i": "42", | ||
| "exprs.minus_i": "-42", | ||
| "exprs.conditional": "1", | ||
| "exprs.conditional_var": "1", | ||
| "exprs.mult": "1806", | ||
| "exprs.mult_var": "1806", | ||
| "exprs.div": "0", | ||
| "exprs.div_var": "0", | ||
| "exprs.mod": "42", | ||
| "exprs.mod_var": "42", | ||
| "exprs.add": "85", | ||
| "exprs.add_var": "85", | ||
| "exprs.sub": "-1", | ||
| "exprs.sub_var": "-1", | ||
| "exprs.lt": "true", | ||
| "exprs.lt_var": "true", | ||
| "exprs.lte": "true", | ||
| "exprs.lte_var": "true", | ||
| "exprs.gt": "false", | ||
| "exprs.gt_var": "false", | ||
| "exprs.gte": "false", | ||
| "exprs.gte_var": "false", | ||
| "exprs.eq": "false", | ||
| "exprs.eq_var": "false", | ||
| "exprs.ne": "true", | ||
| "exprs.ne_var": "true", | ||
| "exprs.and": "false", | ||
| "exprs.and_var": "false", | ||
| "exprs.or": "true", | ||
| "exprs.or_var": "true", | ||
| "exprs.jamie": "Jamie", | ||
| "exprs.jamie_var": "Jamie", | ||
| "exprs.array_literal": "string", | ||
| "exprs.array_": True, | ||
| "exprs.array__": True | ||
| } | ||
| workflow_runner( | ||
| "test_expressions_commands.wdl", | ||
| inputs, | ||
| expected, | ||
| workflow_name = "commands" | ||
| ) |
133 changes: 133 additions & 0 deletions
133
pytest-wdl-tests/tests/expr/commands/test_expressions_commands.wdl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| version 1.0 | ||
|
|
||
| struct Person { | ||
| String name | ||
| Int age | ||
| } | ||
|
|
||
| task exprs { | ||
|
|
||
| Pair[String, String] pair = ("left", "right") | ||
| Int i = 42 | ||
| Int j = 43 | ||
| Boolean true_ = true | ||
| Boolean false_ = false | ||
| Person p = { "name": "Jamie", "age": 4 } | ||
| Array[String] booleans = [ true, false ] | ||
| Array[String] booleans_ = [ true_, false_] | ||
|
|
||
| command { | ||
| echo ~{"string"} | ||
| echo ~{("string")} | ||
| echo ~{("left", "right").left} | ||
| echo ~{pair.left} | ||
| echo ~{["string"][0]} | ||
| echo ~{true} | ||
| echo ~{false} | ||
| echo ~{!true} | ||
| echo ~{true_} | ||
| echo ~{false_} | ||
| echo ~{!true_} | ||
| echo ~{42} | ||
| echo ~{-42} | ||
| echo ~{+42} | ||
| echo ~{i} | ||
| echo ~{+i} # fails in Cromwell 48 | ||
| echo ~{-i} # fails in Cromwell 48 | ||
| echo ~{if true then 1 else 0} | ||
| echo ~{if true_ then 1 else 0} | ||
| echo ~{42 * 43} | ||
| echo ~{i * j} # fails in Cromwell 48 | ||
| echo ~{42 / 43} | ||
| echo ~{i / j} # fails in Cromwell 48 | ||
| echo ~{42 % 43} | ||
| echo ~{i % j} # fails in Cromwell 48 | ||
| echo ~{42 + 43} | ||
| echo ~{i + j} # fails in Cromwell 48 | ||
| echo ~{42 - 43} | ||
| echo ~{i - j} # fails in Cromwell 48 | ||
| echo ~{42 < 43} | ||
| echo ~{i < j} # fails in Cromwell 48 | ||
| echo ~{42 <= 43} | ||
| echo ~{i <= j} # fails in Cromwell 48 | ||
| echo ~{42 > 43} | ||
| echo ~{i > j} # fails in Cromwell 48 | ||
| echo ~{42 >= 43} | ||
| echo ~{i >= j} # fails in Cromwell 48 | ||
| echo ~{42 == 43} # does not parse in Cromwell 48 | ||
| echo ~{i == j} # does not parse in Cromwell 48 | ||
| echo ~{42 != 43} | ||
| echo ~{i != j} # fails in Cromwell 48 | ||
| echo ~{true && false} | ||
| echo ~{true_ && false_} # fails in Cromwell 48 | ||
| echo ~{true || false} | ||
| echo ~{true_ || false_} # fails in Cromwell 48 | ||
| echo ~{(object {"name": "Jamie", "age": 4}).name} # does not parse in Cromwell 48 | ||
| echo ~{p.name} | ||
| echo ~{["string"][0]} | ||
| echo ~{booleans[0]} | ||
| echo ~{booleans_[0]} | ||
| } | ||
|
|
||
| runtime { | ||
| docker: "ubuntu:latest" | ||
| } | ||
|
|
||
| output { | ||
| Array[String] lines = read_lines(stdout()) | ||
| String string = lines[0] | ||
| String parens = lines[1] | ||
| String left = lines[2] | ||
| String var_left = lines[3] | ||
| String array_element = lines[4] | ||
| String true_ = lines[5] | ||
| String false_ = lines[6] | ||
| String negated = lines[7] | ||
| String true_var = lines[8] | ||
| String false_var = lines[9] | ||
| String negated_var = lines[10] | ||
| String forty_two = lines[11] | ||
| String plus_forty_two = lines[12] | ||
| String minus_forty_two = lines[13] | ||
| String i = lines[14] | ||
| String plus_i = lines[15] | ||
| String minus_i = lines[16] | ||
| String conditional = lines[17] | ||
| String conditional_var = lines[18] | ||
| String mult = lines[19] | ||
| String mult_var = lines[20] | ||
| String div = lines[21] | ||
| String div_var = lines[22] | ||
| String mod = lines[23] | ||
| String mod_var = lines[24] | ||
| String add = lines[25] | ||
| String add_var = lines[26] | ||
| String sub = lines[27] | ||
| String sub_var = lines[28] | ||
| String lt = lines[29] | ||
| String lt_var = lines[30] | ||
| String lte = lines[31] | ||
| String lte_var = lines[32] | ||
| String gt = lines[33] | ||
| String gt_var = lines[34] | ||
| String gte = lines[35] | ||
| String gte_var = lines[36] | ||
| String eq = lines[37] | ||
| String eq_var = lines[38] | ||
| String ne = lines[39] | ||
| String ne_var = lines[40] | ||
| String and = lines[41] | ||
| String and_var = lines[42] | ||
| String or = lines[43] | ||
| String or_var = lines[44] | ||
| String jamie = lines[45] | ||
| String jamie_var = lines[46] | ||
| String array_literal = lines[47] | ||
| String array_ = lines[48] | ||
| String array__ = lines[49] | ||
| } | ||
| } | ||
|
|
||
| workflow commands { | ||
| call exprs | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably keep these kinds of comments in a Cromwell issue tracker rather than the openWDL spec repo