patching expected results refs #21, #16216

eclipse-sumo · Feb 21, 2025 · 1081b8c · 1081b8c
1 parent 17c3b9c
commit 1081b8c
Show file tree

Hide file tree

Showing 14 changed files with 285 additions and 278 deletions.
diff --git a/tests/netconvert/bugs/10xxx/ticket11558/net.netconvert b/tests/netconvert/bugs/10xxx/ticket11558/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2025-02-21 15:02:34 by Eclipse SUMO netconvert Version v1_22_0+0440-9af1eda2b59
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <node-files value="input_plain.nod.xml"/>
@@ -28,7 +28,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <ignore-errors.edge-type value="true"/>
     </report>
 
-</configuration>
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
@@ -148,17 +148,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </junction>
 
     <connection from="101694131#0" to="101699679#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_0_0" dir="s" state="M"/>
-    <connection from="101694131#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_1_0" dir="L" state="M"/>
+    <connection from="101694131#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_1_0" dir="L" state="m"/>
     <connection from="101694131#0" to="101694131#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_2_0" dir="l" state="M"/>
-    <connection from="101699679#0" to="101699679#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_3_0" dir="s" state="M"/>
-    <connection from="101699679#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_4_0" dir="L" state="M"/>
-    <connection from="101699679#0" to="101694131#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_5_0" dir="l" state="M"/>
+    <connection from="101699679#0" to="101699679#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_3_0" dir="s" state="m"/>
+    <connection from="101699679#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_4_0" dir="L" state="m"/>
+    <connection from="101699679#0" to="101694131#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_5_0" dir="l" state="m"/>
     <connection from="101699692#1" to="153522302#0" fromLane="0" toLane="0" via=":1661927181_0_0" dir="s" state="M"/>
     <connection from="101699692#1" to="101699679#0" fromLane="0" toLane="0" via=":1661927181_1_0" dir="s" state="M"/>
     <connection from="101699692#1" to="101694131#0" fromLane="0" toLane="0" via=":1661927181_2_0" dir="s" state="M"/>
-    <connection from="153522302#0" to="101699679#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_6_0" dir="s" state="M"/>
-    <connection from="153522302#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_7_0" dir="L" state="M"/>
-    <connection from="153522302#0" to="101694131#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_8_0" dir="l" state="M"/>
+    <connection from="153522302#0" to="101699679#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_6_0" dir="s" state="m"/>
+    <connection from="153522302#0" to="153522302#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_7_0" dir="L" state="m"/>
+    <connection from="153522302#0" to="101694131#1" fromLane="0" toLane="0" via=":cluster_4673135617_4673135618_4673135619_588181295_8_0" dir="l" state="m"/>
     <connection from="46140393" to="101699692#1" fromLane="0" toLane="0" via=":4673135620_0_0" dir="s" state="M"/>
 
     <connection from=":1661927181_0" to="153522302#0" fromLane="0" toLane="0" dir="s" state="M"/>

diff --git a/tests/netconvert/bugs/5xxx/ticket5609/net.netconvert b/tests/netconvert/bugs/5xxx/ticket5609/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-27 14:13:06 by Eclipse SUMO netconvert Version v1_20_0+0884-42872f29db1
+<!-- generated on 2025-02-21 15:02:34 by Eclipse SUMO netconvert Version v1_22_0+0440-9af1eda2b59
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -309,8 +309,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="421641052#1" to="7525969#0" fromLane="1" toLane="1" via=":cluster_2351978965_3491058798_606104206_606104215_16_0" dir="s" state="m"/>
     <connection from="655043404" to="226356745#0" fromLane="0" toLane="0" via=":2351978961_0_0" dir="s" state="M"/>
     <connection from="655043411#1" to="655043411#2" fromLane="0" toLane="0" via=":cluster_2351978965_3491058798_606104206_606104215_0_0" dir="s" state="M"/>
-    <connection from="655043411#2" to="226356745#0" fromLane="0" toLane="0" via=":2351978961_1_0" dir="s" state="M"/>
-    <connection from="655043415#2" to="655043404" fromLane="0" toLane="0" via=":2351978970_0_0" dir="s" state="M"/>
+    <connection from="655043411#2" to="226356745#0" fromLane="0" toLane="0" via=":2351978961_1_0" dir="s" state="m"/>
+    <connection from="655043415#2" to="655043404" fromLane="0" toLane="0" via=":2351978970_0_0" dir="s" state="m"/>
     <connection from="68014253#1" to="411031867" fromLane="0" toLane="0" via=":cluster_2351978965_3491058798_606104206_606104215_11_0" dir="R" state="m"/>
     <connection from="68014253#1" to="7525969#0" fromLane="0" toLane="1" via=":cluster_2351978965_3491058798_606104206_606104215_12_0" dir="s" state="m"/>
     <connection from="68014253#1" to="-68014253#1" fromLane="0" toLane="0" via=":cluster_2351978965_3491058798_606104206_606104215_13_0" dir="t" state="m"/>

