mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-28 02:58:18 +08:00
John Chilton
735621971d
This was added in 20.09 with https://github.com/galaxyproject/galaxy/pull/9684/files. There were some things I didn't love that I think are corrected here. - Preserve legacy behavior of not enforcing sort order but make it now contigent on profile being 20.09 or newer. - Run all the element tests and then do order checking for a more specific error message: ``galaxy.tool_util.verify.interactor.JobOutputsError: Collection identifier '1' found out of order, expected order (['2', '1', '10']) of the tool generated collection elements ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']`` - Add test case for older default based on new test case. - Fix the new attribute that is used to check the order so that it isn't required (this broke Planemo workflow testing) and so the name doesn't clash with an existing element attribute on collection elements in the API/model.
71 lines
2.9 KiB
XML
71 lines
2.9 KiB
XML
<tool id="discover_sort_by" name="discover_sort_by" version="0.1.0" profile="20.09">
|
|
<command><![CDATA[
|
|
for i in \$(seq 1 10);
|
|
do
|
|
echo "\$i" > \$i.txt;
|
|
done
|
|
]]></command>
|
|
<inputs/>
|
|
<outputs>
|
|
<collection name="collection_numeric_name" type="list" label="num">
|
|
<discover_datasets pattern="__name_and_ext__" sort_by="numeric_name"/>
|
|
</collection>
|
|
<collection name="collection_rev_numeric_name" type="list" label="num rev">
|
|
<discover_datasets pattern="__name_and_ext__" sort_by="reverse_numeric_name"/>
|
|
</collection>
|
|
<collection name="collection_lexical_name" type="list" label="num">
|
|
<discover_datasets pattern="__name_and_ext__" sort_by="lexical_name" />
|
|
</collection>
|
|
<data name="data_reverse_lexical_name">
|
|
<discover_datasets pattern="__name_and_ext__" format="txt" assign_primary_output="true" sort_by="reverse_lexical_name" visible="true"/>
|
|
</data>
|
|
</outputs>
|
|
<tests>
|
|
<test expect_num_outputs="4">
|
|
<param name="input1" value="tinywga.fam" />
|
|
<output_collection name="collection_numeric_name" type="list" count="10">
|
|
<element name="1">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="2">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="10">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
</output_collection>
|
|
<output_collection name="collection_rev_numeric_name" type="list" count="10">
|
|
<element name="10">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="2">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="1">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
</output_collection>
|
|
<output_collection name="collection_lexical_name" type="list" count="10">
|
|
<element name="1">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="10">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
<element name="2">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</element>
|
|
</output_collection>
|
|
<output name="data_reverse_lexical_name">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
<discovered_dataset designation="10">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</discovered_dataset>
|
|
<discovered_dataset designation="1">
|
|
<assert_contents><has_text_matching expression="^.*$"/></assert_contents>
|
|
</discovered_dataset>
|
|
</output>
|
|
</test>
|
|
</tests>
|
|
</tool>
|