From 413259fa10f73769238172999053cf8cb7a60e4f Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Thu, 9 Jan 2025 12:19:02 +0100 Subject: [PATCH] Updated netedit test. Refs #3045 --- tests/netedit/attributesEnum.py | 77 ++++++++++--------- .../personsperhour/routes.netedit | 4 +- .../inspect/typebutton/routes.netedit | 14 +++- .../busstop/inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/split/output.netedit | 2 +- .../inspect_selection/split/routes.netedit | 16 +++- .../inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/split/output.netedit | 2 +- .../inspect_selection/split/routes.netedit | 16 +++- .../lane/inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/split/output.netedit | 2 +- .../inspect_selection/split/routes.netedit | 16 +++- .../demands/vehicle/load/route/errors.netedit | 73 +----------------- .../demands/vehicle/load/route/log.netedit | 3 +- .../busstop/inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/routes.rou.xml | 2 +- .../inspect_selection/routes.rou.xml | 2 +- 20 files changed, 109 insertions(+), 134 deletions(-) diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py index a9656b5ddd0..05884884321 100644 --- 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/tests/netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit b/tests/netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit index faf16f17a75..8ad9c604f72 100644 --- a/tests/netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit +++ b/tests/netedit/elements/demands/personflow/inspect/flow_attributes/personsperhour/routes.netedit @@ -1,6 +1,6 @@ - - + diff --git a/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit b/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit index 1447af50f22..a9f16db0fd1 100644 --- a/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit +++ b/tests/netedit/elements/demands/routeflow/inspect/typebutton/routes.netedit @@ -1,11 +1,21 @@ - - + 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 index 5bd248a0096..8e2796bb924 100644 --- 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 @@ - + 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 index b2bb664e697..3677d9af8f2 100644 --- 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 @@ - + 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 index 850224ab496..9c2564052dd 100644 --- 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 index de00e3324d2..97a146955a7 100644 --- 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 @@ - - + - + 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 index b01c1b33c8a..43f7962d766 100644 --- 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 @@ - + 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 index 282f2e768f3..c4a9d9345d9 100644 --- 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 index 685615cc186..2caff38f990 100644 --- 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 @@ - - + - + 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 index 1a18f9214ac..848e2ec51aa 100644 --- 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 @@ - + 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 index 38af53ae4be..754b15acc3b 100644 --- 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 @@ - + 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 index 7c3b15dd6da..2aa28b93192 100644 --- 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 index bd78d1d3943..4766bb5ea67 100644 --- 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 @@ - - + - + diff --git a/tests/netedit/elements/demands/vehicle/load/route/errors.netedit b/tests/netedit/elements/demands/vehicle/load/route/errors.netedit index 3f0aa7bffb9..86d61fb9499 100644 --- a/tests/netedit/elements/demands/vehicle/load/route/errors.netedit +++ b/tests/netedit/elements/demands/vehicle/load/route/errors.netedit @@ -1,73 +1,4 @@ -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) +Error: Could not build vehicle with ID 'vehicle_0' in netedit; Requiere either a route or an embedded route or a from-to attribute (Edges, junctions or TAZs). Error: Attribute 'route' in definition of vehicle 'vehicle_1' is empty. Error: Could not build vehicle with ID 'vehicle_2' in netedit; route parent with ID 'route with invalid characters' doesn't exist. -Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/vehicle/load/route/routes.rou.xml failed. -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) -'-avx512er' is not a recognized feature for this target (ignoring feature) -'-avx512pf' is not a recognized feature for this target (ignoring feature) +Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.09Jan093418.23264\netedit.gui\elements\demands\vehicle\load\route\routes.rou.xml failed. diff --git a/tests/netedit/elements/demands/vehicle/load/route/log.netedit b/tests/netedit/elements/demands/vehicle/load/route/log.netedit index a10d4e86573..86d61fb9499 100644 --- a/tests/netedit/elements/demands/vehicle/load/route/log.netedit +++ b/tests/netedit/elements/demands/vehicle/load/route/log.netedit @@ -1,3 +1,4 @@ +Error: Could not build vehicle with ID 'vehicle_0' in netedit; Requiere either a route or an embedded route or a from-to attribute (Edges, junctions or TAZs). Error: Attribute 'route' in definition of vehicle 'vehicle_1' is empty. Error: Could not build vehicle with ID 'vehicle_2' in netedit; route parent with ID 'route with invalid characters' doesn't exist. -Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/vehicle/load/route/routes.rou.xml failed. +Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.09Jan093418.23264\netedit.gui\elements\demands\vehicle\load\route\routes.rou.xml failed. diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/routes.rou.xml index 3f33f8c3101..0f6e43f2453 100644 --- a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/routes.rou.xml @@ -42,6 +42,6 @@ - + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/routes.rou.xml index c16b0663dbb..feeb8aab85f 100644 --- a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/routes.rou.xml @@ -44,6 +44,6 @@ - + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/routes.rou.xml index 3df2de83cce..041e37de4ff 100644 --- a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/routes.rou.xml @@ -42,6 +42,6 @@ - + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/routes.rou.xml index 549784a3409..e0a8420b32d 100644 --- a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/routes.rou.xml @@ -43,7 +43,7 @@ - +