second try on sumo meta tests, refs #21

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15426 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Jan 17, 2014 · 5633842 · 5633842
1 parent e00adaa
commit 5633842
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/sumo/tests/sumo/meta/write_config/cfg.sumo b/sumo/tests/sumo/meta/write_config/cfg.sumo
@@ -13,7 +13,6 @@
     </time>
 
     <report>
-        <xml-validation value="never"/>
         <no-duration-log value="true"/>
     </report>
 

diff --git a/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo b/sumo/tests/sumo/meta/write_template_commented_full/cfg.sumo
@@ -189,8 +189,8 @@
         <!-- Prints the current version -->
         <version value="false" synonymes="V" type="BOOL"/>
 
-        <!-- Enable schema validation of XML inputs -->
-        <xml-validation value="false" synonymes="X" type="BOOL"/>
+        <!-- Set schema validation scheme of XML inputs (&quot;never&quot;, &quot;auto&quot; or &quot;always&quot;) -->
+        <xml-validation value="auto" synonymes="X" type="STR"/>
 
         <!-- Disables output of warnings -->
         <no-warnings value="false" synonymes="W suppress-warnings" type="BOOL"/>

diff --git a/sumo/tests/sumo/meta/write_template_full/cfg.sumo b/sumo/tests/sumo/meta/write_template_full/cfg.sumo
@@ -75,7 +75,7 @@
         <print-options value="false" synonymes="p" type="BOOL" help="Prints option values before processing"/>
         <help value="false" synonymes="?" type="BOOL" help="Prints this screen"/>
         <version value="false" synonymes="V" type="BOOL" help="Prints the current version"/>
-        <xml-validation value="false" synonymes="X" type="BOOL" help="Enable schema validation of XML inputs"/>
+        <xml-validation value="auto" synonymes="X" type="STR" help="Set schema validation scheme of XML inputs (&quot;never&quot;, &quot;auto&quot; or &quot;always&quot;)"/>
         <no-warnings value="false" synonymes="W suppress-warnings" type="BOOL" help="Disables output of warnings"/>
         <log value="" synonymes="l log-file" type="FILE" help="Writes all messages to FILE (implies verbose)"/>
         <message-log value="" type="FILE" help="Writes all non-error messages to FILE (implies verbose)"/>

diff --git a/sumo/tests/sumo/meta/xml_validation/options.sumo b/sumo/tests/sumo/meta/xml_validation/options.sumo
@@ -1 +1 @@
---no-step-log --no-duration-log --net-file=net.net.xml -a input_additional.add.xml -X
+--no-step-log --no-duration-log --net-file=net.net.xml -a input_additional.add.xml -X always
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--no-step-log --no-duration-log --net-file=net.net.xml -a input_additional.add.xml -X
		--no-step-log --no-duration-log --net-file=net.net.xml -a input_additional.add.xml -X always