diff --git a/tests/netconvert/function/tls_programs/multimodal_rw/net.netconvert b/tests/netconvert/function/tls_programs/multimodal_rw/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-26 10:33:58 by Eclipse SUMO netconvert Version v1_19_0+1945-bdae8cdad73
+<!-- generated on 2025-02-21 15:02:28 by Eclipse SUMO netconvert Version v1_22_0+0440-9af1eda2b59
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <node-files value="input_plain.nod.xml"/>
@@ -29,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <ignore-errors.edge-type value="true"/>
     </report>
 
-</configuration>
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
@@ -306,28 +306,28 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <connection from="23209153#1" to="25730280#0" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_11_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="11" dir="s" state="o"/>
     <connection from="23209153#1" to="6279146" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_12_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="12" dir="R" state="O"/>
-    <connection from="26812730#0" to="26812730#2" fromLane="0" toLane="0" via=":3142550434_1_0" dir="s" state="M"/>
+    <connection from="26812730#0" to="26812730#2" fromLane="0" toLane="0" via=":3142550434_1_0" dir="s" state="m"/>
     <connection from="26812730#2" to="308958258#3" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_3_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="3" dir="R" state="o"/>
     <connection from="26812730#2" to="26812730#4" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_4_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="4" dir="s" state="o"/>
     <connection from="26812730#4" to="26812730#5" fromLane="0" toLane="0" via=":3142550441_1_0" dir="s" state="M"/>
-    <connection from="26812730#5" to="308956942" fromLane="0" toLane="0" via=":3142528930_1_0" dir="s" state="M"/>
+    <connection from="26812730#5" to="308956942" fromLane="0" toLane="0" via=":3142528930_1_0" dir="s" state="m"/>
     <connection from="308958254#0" to="308958258#0" fromLane="0" toLane="0" via=":273459765_0_0" dir="R" state="M"/>
     <connection from="308958254#0" to="26812730#0" fromLane="0" toLane="0" via=":273459765_1_0" dir="s" state="M"/>
     <connection from="308958255#0" to="308956942" fromLane="0" toLane="0" via=":3142528930_0_0" dir="s" state="M"/>
     <connection from="308958256#0" to="308958256#2" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_5_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="5" dir="s" state="o"/>
     <connection from="308958256#0" to="308958259#4" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_6_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="6" dir="R" state="o"/>
     <connection from="308958256#2" to="308958253#0" fromLane="0" toLane="0" via=":3142550435_0_0" dir="s" state="M"/>
-    <connection from="308958257#0" to="308958257#2" fromLane="0" toLane="0" via=":3142550441_0_0" dir="s" state="M"/>
+    <connection from="308958257#0" to="308958257#2" fromLane="0" toLane="0" via=":3142550441_0_0" dir="s" state="m"/>
     <connection from="308958257#2" to="308958257#3" fromLane="0" toLane="0" via=":3142549222_0_0" dir="s" state="M"/>
-    <connection from="308958257#3" to="308958252#0" fromLane="0" toLane="0" via=":3142549218_0_0" dir="s" state="M"/>
+    <connection from="308958257#3" to="308958252#0" fromLane="0" toLane="0" via=":3142549218_0_0" dir="s" state="m"/>
     <connection from="308958258#0" to="308958258#3" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_9_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="9" dir="s" state="O"/>
     <connection from="308958258#0" to="26812730#4" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_10_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="10" dir="L" state="o"/>
     <connection from="308958258#3" to="308958252#0" fromLane="0" toLane="0" via=":3142549218_1_0" dir="s" state="M"/>
-    <connection from="308958259#0" to="308958259#3" fromLane="0" toLane="0" via=":3142549222_1_0" dir="s" state="M"/>
+    <connection from="308958259#0" to="308958259#3" fromLane="0" toLane="0" via=":3142549222_1_0" dir="s" state="m"/>
     <connection from="308958259#3" to="308958256#2" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_7_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="7" dir="L" state="O"/>
     <connection from="308958259#3" to="308958259#4" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_8_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="8" dir="s" state="o"/>
     <connection from="308958259#4" to="308958259#6" fromLane="0" toLane="0" via=":3142550434_0_0" dir="s" state="M"/>
-    <connection from="308958259#6" to="308958253#0" fromLane="0" toLane="0" via=":3142550435_1_0" dir="s" state="M"/>
+    <connection from="308958259#6" to="308958253#0" fromLane="0" toLane="0" via=":3142550435_1_0" dir="s" state="m"/>
     <connection from="317682099#0" to="308958255#0" fromLane="0" toLane="0" via=":50917718_0_0" dir="R" state="M"/>
     <connection from="317682099#0" to="308958259#0" fromLane="0" toLane="0" via=":50917718_1_0" dir="s" state="M"/>
     <connection from="319583927#0" to="6279146" fromLane="0" toLane="0" via=":cluster_251050941_280598736_280598739_28902891_3142549227_3142550438_0_0" tl="cluster_251050941_280598736_280598739_28902891_3142549227_3142550438" linkIndex="0" dir="R" state="o"/>