Merge pull request galaxyproject#5796 from npinter/fix-peakzilla

Peakzilla outputs fix

tools/peakzilla/peakzilla.xml

@@ -2,7 +2,7 @@
     <description>Identify transcription factor binding sites from ChIP-seq and ChIP-exo experiments</description>
     <macros>
         <token name="@TOOL_VERSION@">1.0</token>
-        <token name="@VERSION_SUFFIX@">0</token>
+        <token name="@VERSION_SUFFIX@">1</token>
     </macros>
     <requirements>
         <requirement type="package" version="2.7">python</requirement>
@@ -63,13 +63,22 @@
     <outputs>
         <data name="results" format="tabular" label="${tool.name} on ${on_string}"/>
         <data name="log" format="txt" from_work_dir="log.txt" label="Log file for ${tool.name} on ${on_string}">
-            <filter>log</filter>
+            <filter>outputs["log"]</filter>
         </data>
         <data name="negative_peaks" format="tabular" from_work_dir="negative_peaks.tsv" label="Negative peaks for ${tool.name} on ${on_string}">
-            <filter>negative</filter>
+            <filter>outputs["negative"]</filter>
         </data>
     </outputs>
     <tests>
+        <test expect_num_outputs="1">
+            <param name="chip_bed" value="chip.bed" />
+            <param name="input_bed" value="input.bed" />
+            <output name="results" file="results_1.tsv">
+                <assert_contents>
+                    <has_text text="Peak_1" />
+                </assert_contents>
+            </output>
+        </test>
         <test expect_num_outputs="3">
             <param name="chip_bed" value="chip.bed" />
             <param name="input_bed" value="input.bed" />
@@ -79,7 +88,7 @@
             <param name="score_cutoff" value="1" />
             <param name="log" value="true" />
             <param name="negative" value="true" />
-            <output name="results" file="results.tsv">
+            <output name="results" file="results_2.tsv">
                 <assert_contents>
                     <has_text text="Peak_1" />
                 </assert_contents>

tools/peakzilla/test-data/log.txt

@@ -1,15 +1,15 @@
-10:13:55 Loading tags ...
-10:13:55 Tags in IP: 9953
-10:13:55 Tags in control: 9569
-10:13:55 Fragment size was set manually to 50 bp
-10:13:55 Peak size is 101 bp
-10:13:55 Estimating tag distribution using gaussian ...
-10:13:55 Finding peaks in ChIP sample ...
-10:13:55 Finding peaks in control sample ...
-10:13:55 Calculating peak scores ...
-10:13:55 Calculating FDR ...
-10:13:55 1 peaks detected
-10:13:55 Enrichment cutoff: 2.0
-10:13:55 Score cutoff: 1.0
-10:13:55 Writing input peaks to negative_peaks.tsv
-10:13:55 Done!
+11:01:24 Loading tags ...
+11:01:24 Tags in IP: 9953
+11:01:24 Tags in control: 9569
+11:01:24 Fragment size was set manually to 50 bp
+11:01:24 Peak size is 101 bp
+11:01:24 Estimating tag distribution using gaussian ...
+11:01:24 Finding peaks in ChIP sample ...
+11:01:24 Finding peaks in control sample ...
+11:01:24 Calculating peak scores ...
+11:01:24 Calculating FDR ...
+11:01:24 1 peaks detected
+11:01:24 Enrichment cutoff: 2.0
+11:01:24 Score cutoff: 1.0
+11:01:24 Writing input peaks to negative_peaks.tsv
+11:01:24 Done!

tools/peakzilla/test-data/results_1.tsv

@@ -0,0 +1,3 @@
+#Chromosome	Start	End	Name	Summit	Score	ChIP	Control	FoldEnrichment	DistributionScore	FDR
+2R	18296016	18296218	Peak_1	18296117	677.90	1729.79	163.82	10.56	0.43	0.00
+2R	19461248	19461450	Peak_2	19461349	2.54	1063.25	104.50	10.17	0.00	0.00