opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

re-remove the data input

Browse Source
This commit is contained in:
M Bernt
2020-01-22 09:37:24 +01:00
committed by mvdbeek
parent fff8d2ec7b
commit 5de147a181
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/tools/inputs_as_json.xml
+4 -5
View File
@@ -21,7 +21,6 @@ def assert_equals(x, y):
if test_case == "1":
assert_equals(as_dict["test_case"], 1)
assert "file_test" not in as_dict
assert_equals(as_dict["text_test"], "foo")
assert_equals(as_dict["booltest"], True)
assert_equals(as_dict["booltest2"], True)
@@ -32,9 +31,9 @@ if test_case == "1":
assert_equals(as_dict["repeat"][1]["r"], "FFFFFF")
assert_equals(as_dict["cond"]["more_text"], "fdefault")
assert_equals(as_dict["section_example"]["section_text"], "section_default")
assert "data_input" not in as_dict
elif test_case == "2":
assert_equals(as_dict["test_case"], 2)
assert "file_test" not in as_dict
assert_equals(as_dict["text_test"], "bar")
assert_equals(as_dict["booltest"], False)
assert_equals(as_dict["booltest2"], False)
@@ -45,6 +44,7 @@ elif test_case == "2":
assert_equals(as_dict["cond"]["cond_test"], "second")
assert_equals(as_dict["cond"]["more_text"], "sdefault")
assert_equals(as_dict["section_example"]["section_text"], "section_default")
assert "data_input" not in as_dict
with open("output", "w") as f:
f.write("okay\n")
@@ -52,7 +52,6 @@ with open("output", "w") as f:
</configfiles>
<inputs>
<param name="test_case" type="integer" value="0" />
<param name="file_test" type="data" format="txt" />
<param name="text_test" type="text" />
<param name="booltest" truevalue="booltrue" falsevalue="boolfalse" checked="false" type="boolean" />
<param name="booltest2" truevalue="booltrue" falsevalue="boolfalse" checked="false" type="boolean" />
@@ -63,6 +62,7 @@ with open("output", "w") as f:
<option value="b_radio">B Radio</option>
<option value="c_radio">C Radio</option>
</param>
<param name="data_input" type="data" optional="true" />
<repeat name="repeat" title="Repeat" min="1">
<param name="r" type="color" />
</repeat>
@@ -88,7 +88,6 @@ with open("output", "w") as f:
<tests>
<test>
<param name="test_case" value="1" />
<param name="file_test" value="simple_lines_both.txt" ftype="txt" />
<param name="text_test" value="foo" />
<param name="booltest" value="true" />
<param name="booltest2" value="booltrue" />
@@ -111,10 +110,10 @@ with open("output", "w") as f:
</test>
<test>
<param name="test_case" value="2" />
<param name="file_test" value="simple_lines_both.txt" ftype="txt" />
<param name="text_test" value="bar" />
<param name="booltest" value="false" />
<param name="booltest2" value="boolfalse" />
<param name="data_input" value="simple_line.txt" />
<!-- Testing null integers -->
<!-- <param name="inttest" value="12456" /> -->
<param name="r" value="000000" />
test/functional/tools/inputs_as_json_with_paths.xml
-5
View File
@@ -21,7 +21,6 @@ def assert_equals(x, y):
if test_case == "1":
assert_equals(as_dict["test_case"], 1)
assert "file_test" in as_dict
assert_equals(as_dict["text_test"], "foo")
assert_equals(as_dict["booltest"], True)
assert_equals(as_dict["booltest2"], True)
@@ -35,7 +34,6 @@ if test_case == "1":
assert_equals(as_dict["data_input"], None)
elif test_case == "2":
assert_equals(as_dict["test_case"], 2)
assert "file_test" in as_dict
assert_equals(as_dict["text_test"], "bar")
assert_equals(as_dict["booltest"], False)
assert_equals(as_dict["booltest2"], False)
@@ -55,7 +53,6 @@ with open("output", "w") as f:
</configfiles>
<inputs>
<param name="test_case" type="integer" value="0" />
<param name="file_test" type="data" format="txt" />
<param name="text_test" type="text" />
<param name="booltest" truevalue="booltrue" falsevalue="boolfalse" checked="false" type="boolean" />
<param name="booltest2" truevalue="booltrue" falsevalue="boolfalse" checked="false" type="boolean" />
@@ -92,7 +89,6 @@ with open("output", "w") as f:
<tests>
<test>
<param name="test_case" value="1" />
<param name="file_test" value="simple_lines_both.txt" ftype="txt" />
<param name="text_test" value="foo" />
<param name="booltest" value="true" />
<param name="booltest2" value="booltrue" />
@@ -115,7 +111,6 @@ with open("output", "w") as f:
</test>
<test>
<param name="test_case" value="2" />
<param name="file_test" value="simple_lines_both.txt" ftype="txt" />
<param name="text_test" value="bar" />
<param name="booltest" value="false" />
<param name="booltest2" value="boolfalse" />