From 25c981f177f1d3a5308f5a4c25aebb1a768f412c Mon Sep 17 00:00:00 2001
From: Pablo Alvarez Lopez <pablo.alvarezlopez@dlr.de>
Date: Fri, 10 Nov 2023 10:45:36 +0100
Subject: [PATCH] Patching netedit expected results. Refs #3045

---
 .../stop/containerstop/create/tripid/routes.netedit    |  4 ++--
 .../inspect_selection/jump/output.netedit              |  2 +-
 .../inspect_selection/jump/routes.netedit              |  6 +++---
 .../inspect_selection/split/output.netedit             |  2 +-
 .../inspect_selection/split/routes.netedit             |  6 +++---
 .../stop/trainstop/create/no_parent/routes.netedit     | 10 +++-------
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/tests/netedit/demandelements/stop/containerstop/create/tripid/routes.netedit b/tests/netedit/demandelements/stop/containerstop/create/tripid/routes.netedit
index 211bcb3daeb..458a3193a56 100644
--- a/tests/netedit/demandelements/stop/containerstop/create/tripid/routes.netedit
+++ b/tests/netedit/demandelements/stop/containerstop/create/tripid/routes.netedit
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-09 16:29:27 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2023-11-10 10:15:46 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
 -->
 
 <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) -->
     <trip id="trip" depart="0.00" from="Edge0" to="Edge2">
         <stop containerStop="containerStopA" duration="60.00"/>
-        <stop containerStop="containerStopA" duration="60.00"/>
+        <stop containerStop="containerStopA" duration="60.00" tripId="tripID"/>
     </trip>
 </routes>
diff --git a/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/output.netedit b/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/output.netedit
index a908899ebee..8925a71a484 100644
--- a/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/output.netedit
+++ b/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 679 - 180
+TestFunctions: Clicked over position 919 - 159
 dummyValue
 
 -5
diff --git a/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/routes.netedit b/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/routes.netedit
index 920555dcc76..1bcf4927cbe 100644
--- a/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/routes.netedit
+++ b/tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/routes.netedit
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-09 16:33:15 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2023-11-10 10:16:07 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
 -->
 
 <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 busStop="busStopA" duration="3.50" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" 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="splitA" jump="4.00" actType="walking"/>
     </route>
     <route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
-        <stop busStop="busStopB" duration="3.50" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" 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="splitB" 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/demandelements/stop/containerstop/inspect_selection/split/output.netedit b/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/output.netedit
index 4ba0210a12a..02047a4e3a1 100644
--- a/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/output.netedit
+++ b/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 679 - 180
+TestFunctions: Clicked over position 919 - 159
 ;;;;
 
 customTripID
diff --git a/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/routes.netedit b/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/routes.netedit
index a52a5cf0cda..685615cc186 100644
--- a/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/routes.netedit
+++ b/tests/netedit/demandelements/stop/containerstop/inspect_selection/split/routes.netedit
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-09 16:36:03 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2023-11-10 10:15:44 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
 -->
 
 <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 busStop="busStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="customTripID"/>
+        <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"/>
     </route>
     <route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
-        <stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="customTripID"/>
+        <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"/>
     </route>
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>
diff --git a/tests/netedit/demandelements/stop/trainstop/create/no_parent/routes.netedit b/tests/netedit/demandelements/stop/trainstop/create/no_parent/routes.netedit
index 2e7020de3a5..19aa06111b4 100644
--- a/tests/netedit/demandelements/stop/trainstop/create/no_parent/routes.netedit
+++ b/tests/netedit/demandelements/stop/trainstop/create/no_parent/routes.netedit
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-09 16:39:36 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
+<!-- generated on 2023-11-10 10:20:35 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
 -->
 
 <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="Edge3 Edge4 Edge5" color="yellow">
-        <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="splitA" 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" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
-    </route>
+    <route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
+    <route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <vehicle id="vehicle_0" depart="0.00" route="route_0"/>
     <vehicle id="vehicle_1" depart="0.00" route="route_1"/>