Updated netedit test. Refs #3045

eclipse-sumo · Jan 9, 2025 · 413259f · 413259f
1 parent 9f70137
commit 413259f
Show file tree

Hide file tree

Showing 20 changed files with 109 additions and 134 deletions.
diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
@@ -2392,8 +2392,8 @@ class inspectSelection:
         extensionEnable = 5
         extension = 6
         triggered = 7
-        expected = 8
-        join = 8
+        expected = 9
+        join = 9
         permitted = 9
         parking = 10
         actType = 12
@@ -2453,8 +2453,8 @@ class inspectSelection:
         extensionEnable = 5
         extension = 6
         triggered = 7
-        expected = 8
-        join = 8
+        expected = 9
+        join = 9
         permitted = 9
         parking = 10
         actType = 12
@@ -2516,14 +2516,14 @@ class inspectSelection:
         triggered = 7
         expected = 9
         join = 9
-        permitted = 10
-        parking = 11
-        actType = 13
-        tripID = 14
-        line = 15
-        onDemand = 16
-        jump = 17
-        split = 18
+        permitted = 9
+        parking = 10
+        actType = 12
+        tripID = 13
+        line = 14
+        onDemand = 15
+        jump = 16
+        split = 17
 
 # stop over charging station
 
@@ -2577,14 +2577,14 @@ class inspectSelection:
         triggered = 7
         expected = 9
         join = 9
-        permitted = 10
-        parking = 11
-        actType = 13
-        tripID = 14
-        line = 15
-        onDemand = 16
-        jump = 17
-        split = 18
+        permitted = 9
+        parking = 10
+        actType = 12
+        tripID = 13
+        line = 14
+        onDemand = 15
+        jump = 16
+        split = 17
 
 # stop over parkings
 
@@ -2706,14 +2706,14 @@ class inspectSelection:
         triggered = 9
         expected = 11
         join = 11
-        permitted = 12
-        parking = 13
-        actType = 15
-        tripID = 16
-        line = 17
-        onDemand = 18
-        jump = 19
-        split = 20
+        permitted = 11
+        parking = 12
+        actType = 14
+        tripID = 15
+        line = 16
+        onDemand = 17
+        jump = 18
+        split = 19
 
 # waypoint over bus stops
 
@@ -2758,14 +2758,17 @@ class inspectSelection:
         until = 4
         extensionEnable = 5
         extension = 6
-        permitted = 7
-        parking = 8
-        actType = 10
-        tripID = 11
-        line = 12
-        speed = 13
-        jump = 14
-        split = 15
+        triggered = 7
+        expected = 9
+        join = 9
+        permitted = 9
+        parking = 10
+        actType = 12
+        tripID = 13
+        line = 14
+        onDemand = 15
+        jump = 16
+        split = 17
 
 # waypoint over train stops
 
@@ -3718,7 +3721,7 @@ class inspectSelection:
         spacing = 12
         terminateOption = 14
         spacingOption = 15
-        parameters = 19
+        parameters = 18
 
 # PersonPlans
 

diff --git a/...netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit b/...netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2025-01-07 12:33:21 by Eclipse SUMO netedit Version v1_21_0+1701-5bbacf4f4a3
+<!-- generated on 2025-01-09 09:17:25 by Eclipse SUMO netedit Version v1_21_0+1766-3b56d85dd70
 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
@@ -15,7 +15,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
-    <personFlow id="pf_0" begin="0.00" end="3600.00" personsPerHour="12.5">
+    <personFlow id="pf_0" begin="0.00" end="3600.00" personsPerHour="26">
         <personTrip from="Edge0" to="Edge2"/>
     </personFlow>
 </routes>
diff --git a/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit b/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-25 11:10:05 by Eclipse SUMO netedit Version v1_18_0+0511-d8469bdc8ac
+<!-- generated on 2025-01-09 09:20:11 by Eclipse SUMO netedit Version v1_21_0+1766-3b56d85dd70
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+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
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- VTypes -->
-    <vType id="custom_vType" length="20.00" width="5.00" height="12.00" color="cyan"/>
+    <vType id="custom_vType" length="20.00" width="5.00" height="12.00" color="12,13,14"/>
     <!-- Routes -->
     <route id="r_0" edges="Edge0 Edge1 Edge2"/>
     <!-- Vehicles, persons and containers (sorted by depart) -->

