1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/38be704a932f/ Changeset: 38be704a932f User: jmchilton Date: 2014-09-17 01:29:10+00:00 Summary: More tool functional tests for validation stuff. Test default sanitization in repeat. Basic test of simpler santizer and mapping. Affected #: 3 files diff -r dc14dc1d9d539a4d9901b22396cb625d45354ae5 -r 38be704a932fafd27b01034ae9daf83a465062bf test/functional/tools/samples_tool_conf.xml --- a/test/functional/tools/samples_tool_conf.xml +++ b/test/functional/tools/samples_tool_conf.xml @@ -22,6 +22,8 @@ <tool file="multi_data_param.xml" /><tool file="special_params.xml" /><tool file="validation_default.xml" /> + <tool file="validation_sanitizer.xml" /> + <tool file="validation_repeat.xml" /><tool file="collection_paired_test.xml" /><tool file="collection_nested_test.xml" /><tool file="collection_mixed_param.xml" /> diff -r dc14dc1d9d539a4d9901b22396cb625d45354ae5 -r 38be704a932fafd27b01034ae9daf83a465062bf test/functional/tools/validation_repeat.xml --- /dev/null +++ b/test/functional/tools/validation_repeat.xml @@ -0,0 +1,56 @@ +<tool id="validation_repeat" name="Validation (default)"> + <command> + #for $r in $r1 + echo "${r.text}" >> out1; + #end for + #for $r in $r2 + echo "${r.text}" >> out2; + #end for + </command> + <inputs> + <repeat name="r1" label="Repeat 1"> + <param name="text" type="text" label="text input" /> + </repeat> + <repeat name="r2" label="Repeat 2"> + <param name="text" type="text" label="text input"> + <sanitizer> + <valid initial="none"> + <add value="a"/> + <add value="b"/> + <add value="d"/> + <add value="e"/> + </valid> + <mapping initial="none"> + <add source="@" target="c"/> + </mapping> + </sanitizer> + </param> + </repeat> + </inputs> + <outputs> + <data name="out_file1" from_work_dir="out1" /> + <data name="out_file2" from_work_dir="out2" /> + </outputs> + <tests> + <test> + <repeat name="r1"> + <param name="text" value="" ; echo "moo" /> + </repeat> + <repeat name="r2"> + <param name="text" value="ab@de" /> + </repeat> + <output name="out_file1"> + <assert_contents> + <has_line line="__dq__ X echo __dq__moo" /> + </assert_contents> + </output> + <output name="out_file2"> + <assert_contents> + <has_line line="abcde" /> + </assert_contents> + </output> + </test> + </tests> + <help> + </help> +</tool> diff -r dc14dc1d9d539a4d9901b22396cb625d45354ae5 -r 38be704a932fafd27b01034ae9daf83a465062bf test/functional/tools/validation_sanitizer.xml --- /dev/null +++ b/test/functional/tools/validation_sanitizer.xml @@ -0,0 +1,35 @@ +<tool id="validation_sanitizer" name="Validation (simple sanitizer)"> + <command> + echo "${text}" >> out1; + </command> + <inputs> + <param name="text" type="text" label="text input"> + <sanitizer> + <valid initial="none"> + <add value="a"/> + <add value="b"/> + <add value="d"/> + <add value="e"/> + </valid> + <mapping initial="none"> + <add source="@" target="c"/> + </mapping> + </sanitizer> + </param> + </inputs> + <outputs> + <data name="out_file1" from_work_dir="out1" /> + </outputs> + <tests> + <test> + <param name="text" value="ab@de" /> + <output name="out_file1"> + <assert_contents> + <has_line line="abcde" /> + </assert_contents> + </output> + </test> + </tests> + <help> + </help> +</tool> 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.