patching expected results refs #21, #13384

eclipse-sumo · Jun 7, 2023 · 5a442fc · 5a442fc
1 parent 0af4c28
commit 5a442fc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 31 deletions.
diff --git a/tests/complex/traci/bugs/ticket13384/state.complex b/tests/complex/traci/bugs/ticket13384/state.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-06-07 10:21:44 by Eclipse SUMO sumo Version v1_17_0+0759-3e3feac
+<!-- generated on 2023-06-07 10:27:52 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -13,17 +13,17 @@
     </report>
 
     <traci_server>
-        <remote-port value="44366"/>
+        <remote-port value="55316"/>
     </traci_server>
 
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_17_0+0759-3e3feac" time="1.00" type="micro">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_17_0+0760-eaaf797" time="1.00" type="micro">
     <route id="r0" state="1" edges="SC CN"/>
     <delay number="1" begin="1" end="0" depart="0.00" time="0.00"/>
     <vType id="testType"/>
-    <vehicle id="ego" depart="0.00" route="r0" distance="0 0" speedFactor="1.0600" state="0 0 0 5.10 0 0.00 1000 0 0" pos="5.10 0.10 0.00" speed="0.00 0.00" angle="0.00" posLat="0.00" waitingTime="100000 0"/>
+    <vehicle id="ego" type="ego" depart="0.00" route="r0" distance="0 0" speedFactor="1.0600" state="2 0 0 5.10 0 0.00 1000 0 0" pos="5.10 0.10 0.00" speed="0.00 0.00" angle="0.00" posLat="0.00" waitingTime="100000 0"/>
     <lane id="SC_0">
         <vehicles value="ego"/>
     </lane>

diff --git a/tests/complex/traci/misc/rerouting/add_with_taz/vehroutes.complex b/tests/complex/traci/misc/rerouting/add_with_taz/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-03-11 13:41:07 by Eclipse SUMO sumo Version v1_12_0+1336-a87ef3e
+<!-- generated on 2023-06-07 10:28:41 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -27,22 +27,22 @@
     </report>
 
     <traci_server>
-        <remote-port value="39665"/>
+        <remote-port value="39184"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="toTAZ" depart="1.00" toTaz="A" arrival="26.00">
+    <vehicle id="toTAZ" type="toTAZ" depart="1.00" toTaz="A" arrival="26.00">
         <route edges="A3B3 B3C3 C3D3"/>
     </vehicle>
 
-    <vehicle id="fromTAZ" depart="1.00" fromTaz="A" arrival="34.00">
+    <vehicle id="fromTAZ" type="fromTAZ" depart="1.00" fromTaz="A" arrival="34.00">
         <route edges="D3C3 C3B3 B3A3 A3B3"/>
     </vehicle>
 
-    <vehicle id="betweenTAZ" depart="1.00" fromTaz="A" toTaz="C" arrival="49.00">
+    <vehicle id="betweenTAZ" type="betweenTAZ" depart="1.00" fromTaz="A" toTaz="C" arrival="49.00">
         <route edges="D3D2 D2D1 D1D0 D0C0 C0B0 B0A0"/>
     </vehicle>
 

diff --git a/tests/complex/traci/misc/rerouting/rerouteParkingArea_undeparted/vehroutes.complex b/tests/complex/traci/misc/rerouting/rerouteParkingArea_undeparted/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-12-09 10:13:14 by Eclipse SUMO sumo Version v1_11_0+0428-4b7701a
+<!-- generated on 2023-06-07 10:28:42 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -24,14 +24,14 @@
     </report>
 
     <traci_server>
-        <remote-port value="49933"/>
+        <remote-port value="45259"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="ego" depart="0.00" arrival="54.00">
+    <vehicle id="ego" type="ego" depart="0.00" arrival="54.00">
         <routeDistribution>
             <route replacedOnEdge="" reason="TraCI:parkingAreaReroute" replacedAtTime="0.00" probability="0" edges="A0A1 A1A2 A2A3"/>
             <route edges="A0A1 A1B1 B1B2 B2A2 A2A3"/>

diff --git a/tests/complex/traci/vehicle/add/add_internal/vehroutes.complex b/tests/complex/traci/vehicle/add/add_internal/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Feb 15 09:55:02 2021 by Eclipse SUMO sumo Version v1_8_0+1183-36cc35d
+<!-- generated on 2023-06-07 10:28:56 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -16,14 +16,14 @@
     </report>
 
     <traci_server>
-        <remote-port value="52967"/>
+        <remote-port value="36353"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="v_startInternal" depart="0.00" arrival="11.00">
+    <vehicle id="v_startInternal" type="v_startInternal" depart="0.00" arrival="11.00">
         <route edges=":C_11 CN"/>
     </vehicle>
 

diff --git a/tests/complex/traci/vehicle/add/attributes/vehroutes.complex b/tests/complex/traci/vehicle/add/attributes/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-03-11 13:40:50 by Eclipse SUMO sumo Version v1_12_0+1336-a87ef3e
+<!-- generated on 2023-06-07 10:28:56 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -17,14 +17,14 @@
     </report>
 
     <traci_server>