diff --git a/tests/netedit/elements/demands/stop/busstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/stop/busstop/inspect_selection/routes.rou.xml
@@ -42,7 +42,7 @@
     </route>
 
     <route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
-        <stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
+        <stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="opportunistic" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
     </route>
 
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>

diff --git a/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/routes.rou.xml
@@ -43,7 +43,7 @@
     </flow>
 
     <flow id="flow_1" begin="0.00" end="36.00" number="18" from="EdgeCenter0" to="EdgeCenter1">
-        <stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
+        <stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="opportunistic" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
     </flow>
 
 </routes>
diff --git a/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/output.netedit
@@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 TestFunctions: Clicked over position 927 - 191
 ;;;;
 
-customTripID
+customSplit
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/routes.netedit
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-10 11:04:15 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2025-01-09 12:02:30 by Eclipse SUMO netedit Version v1_21_0+1768-9f701378744
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+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
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <flow id="flow_0" begin="0.00" from="Edge0" to="Edge2" end="36.00" number="18">
-        <stop chargingStation="chargingStationA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="customTripID" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
+        <stop chargingStation="chargingStationA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="customSplit" jump="4.00" actType="walking"/>
     </flow>
     <flow id="flow_1" begin="0.00" from="EdgeCenter0" to="EdgeCenter1" end="36.00" number="18">
-        <stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" expectedContainers="customTripID" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
+        <stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="customSplit" onDemand="1" jump="8.40" actType="singing"/>
     </flow>
 </routes>
diff --git a/tests/netedit/elements/demands/stop/containerstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/stop/containerstop/inspect_selection/routes.rou.xml
@@ -42,7 +42,7 @@
     </route>
 
     <route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
-        <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
+        <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="opportunistic" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
     </route>
 
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>

diff --git a/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/output.netedit
@@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 TestFunctions: Clicked over position 715 - 163
 ;;;;
 
-customTripID
+customSplit
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/routes.netedit
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-10 10:15:44 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2025-01-09 12:00:38 by Eclipse SUMO netedit Version v1_21_0+1768-9f701378744
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+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
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Routes -->
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow">
-        <stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="customTripID" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
+        <stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="customSplit" jump="4.00" actType="walking"/>
     </route>
     <route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
-        <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" expectedContainers="customTripID" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
+        <stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="customSplit" onDemand="1" jump="8.40" actType="singing"/>
     </route>
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>

diff --git a/tests/netedit/elements/demands/stop/lane/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/stop/lane/inspect_selection/routes.rou.xml
@@ -42,7 +42,7 @@
     </route>
 
     <route edges="Edge3 Edge4 Edge5" color="yellow" id="route_1">
-        <stop lane="Edge5_1" startPos="2.00" friendlyPos="1" posLat="20.00" endPos="5.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false" jump="8.4" split="splitB"/>
+        <stop lane="Edge5_1" startPos="2.00" friendlyPos="1" posLat="20.00" endPos="5.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="opportunistic" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false" jump="8.4" split="splitB"/>
     </route>
 
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>

diff --git a/tests/netedit/elements/demands/stop/trainstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/stop/trainstop/inspect_selection/routes.rou.xml
@@ -42,7 +42,7 @@
     </route>
 
     <route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
-        <stop trainStop="trainStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
+        <stop trainStop="trainStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="opportunistic" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true" jump="8.4" split="splitB"/>
     </route>
 
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>

diff --git a/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/output.netedit
@@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 TestFunctions: Clicked over position 1022 - 181
 ;;;;
 
-customTripID
+customSplit
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/routes.netedit
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-10 10:56:55 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2025-01-09 11:31:15 by Eclipse SUMO netedit Version v1_21_0+1768-9f701378744
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+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
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Routes -->
     <route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow">
-        <stop trainStop="trainStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="customTripID" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
+        <stop trainStop="trainStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="customSplit" jump="4.00" actType="walking"/>
     </route>
     <route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
-        <stop trainStop="trainStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" expectedContainers="customTripID" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
+        <stop trainStop="trainStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="customSplit" onDemand="1" jump="8.40" actType="singing"/>
     </route>
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>