--- a/bionano_scaffold.xml	Sat May 29 15:58:03 2021 +0000
+++ b/bionano_scaffold.xml	Thu Oct 21 13:47:41 2021 +0000
@@ -1,4 +1,4 @@
-<tool id="bionano_scaffold" name="Bionano Hybrid Scaffold" version="@TOOL_VERSION@+@GALAXY_TOOL_VERSION@" profile="20.01">
+<tool id="bionano_scaffold" name="Bionano Hybrid Scaffold" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="20.01">
     <description>automates the scaffolding process</description>
     <macros>
         <import>macros.xml</import>
@@ -58,7 +58,7 @@
         #if $trim_cut_sites
             && python '$__tool_directory__/remove_fake_cut_sites.py' $output_file_NCBI 'SCAFFOLD_NCBI_trimmed.fasta' 'output.log'
             && python '$__tool_directory__/remove_fake_cut_sites.py' $output_file_not_scaffolded 'NOT_SCAFFOLDED_trimmed.fasta' 'output.log'
-        #end if        
+        #end if 
     ]]>    </command>
     <configfiles>
         <configfile name="vgp_mode"><![CDATA[
@@ -437,9 +437,10 @@
         <data name="results" format="zip" from_work_dir="results.zip" label="${tool.name} on ${on_string}: results">
             <filter>zip_file</filter>
         </data>
+        <data name="ngs_contigs_scaffold_agp" format="agp" from_work_dir="hybrid_scaffolds/bionano_bppAdjust_cmap_ngs_fasta_NGScontigs_HYBRID_SCAFFOLD.agp" label="${tool.name} on ${on_string}: AGP file"/>
     </outputs>
     <tests>
-        <test expect_num_outputs="5">
+        <test expect_num_outputs="6">
             <param name="ngs_fasta" value="assembly.fasta.gz"/>
             <param name="bionano_cmap" value="colormap_assembly.cmap"/>
             <param name="conflict_filter_genome" value="3"/>
@@ -463,6 +464,7 @@
                 </assert_contents>
             </output>
             <output name="report" file="test_01_report.txt" ftype="txt"/>
+            <output name="ngs_contigs_scaffold_agp" file="test_01.agp" ftype="agp"/>
             <output name="conflicts" ftype="txt">
                 <assert_contents>
                     <has_text text="alignmentOrientation" />
@@ -490,7 +492,7 @@
                 <has_text text="hybridScaffold"/>
             </assert_stdout>
         </test>
-        <test expect_num_outputs="4">
+        <test expect_num_outputs="5">
             <param name="ngs_fasta" value="assembly.fasta.gz"/>
             <param name="bionano_cmap" value="colormap_assembly.cmap"/>
             <param name="conflict_filter_genome" value="2"/>
@@ -513,6 +515,13 @@
                 </assert_contents>
             </output>
             <output name="report" file="test_02_report.txt" ftype="txt"/>
+            <output name="ngs_contigs_scaffold_agp" ftype="agp">
+                <assert_contents>
+                    <has_size value="311" delta="20" />
+                    <has_text text="##agp-version"/>
+                    <has_n_lines n="9"/>
+                </assert_contents>
+            </output>
             <output name="conflicts" ftype="txt">
                 <assert_contents>
                     <has_text text="alignmentOrientation" />
@@ -534,7 +543,7 @@
                 <!--attribute_is path="hybridScaffold/global/flag[@attr='maxthreads']" attribute="val0" text="2"/-->
             </assert_stdout>
         </test>
-        <test expect_num_outputs="5">
+        <test expect_num_outputs="6">
             <param name="ngs_fasta" value="assembly.fasta.gz"/>
             <param name="bionano_cmap" value="colormap_assembly.cmap"/>
             <param name="conflict_filter_genome" value="2"/>
@@ -558,6 +567,13 @@
                 </assert_contents>
             </output>
             <output name="report" file="test_03_report.txt" ftype="txt"/>
+            <output name="ngs_contigs_scaffold_agp" ftype="agp">
+                <assert_contents>
+                    <has_size value="311" delta="20" />
+                    <has_text text="##agp-version"/>
+                    <has_n_lines n="9"/>
+                </assert_contents>
+            </output>
             <output name="conflicts" ftype="txt">
                 <assert_contents>
                     <has_text text="alignmentOrientation" />
@@ -585,7 +601,7 @@
                 <has_text text="hybridScaffold"/>
             </assert_stdout>
         </test>
-        <test expect_num_outputs="5">
+        <test expect_num_outputs="6">
             <param name="ngs_fasta" value="assembly.fasta.gz"/>
             <param name="bionano_cmap" value="colormap_assembly.cmap"/>
             <param name="conflict_filter_genome" value="2"/>
@@ -609,6 +625,13 @@
                 </assert_contents>
             </output>
             <output name="report" file="test_04_report.txt" ftype="txt"/>
+            <output name="ngs_contigs_scaffold_agp" ftype="agp">
+                <assert_contents>
+                    <has_size value="311" delta="20" />
+                    <has_text text="##agp-version"/>
+                    <has_n_lines n="9"/>
+                </assert_contents>
+            </output>
             <output name="conflicts" ftype="txt">
                 <assert_contents>
                     <has_text text="alignmentOrientation" />
@@ -635,7 +658,7 @@
                 <has_text text="hybridScaffold"/>
             </assert_stdout>
         </test>
-        <test expect_num_outputs="4">
+        <test expect_num_outputs="5">
             <param name="ngs_fasta" value="assembly.fasta.gz"/>
             <param name="bionano_cmap" value="colormap_assembly.cmap"/>
             <param name="conflict_filter_genome" value="3"/>
@@ -663,6 +686,13 @@
                 </assert_contents>
             </output>            
             <output name="report" file="test_05_report.txt" ftype="txt"/>
+            <output name="ngs_contigs_scaffold_agp" ftype="agp">
+                <assert_contents>
+                    <has_size value="311" delta="20" />
+                    <has_text text="##agp-version"/>
+                    <has_n_lines n="9"/>
+                </assert_contents>
+            </output>
             <assert_stdout>
                 <has_text text='attr="maxmem" val0="8"'/>
             </assert_stdout>