Skip to content

Commit

Permalink
Merge pull request #17188 from bernt-matthias/fix/interval_bgzip_conv…
Browse files Browse the repository at this point in the history
…erter

Fix for converter tests
  • Loading branch information
mvdbeek authored Dec 15, 2023
2 parents d34426b + b4ae0a4 commit 2891d70
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions lib/galaxy/datatypes/converters/interval_to_bgzip_converter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
<test>
<param name="input1" ftype="bed" value="droPer1.bed"/>
<output name="output1" ftype="bgzip" value="droPer1.bgzip" decompress="true">
<expand macro="assert_size" value="131"/>
<expand macro="assert_size" value="120"/>
</output>
<assert_command>
<has_text text="-k1,1 -k2,2n -k3,3n"/>
</assert_command>
</test>
<test>
<param name="input1" ftype="encodepeak" value="encode.broad.peak"/>
<output name="output1" ftype="bgzip">
<output name="output1" ftype="bgzip" decompress="true">
<expand macro="assert_size" value="143">
<has_text_matching expression="^#" negate="true"/>
</expand>
Expand All @@ -61,7 +61,7 @@
<test>
<param name="input1" ftype="gff" value="gff_filter_by_feature_count_out2.gff"/>
<output name="output1" ftype="bgzip" value="bgzip_filter_by_feature_count_out2.bgzip" decompress="true">
<expand macro="assert_size" value="638"/>
<expand macro="assert_size" value="3824"/>
</output>
<assert_command>
<has_text text="-k1,1 -k4,4n"/>
Expand All @@ -71,7 +71,7 @@
<test>
<param name="input1" ftype="interval" value="2.interval"/>
<output name="output1" ftype="bgzip" value="2.bgzip" decompress="true">
<expand macro="assert_size" value="208"/>
<expand macro="assert_size" value="501"/>
</output>
<assert_command>
<has_text text="-k1,1 -k2,2n -k3,3n"/>
Expand All @@ -80,10 +80,9 @@
<test>
<param name="input1" ftype="vcf" value="vcf_to_maf_in.vcf"/>
<output name="output1" ftype="bgzip" decompress="true">
<expand macro="assert_size" value="322">
<!-- will only work with https://github.com/galaxyproject/galaxy/pull/15085
<has_n_lines n="3"/>
<has_text_matching expression="^#" negate="true"/> -->
<expand macro="assert_size" value="507">
<has_n_lines n="5"/>
<has_text_matching expression="^#" negate="true"/>
</expand>
</output>
<assert_command>
Expand All @@ -92,9 +91,9 @@
</test>
<test>
<param name="input1" ftype="gtf" value="cufflinks_out1.gtf"/>
<output name="output1" ftype="bgzip" >
<output name="output1" ftype="bgzip" decompress="true">
<assert_contents>
<has_size value="270" delta="10" />
<has_size value="887"/>
</assert_contents>
</output>
<assert_command>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<param name="input1" ftype="vcf" value="vcf_to_maf_in.vcf"/>
<output name="output1" ftype="vcf_bgzip" value="vcf_bgzip_to_maf_in.vcf_bgzip" decompress="true">
<assert_contents>
<has_size value="717" delta="10"/>
<has_size value="1182"/>
</assert_contents>
</output>
</test>
Expand Down

0 comments on commit 2891d70

Please sign in to comment.