--- a/ConsensusMapNormalizer.xml	Fri Nov 06 20:42:36 2020 +0000
+++ b/ConsensusMapNormalizer.xml	Thu Dec 01 19:07:18 2022 +0000
@@ -1,13 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--This is a configuration file for the integration of a tools into Galaxy (https://galaxyproject.org/). This file was automatically generated using CTDConverter.-->
 <!--Proposed Tool Section: [Map Alignment]-->
-<tool id="ConsensusMapNormalizer" name="ConsensusMapNormalizer" version="@TOOL_VERSION@+galaxy@GALAXY_VERSION@" profile="20.05">
+<tool id="ConsensusMapNormalizer" name="ConsensusMapNormalizer" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
   <description>Normalizes maps of one consensusXML file</description>
   <macros>
     <token name="@EXECUTABLE@">ConsensusMapNormalizer</token>
     <import>macros.xml</import>
-    <import>macros_autotest.xml</import>
-    <import>macros_test.xml</import>
   </macros>
   <expand macro="requirements"/>
   <expand macro="stdio"/>
@@ -41,25 +39,25 @@
     <configfile name="hardcoded_json"><![CDATA[{"log": "log.txt", "threads": "\${GALAXY_SLOTS:-1}", "no_progress": true}]]></configfile>
   </configfiles>
   <inputs>
-    <param name="in" argument="-in" type="data" format="consensusxml" optional="false" label="input file" help=" select consensusxml data sets(s)"/>
-    <param name="algorithm_type" argument="-algorithm_type" display="radio" type="select" optional="false" label="The normalization algorithm that is applied" help="'robust_regression' scales each map by a fator computed from the ratios of non-differential background features (as determined by the ratio_threshold parameter), 'quantile' performs quantile normalization, 'median' scales all maps to the same median intensity, 'median_shift' shifts the median instead of scaling (WARNING: if you have regular, log-normal MS data, 'median_shift' is probably the wrong choice. Use only if you know what you're doing!)">
+    <param argument="-in" type="data" format="consensusxml" optional="false" label="input file" help=" select consensusxml data sets(s)"/>
+    <param argument="-algorithm_type" type="select" optional="true" label="The normalization algorithm that is applied" help="'robust_regression' scales each map by a fator computed from the ratios of non-differential background features (as determined by the ratio_threshold parameter), 'quantile' performs quantile normalization, 'median' scales all maps to the same median intensity, 'median_shift' shifts the median instead of scaling (WARNING: if you have regular, log-normal MS data, 'median_shift' is probably the wrong choice. Use only if you know what you're doing!)">
       <option value="robust_regression" selected="true">robust_regression</option>
       <option value="median">median</option>
       <option value="median_shift">median_shift</option>
       <option value="quantile">quantile</option>
-      <expand macro="list_string_san"/>
+      <expand macro="list_string_san" name="algorithm_type"/>
     </param>
-    <param name="ratio_threshold" argument="-ratio_threshold" type="float" optional="true" min="0.001" max="1.0" value="0.67" label="Only for 'robust_regression': the parameter is used to distinguish between non-outliers (ratio_threshold &lt; intensity ratio &lt; 1/ratio_threshold) and outliers" help=""/>
+    <param argument="-ratio_threshold" type="float" optional="true" min="0.001" max="1.0" value="0.67" label="Only for 'robust_regression': the parameter is used to distinguish between non-outliers (ratio_threshold &lt; intensity ratio &lt; 1/ratio_threshold) and outliers" help=""/>
     <expand macro="adv_opts_macro">
-      <param name="accession_filter" argument="-accession_filter" type="text" optional="true" value="" label="Use only features with accessions (partially) matching this regular expression for computing the normalization factors" help="Useful, e.g., if you have known house keeping proteins in your samples. When this parameter is empty or the regular expression matches the empty string, all features are used (even those without an ID). No effect if quantile normalization is used">
-        <expand macro="list_string_san"/>
+      <param argument="-accession_filter" type="text" optional="true" value="" label="Use only features with accessions (partially) matching this regular expression for computing the normalization factors" help="Useful, e.g., if you have known house keeping proteins in your samples. When this parameter is empty or the regular expression matches the empty string, all features are used (even those without an ID). No effect if quantile normalization is used">
+        <expand macro="list_string_san" name="accession_filter"/>
       </param>
-      <param name="description_filter" argument="-description_filter" type="text" optional="true" value="" label="Use only features with description (partially) matching this regular expression for computing the normalization factors" help="Useful, e.g., if you have known house keeping proteins in your samples. When this parameter is empty or the regular expression matches the empty string, all features are used (even those without an ID). No effect if quantile normalization is used">
-        <expand macro="list_string_san"/>
+      <param argument="-description_filter" type="text" optional="true" value="" label="Use only features with description (partially) matching this regular expression for computing the normalization factors" help="Useful, e.g., if you have known house keeping proteins in your samples. When this parameter is empty or the regular expression matches the empty string, all features are used (even those without an ID). No effect if quantile normalization is used">
+        <expand macro="list_string_san" name="description_filter"/>
       </param>
-      <param name="force" argument="-force" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Overrides tool-specific checks" help=""/>
-      <param name="test" argument="-test" type="hidden" optional="true" value="False" label="Enables the test mode (needed for internal use only)" help="">
-        <expand macro="list_string_san"/>
+      <param argument="-force" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Overrides tool-specific checks" help=""/>
+      <param argument="-test" type="hidden" optional="true" value="False" label="Enables the test mode (needed for internal use only)" help="">
+        <expand macro="list_string_san" name="test"/>
       </param>
     </expand>
     <param name="OPTIONAL_OUTPUTS" type="select" optional="true" multiple="true" label="Optional outputs">
@@ -72,13 +70,29 @@
       <filter>OPTIONAL_OUTPUTS is not None and "ctd_out_FLAG" in OPTIONAL_OUTPUTS</filter>
     </data>
   </outputs>
-  <tests>
-    <expand macro="autotest_ConsensusMapNormalizer"/>
-    <expand macro="manutest_ConsensusMapNormalizer"/>
+  <tests><!-- TOPP_ConsensusMapNormalizer_1 -->
+    <test expect_num_outputs="2">
+      <section name="adv_opts">
+        <param name="accession_filter" value=""/>
+        <param name="description_filter" value=""/>
+        <param name="force" value="false"/>
+        <param name="test" value="true"/>
+      </section>
+      <param name="in" value="ConsensusMapNormalizer_input.consensusXML"/>
+      <output name="out" file="ConsensusMapNormalizer_output.consensusXML" compare="sim_size" delta_frac="0.7" ftype="consensusxml"/>
+      <param name="algorithm_type" value="robust_regression"/>
+      <param name="ratio_threshold" value="0.67"/>
+      <param name="OPTIONAL_OUTPUTS" value="ctd_out_FLAG"/>
+      <output name="ctd_out" ftype="xml">
+        <assert_contents>
+          <is_valid_xml/>
+        </assert_contents>
+      </output>
+    </test>
   </tests>
   <help><![CDATA[Normalizes maps of one consensusXML file
 
 
-For more information, visit http://www.openms.de/doxygen/release/2.6.0/html/TOPP_ConsensusMapNormalizer.html]]></help>
+For more information, visit http://www.openms.de/doxygen/release/2.8.0/html/TOPP_ConsensusMapNormalizer.html]]></help>
   <expand macro="references"/>
 </tool>