-        <remote-port value="46609"/>
+        <remote-port value="60751"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="tripTest" depart="0.00" departLane="1" departPos="3.00" departSpeed="5.00" arrivalLane="1" arrivalPos="20.00" arrivalSpeed="8.00" line="testLine" speedFactor="1.0600" arrival="19.00">
+    <vehicle id="tripTest" type="tripTest" depart="0.00" departLane="1" departPos="3.00" departSpeed="5.00" arrivalLane="1" arrivalPos="20.00" arrivalSpeed="8.00" line="testLine" speedFactor="1.0600" arrival="19.00">
         <route edges="SC CN NC"/>
     </vehicle>
 

diff --git a/tests/complex/traci/vehicle/setRoute_internal/vehroutes.complex b/tests/complex/traci/vehicle/setRoute_internal/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Feb 15 12:54:56 2021 by Eclipse SUMO sumo Version v1_8_0+1193-ffed992
+<!-- generated on 2023-06-07 10:28:59 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -16,14 +16,14 @@
     </report>
 
     <traci_server>
-        <remote-port value="33125"/>
+        <remote-port value="52624"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="ego" depart="0.00" arrival="24.00">
+    <vehicle id="ego" type="ego" depart="0.00" arrival="24.00">
         <routeDistribution>
             <route replacedOnEdge="SC" reason="traci:setRoute" replacedAtTime="11.00" probability="0" edges="SC CN"/>
             <route edges="SC CN NC"/>

diff --git a/tests/complex/traci/vehicle/vehicle/vehroutes.complex b/tests/complex/traci/vehicle/vehicle/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-03-11 13:41:20 by Eclipse SUMO sumo Version v1_12_0+1336-a87ef3e
+<!-- generated on 2023-06-07 10:28:57 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -11,7 +11,6 @@
 
     <output>
         <tripinfo-output value="tripinfo.xml"/>
-        <tripinfo-output.write-unfinished value="true"/>
         <tripinfo-output.write-undeparted value="true"/>
         <vehroute-output value="vehroutes.xml"/>
     </output>
@@ -28,7 +27,7 @@
     </report>
 
     <traci_server>
-        <remote-port value="38672"/>
+        <remote-port value="54418"/>
     </traci_server>
 
     <gui_only>
@@ -40,15 +39,15 @@
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="1" depart="6.00" departPos="0.00" arrival="19.00">
+    <vehicle id="1" type="1" depart="6.00" departPos="0.00" arrival="19.00">
         <routeDistribution>
             <route replacedOnEdge="" reason="traci:changeTarget" replacedAtTime="6.00" probability="0" edges="2fi 2si 1o 1fi 1si 3o 3fi 3si 4o 4fi 4si"/>
             <route edges="2fi 2si 4o 4fi"/>
         </routeDistribution>
         <stop lane="2fi_0" startPos="49.90" endPos="50.00" duration="1.00" parking="1"/>
     </vehicle>
 
-    <vehicle id="movedVeh" depart="125.00" departPos="0.00" arrival="130.00">
+    <vehicle id="movedVeh" type="movedVeh" depart="125.00" departPos="0.00" arrival="130.00">
         <routeDistribution>
             <route replacedOnEdge="1si" reason="traci:moveToXY" replacedAtTime="126.00" probability="0" edges="3fi 3si 4o"/>
             <route edges="1si"/>

diff --git a/tests/complex/traci/vehicle/vehicle_sublane/vehroutes.complex b/tests/complex/traci/vehicle/vehicle_sublane/vehroutes.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-03-11 13:41:20 by Eclipse SUMO sumo Version v1_12_0+1336-a87ef3e
+<!-- generated on 2023-06-07 10:28:57 by Eclipse SUMO sumo Version v1_17_0+0760-eaaf797
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -11,7 +11,6 @@
 
     <output>
         <tripinfo-output value="tripinfo.xml"/>
-        <tripinfo-output.write-unfinished value="true"/>
         <tripinfo-output.write-undeparted value="true"/>
         <vehroute-output value="vehroutes.xml"/>
     </output>
@@ -29,22 +28,22 @@
     </report>
 
     <traci_server>
-        <remote-port value="55714"/>
+        <remote-port value="60403"/>
     </traci_server>
 
 </configuration>
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="1" depart="6.00" departPos="0.00" arrival="19.00">
+    <vehicle id="1" type="1" depart="6.00" departPos="0.00" arrival="19.00">
         <routeDistribution>
             <route replacedOnEdge="" reason="traci:changeTarget" replacedAtTime="6.00" probability="0" edges="2fi 2si 1o 1fi 1si 3o 3fi 3si 4o 4fi 4si"/>
             <route edges="2fi 2si 4o 4fi"/>
         </routeDistribution>
         <stop lane="2fi_0" startPos="49.90" endPos="50.00" duration="1.00" parking="1"/>
     </vehicle>
 
-    <vehicle id="movedVeh" depart="125.00" departPos="0.00" arrival="130.00">
+    <vehicle id="movedVeh" type="movedVeh" depart="125.00" departPos="0.00" arrival="130.00">
         <routeDistribution>
             <route replacedOnEdge="1si" reason="traci:moveToXY" replacedAtTime="126.00" probability="0" edges="3fi 3si 4o"/>
             <route edges="1si"/>