From cf23bf601a0fa0372b7cabfe7b673899e4503af6 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Mon, 11 Mar 2024 09:30:16 +0100
Subject: [PATCH] patching expected netedit results refs #21

---
 .../errors.neteditcheckoutput                        |  2 --
 .../exitcode.neteditcheckoutput                      |  1 -
 .../default_stop_containerstop/routes.netedit        |  4 ++--
 .../errors.neteditcheckoutput                        |  2 --
 .../exitcode.neteditcheckoutput                      |  1 -
 .../default_stop_containerstop/routes.netedit        |  4 ++--
 .../triggered_container/errors.neteditcheckoutput    | 12 ++++++++++--
 7 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput
 delete mode 100644 tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput

diff --git a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
index 098123a73aea..e69de29bb2d1 100644
--- a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: A stop must be placed on a busStop, a chargingStation, an overheadWireSegment, a containerStop, a parkingArea, an edge or a lane in container 'c_0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
index 7099a4a6e64d..8cb647919054 100644
--- a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
+++ b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-16 08:36:24 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
+<!-- generated on 2024-03-11 09:14:35 by Eclipse SUMO netedit Version v1_19_0+1216-a22ee8bf50e
 -->
 
 <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) -->
     <container id="c_0" depart="0.00">
-        <stop fromContainerStop="containerStopA" duration="60.00"/>
+        <stop containerStop="containerStopA" duration="60.00"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
index c75f8b532c7c..e69de29bb2d1 100644
--- a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: A stop must be placed on a busStop, a chargingStation, an overheadWireSegment, a containerStop, a parkingArea, an edge or a lane in container 'cf_0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
index 25c735287802..006f55063710 100644
--- a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
+++ b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-16 08:36:33 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
+<!-- generated on 2024-03-11 09:19:18 by Eclipse SUMO netedit Version v1_19_0+1216-a22ee8bf50e
 -->
 
 <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) -->
     <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="1800">
-        <stop fromContainerStop="containerStopA" duration="60.00"/>
+        <stop containerStop="containerStopA" duration="60.00"/>
     </containerFlow>
 </routes>
diff --git a/tests/netedit/demandelements/stop/chargingstation/create/triggered_container/errors.neteditcheckoutput b/tests/netedit/demandelements/stop/chargingstation/create/triggered_container/errors.neteditcheckoutput
index da4e2c29f007..a94b84f1d3e3 100644
--- a/tests/netedit/demandelements/stop/chargingstation/create/triggered_container/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/stop/chargingstation/create/triggered_container/errors.neteditcheckoutput
@@ -2,7 +2,11 @@ Warning: Vehicle 'flow.0' ignores container triggered stop on lane 'Edge2_1' due
 Warning: Vehicle 'flow.1' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.2' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.3' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
-Warning: Vehicle 'flow.4' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
+Warning: Teleporting vehicle 'flow.4'; waited too long (jam), lane='Edge2_1', time=640.00.
+Warning: Vehicle 'flow.4' teleports beyond arrival edge 'Edge2', time=640.00.
+Warning: Vehicle 'flow.4' skips stop on lane 'Edge2_1' time=640.00.
+Warning: Vehicle 'flow.4' skips stop on lane 'Edge2_1' time=640.00.
+Warning: Vehicle 'flow.4' skips stop on lane 'Edge2_1' time=640.00.
 Warning: Vehicle 'flow.5' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.6' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.7' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
@@ -13,6 +17,10 @@ Warning: Vehicle 'flow.11' ignores container triggered stop on lane 'Edge2_1' du
 Warning: Vehicle 'flow.12' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.13' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.14' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
-Warning: Vehicle 'flow.15' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
+Warning: Teleporting vehicle 'flow.15'; waited too long (jam), lane='Edge2_1', time=1846.00.
+Warning: Vehicle 'flow.15' teleports beyond arrival edge 'Edge2', time=1846.00.
+Warning: Vehicle 'flow.15' skips stop on lane 'Edge2_1' time=1846.00.
+Warning: Vehicle 'flow.15' skips stop on lane 'Edge2_1' time=1846.00.
+Warning: Vehicle 'flow.15' skips stop on lane 'Edge2_1' time=1846.00.
 Warning: Vehicle 'flow.16' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.
 Warning: Vehicle 'flow.17' ignores container triggered stop on lane 'Edge2_1' due to capacity constraints.