Skip to content

Commit

Permalink
Merge pull request #57 from simleo/test_abstract_export_diff_names
Browse files Browse the repository at this point in the history
test_abstract_export: use different names for the different outputs
  • Loading branch information
jmchilton committed May 11, 2021
2 parents 4d08a61 + 8cffb9b commit 8b1c98a
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions tests/test_export_abstract.py
Expand Up @@ -31,18 +31,18 @@

# double converting nested workflow doesn't work right, bug in gxformat2
# unrelated to abstract I think.
EXAMPLES = [
BASIC_WORKFLOW,
FLOAT_INPUT_DEFAULT,
INT_INPUT,
# NESTED_WORKFLOW,
OPTIONAL_INPUT,
PJA_1,
RULES_TOOL,
RUNTIME_INPUTS,
STRING_INPUT,
WORKFLOW_WITH_REPEAT,
]
EXAMPLES = {
"BASIC_WORKFLOW": BASIC_WORKFLOW,
"FLOAT_INPUT_DEFAULT": FLOAT_INPUT_DEFAULT,
"INT_INPUT": INT_INPUT,
# "NESTED_WORKFLOW": NESTED_WORKFLOW,
"OPTIONAL_INPUT": OPTIONAL_INPUT,
"PJA_1": PJA_1,
"RULES_TOOL": RULES_TOOL,
"RUNTIME_INPUTS": RUNTIME_INPUTS,
"STRING_INPUT": STRING_INPUT,
"WORKFLOW_WITH_REPEAT": WORKFLOW_WITH_REPEAT,
}

# TODO:
# - Ensure when reading native format - output information is included,
Expand All @@ -54,9 +54,10 @@


def test_abstract_export():
for example in EXAMPLES:
for as_dict in _both_formats(example):
_run_example(as_dict)
for name, example in EXAMPLES.items():
format2, native = _both_formats(example)
_run_example(format2, _examples_path_for("%s_from_format2.cwl" % name))
_run_example(native, _examples_path_for("%s_from_native.cwl" % name))


def test_basic_workflow():
Expand Down

0 comments on commit 8b1c98a

Please sign in to comment.