1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b2700f283725/ Changeset: b2700f283725 User: jmchilton Date: 2014-07-24 22:06:04 Summary: Add functional tool tests exercising multiple collection parameters at once. Affected #: 2 files diff -r 2be89285509068e862d27d41c3ba02c5a59e5b00 -r b2700f28372549a17f5ca03af60e86964665c3ff test/functional/tools/collection_two_paired.xml --- /dev/null +++ b/test/functional/tools/collection_two_paired.xml @@ -0,0 +1,69 @@ +<tool id="collection_two_paired" name="collection_two_paired" version="0.1.0"> + <command> + #if $kind.collection_type == "paired" + cat $kind.f1.forward $kind.f1['reverse'] >> $out1; + cat $kind.f2.forward $kind.f2['reverse'] >> $out1; + #else + #for $i, $_ in enumerate($kind.f1): + cat $kind.f1[$i] $kind.f2[$i] >> $out1; + #end for + #end if + </command> + <inputs> + <conditional name="kind"> + <param type="select" name="collection_type"> + <option value="paired">Paired Datasets</option> + <option value="list">List of Datasets</option> + </param> + <when value="paired"> + <param name="f1" type="data_collection" collection_type="paired" /> + <param name="f2" type="data_collection" collection_type="paired" /> + </when> + <when value="list"> + <param name="f1" type="data_collection" collection_type="paired" /> + <param name="f2" type="data_collection" collection_type="paired" /> + </when> + </conditional> + </inputs> + <outputs> + <data format="txt" name="out1" /> + </outputs> + <tests> + <test> + <conditional name="kind"> + <param name="collection_type" value="paired" /> + <param name="f1"> + <collection type="paired"> + <element name="forward" value="simple_line.txt" /> + <element name="reverse" value="simple_line_alternative.txt" /> + </collection> + </param> + <param name="f2"> + <collection type="paired"> + <element name="forward" value="simple_line.txt" /> + <element name="reverse" value="simple_line_alternative.txt" /> + </collection> + </param> + </conditional> + <output name="out1" file="simple_lines_interleaved.txt"/> + </test> + <test> + <conditional name="kind"> + <param name="collection_type" value="list" /> + <param name="f1"> + <collection type="list"> + <element name="l11" value="simple_line.txt" /> + <element name="l12" value="simple_line.txt" /> + </collection> + </param> + <param name="f2"> + <collection type="list"> + <element name="l21" value="simple_line_alternative.txt" /> + <element name="l22" value="simple_line_alternative.txt" /> + </collection> + </param> + </conditional> + <output name="out1" file="simple_lines_interleaved.txt"/> + </test> + </tests> +</tool> diff -r 2be89285509068e862d27d41c3ba02c5a59e5b00 -r b2700f28372549a17f5ca03af60e86964665c3ff test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -21,4 +21,5 @@ <tool file="collection_paired_test.xml" /><tool file="collection_nested_test.xml" /><tool file="collection_mixed_param.xml" /> + <tool file="collection_two_paired.xml" /></toolbox> \ No newline at end of file Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.