--- a/XMLValidator.xml	Fri Nov 06 20:08:37 2020 +0000
+++ b/XMLValidator.xml	Thu Dec 01 19:11:46 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: [Utilities]-->
-<tool id="XMLValidator" name="XMLValidator" version="@TOOL_VERSION@+galaxy@GALAXY_VERSION@" profile="20.05">
+<tool id="XMLValidator" name="XMLValidator" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="21.05">
   <description>Validates XML files against an XSD schema.</description>
   <macros>
     <token name="@EXECUTABLE@">XMLValidator</token>
     <import>macros.xml</import>
-    <import>macros_autotest.xml</import>
-    <import>macros_test.xml</import>
   </macros>
   <expand macro="requirements"/>
   <expand macro="stdio"/>
@@ -46,12 +44,12 @@
     <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,featurexml,idxml,mzdata,mzid,mzml,mzxml,pepxml,traml,xml" optional="false" label="file to validate" help=" select consensusxml,featurexml,idxml,mzdata,mzid,mzml,mzxml,pepxml,traml,xml data sets(s)"/>
-    <param name="schema" argument="-schema" type="data" format="xml" optional="true" label="schema to validate against" help="If no schema is given, the file is validated against the latest schema of the file type select xml data sets(s)"/>
+    <param argument="-in" type="data" format="consensusxml,featurexml,idxml,mzdata,mzid,mzml,mzxml,pepxml,traml,xml" optional="false" label="file to validate" help=" select consensusxml,featurexml,idxml,mzdata,mzid,mzml,mzxml,pepxml,traml,xml data sets(s)"/>
+    <param argument="-schema" type="data" format="xml" optional="true" label="schema to validate against" help="If no schema is given, the file is validated against the latest schema of the file type select xml data sets(s)"/>
     <expand macro="adv_opts_macro">
-      <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">
@@ -66,13 +64,17 @@
       <filter>OPTIONAL_OUTPUTS is not None and "ctd_out_FLAG" in OPTIONAL_OUTPUTS</filter>
     </data>
   </outputs>
-  <tests>
-    <expand macro="autotest_XMLValidator"/>
-    <expand macro="manutest_XMLValidator"/>
-  </tests>
+  <tests><test expect_num_outputs="1"><!-- just chosen an arbitrary input and autgenerated output-->
+    <param name="adv_opts|test" value="true"/>
+    <param name="in" ftype="mzml" value="FileFilter_1_input.mzML"/>
+    <output name="stdout" ftype="txt" value="XMLValidator.stdout" lines_diff="4">
+       <assert_contents><has_text text="Success: the file is valid!"/></assert_contents>
+    </output>
+  </test>
+</tests>
   <help><![CDATA[Validates XML files against an XSD schema.
 
 
-For more information, visit http://www.openms.de/doxygen/release/2.6.0/html/UTILS_XMLValidator.html]]></help>
+For more information, visit http://www.openms.de/doxygen/release/2.8.0/html/UTILS_XMLValidator.html]]></help>
   <expand macro="references"/>
 </tool>