diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py index 6a664b237dc..0ffbb124a66 100644 --- a/tests/netedit/attributesEnum.py +++ b/tests/netedit/attributesEnum.py @@ -2391,16 +2391,16 @@ class inspectSelection: extensionEnable = 5 extension = 6 triggered = 7 - expected = 9 - join = 9 - permitted = 10 - parking = 11 - actType = 13 - tripID = 14 - line = 15 - onDemand = 16 - jump = 17 - split = 18 + expected = 8 + join = 8 + permitted = 9 + parking = 10 + actType = 12 + tripID = 13 + line = 14 + onDemand = 15 + jump = 16 + split = 17 # stop over train stop @@ -2452,16 +2452,16 @@ class inspectSelection: extensionEnable = 5 extension = 6 triggered = 7 - expected = 9 - join = 9 - permitted = 10 - parking = 11 - actType = 13 - tripID = 14 - line = 15 - onDemand = 16 - jump = 17 - split = 18 + expected = 8 + join = 8 + permitted = 9 + parking = 10 + actType = 12 + tripID = 13 + line = 14 + onDemand = 15 + jump = 16 + split = 17 # stop over container stop diff --git a/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/output.netedit index ca121c8c31d..7a2555c0215 100644 --- a/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/output.netedit +++ b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/output.netedit @@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168 TestFunctions: Clicked over position 600 - 179 ;;;; -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/busstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/routes.netedit index 552ae1523ce..544fa825b33 100644 --- a/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/routes.netedit +++ b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/routes.netedit @@ -1,15 +1,25 @@ - - + - + diff --git a/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/test.py index 7452d970d86..49072a74a98 100644 --- a/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/test.py +++ b/tests/netedit/elements/demands/stop/busstop/inspect_selection/split/test.py @@ -44,13 +44,13 @@ netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop) # change value -netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, ";;;;", False) +netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, ";;;;", False) # change value -netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, "", False) +netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, "", False) # change value -netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, "customTripID", False) +netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, "customSplit", False) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/test.py b/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/test.py index 5a43a21b79c..ee2f0fb6855 100644 --- a/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/test.py +++ b/tests/netedit/elements/demands/stop/chargingstation/inspect_selection/split/test.py @@ -44,13 +44,13 @@ netedit.leftClick(referencePosition, netedit.positions.elements.demands.chargingStation) # change value -netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, ";;;;", False) +netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, ";;;;", False) # change value -netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, "", False) +netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, "", False) # change value -netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, "customTripID", False) +netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, "customSplit", False) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/test.py index 59de9601a07..fcdbd175931 100644 --- a/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/test.py +++ b/tests/netedit/elements/demands/stop/containerstop/inspect_selection/split/test.py @@ -44,13 +44,13 @@ netedit.leftClick(referencePosition, netedit.positions.elements.demands.containerStop) # change value -netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, ";;;;", False) +netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, ";;;;", False) # change value -netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, "", False) +netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, "", False) # change value -netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, "customTripID", False) +netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, "customSplit", False) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/stop/parkingarea/inspect_selection/split/test.py b/tests/netedit/elements/demands/stop/parkingarea/inspect_selection/split/test.py index 0c5904a1dd5..afb2f5ff7dd 100644 --- a/tests/netedit/elements/demands/stop/parkingarea/inspect_selection/split/test.py +++ b/tests/netedit/elements/demands/stop/parkingarea/inspect_selection/split/test.py @@ -44,13 +44,13 @@ netedit.leftClick(referencePosition, netedit.positions.elements.demands.parkingArea) # change value -netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, ";;;;", False) +netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, ";;;;", False) # change value -netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, "", False) +netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, "", False) # change value -netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, "customTripID", False) +netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, "customSplit", False) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/test.py index d3827bca503..eb6b9870dc2 100644 --- a/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/test.py +++ b/tests/netedit/elements/demands/stop/trainstop/inspect_selection/split/test.py @@ -44,13 +44,13 @@ netedit.leftClick(referencePosition, netedit.positions.elements.demands.trainStop) # change value -netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, ";;;;", False) +netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, ";;;;", False) # change value -netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, "", False) +netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, "", False) # change value -netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, "customTripID", False) +netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, "customSplit", False) # Check undo redo netedit.checkUndoRedo(referencePosition) diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..979968a8409 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..39e3c545cc8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..a203ec69518 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..ca121c8c31d --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 600 - 179 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..ef6e59833f2 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/routes.netedit @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/test.py new file mode 100644 index 00000000000..e253749a298 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.jump, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.jump, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.jump, "14", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) 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 eab2dfc2d29..3f33f8c3101 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 @@ -38,10 +38,10 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..979968a8409 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..39e3c545cc8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..a203ec69518 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..ca121c8c31d --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 600 - 179 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..ef6e59833f2 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/routes.netedit @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/test.py new file mode 100644 index 00000000000..2d71a0eeff7 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.split, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.split, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointBusStop.inspectSelection.split, "customSplit", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.netedit index 2f50e0b34a2..a495ea4a4df 100644 --- a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.netedit @@ -14,4 +14,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.neteditcheckoutput index fd9e92e00ab..a495ea4a4df 100644 --- a/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/busstop/inspect_selection/testsuite.neteditcheckoutput @@ -4,12 +4,6 @@ until extension - - - - - - permitted parking @@ -20,4 +14,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..255196cc523 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..e475aa308a3 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..850224ab496 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 927 - 191 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..5fd303bde8f --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/routes.netedit @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/test.py new file mode 100644 index 00000000000..dcfe30537cc --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.chargingStation) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.jump, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.jump, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.jump, "13", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) 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 3ba35a6b0cb..c16b0663dbb 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 @@ -40,10 +40,10 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..255196cc523 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..e475aa308a3 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..850224ab496 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 927 - 191 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..5fd303bde8f --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/routes.netedit @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/test.py new file mode 100644 index 00000000000..8b1a2173720 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.chargingStation) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.split, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.split, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointChargingStation.inspectSelection.split, "customSplit", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.netedit index f395229c4ab..01735fece0e 100644 --- a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.netedit @@ -14,4 +14,8 @@ speed line -tripid \ No newline at end of file +tripid + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.neteditcheckoutput index fde2f22079a..01735fece0e 100644 --- a/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/chargingstation/inspect_selection/testsuite.neteditcheckoutput @@ -4,12 +4,6 @@ until extension - - - - - - permitted parking @@ -20,4 +14,8 @@ speed line -tripid \ No newline at end of file +tripid + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..08d10e7a519 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..078835b8cf6 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..a203ec69518 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..282f2e768f3 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 715 - 163 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..ffa0cc94d61 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/routes.netedit @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/test.py new file mode 100644 index 00000000000..550cf45b77a --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.containerStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.jump, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.jump, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.jump, "12", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) 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 47d337dcfe0..3df2de83cce 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 @@ -38,10 +38,10 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..08d10e7a519 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..078835b8cf6 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/datas.netedit @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..a203ec69518 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..282f2e768f3 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 715 - 163 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..ffa0cc94d61 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/routes.netedit @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/test.py new file mode 100644 index 00000000000..17565923d67 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.containerStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.split, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.split, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointContainerStop.inspectSelection.split, "customSplit", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.netedit index f395229c4ab..01735fece0e 100644 --- a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.netedit @@ -14,4 +14,8 @@ speed line -tripid \ No newline at end of file +tripid + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.neteditcheckoutput index fde2f22079a..01735fece0e 100644 --- a/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/containerstop/inspect_selection/testsuite.neteditcheckoutput @@ -4,12 +4,6 @@ until extension - - - - - - permitted parking @@ -20,4 +14,8 @@ speed line -tripid \ No newline at end of file +tripid + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..7f1d42975ff --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..4fc7c83ca63 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..98c68474b5c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 719 - 198 +;;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..266fda6284c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/routes.netedit @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/test.py new file mode 100644 index 00000000000..24401ee920a --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.stopLane) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.jump, ";;;;;", True) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.jump, "", True) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.jump, "14", True) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/routes.rou.xml index 3c93e422b22..c1e09f4834e 100644 --- a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/routes.rou.xml @@ -38,11 +38,11 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..7f1d42975ff --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..4fc7c83ca63 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..98c68474b5c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 719 - 198 +;;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..266fda6284c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/routes.netedit @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/test.py new file mode 100644 index 00000000000..43fdf6cb6d8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.stopLane) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.split, ";;;;;", True) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.split, "", True) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointLane.inspectSelection.split, "customSplit", True) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.netedit index 97dc7131b3b..35f8762a35a 100644 --- a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.netedit @@ -18,4 +18,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.neteditcheckoutput index 2e4f702c228..35f8762a35a 100644 --- a/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/lane/inspect_selection/testsuite.neteditcheckoutput @@ -8,12 +8,6 @@ until extension - - - - - - permitted parking @@ -24,4 +18,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..50d629d4951 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..0600c67a75f --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..7c9e5e7e566 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/errors.neteditcheckoutput @@ -0,0 +1 @@ +Warning: Invalid departPos -1.00 given for vehicle 'vehicle_1'. Inserting at lane end instead. diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..9c7d6ba517e --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 829 - 163 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..8a46dda5c9c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/routes.netedit @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/test.py new file mode 100644 index 00000000000..4589b823e71 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.parkingArea) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.jump, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.jump, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.jump, "13", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/routes.rou.xml b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/routes.rou.xml index 024578421f5..3a3f75d3993 100644 --- a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/routes.rou.xml +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/routes.rou.xml @@ -39,11 +39,11 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..50d629d4951 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..0600c67a75f --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..7c9e5e7e566 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/errors.neteditcheckoutput @@ -0,0 +1 @@ +Warning: Invalid departPos -1.00 given for vehicle 'vehicle_1'. Inserting at lane end instead. diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..9c7d6ba517e --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 829 - 163 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..8a46dda5c9c --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/routes.netedit @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/test.py new file mode 100644 index 00000000000..68a6519f002 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.parkingArea) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.split, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.split, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointParking.inspectSelection.split, "customSplit", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.netedit index 5b349853a62..850d4665379 100644 --- a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.netedit @@ -12,4 +12,8 @@ tripid line -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.neteditcheckoutput index 8d6e6ed9a7c..850d4665379 100644 --- a/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/parkingarea/inspect_selection/testsuite.neteditcheckoutput @@ -4,12 +4,6 @@ until extension - - - - - - permitted acttype @@ -18,4 +12,8 @@ tripid line -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/additionals.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/additionals.netedit new file mode 100644 index 00000000000..5cf20223d1d --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/datas.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/datas.netedit new file mode 100644 index 00000000000..45282384d81 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/errors.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/log.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/meandatas.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/net.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/output.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/output.netedit new file mode 100644 index 00000000000..7c3b15dd6da --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 1022 - 181 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/routes.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/routes.netedit new file mode 100644 index 00000000000..6aacf306ccc --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/routes.netedit @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/test.py b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/test.py new file mode 100644 index 00000000000..2f1204fd91a --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/jump/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.trainStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.jump, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.jump, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.jump, "12", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) 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 74588753d4e..549784a3409 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 @@ -39,11 +39,11 @@ - + - + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/additionals.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/additionals.netedit new file mode 100644 index 00000000000..5cf20223d1d --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/additionals.netedit @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/datas.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/datas.netedit new file mode 100644 index 00000000000..45282384d81 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/errors.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/errors.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/errors.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/errors.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/guisettingsoutput.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/guisettingsoutput.netedit new file mode 100644 index 00000000000..32604708fd8 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/log.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/log.netedit new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/meandatas.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/meandatas.netedit new file mode 100644 index 00000000000..4817a589d55 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/meandatas.netedit @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/net.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/net.netedit new file mode 100644 index 00000000000..8e28adcf2f9 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/net.netedit @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/output.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/output.netedit new file mode 100644 index 00000000000..7c3b15dd6da --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/output.netedit @@ -0,0 +1,10 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Clicked over position 1022 - 181 +;;;; + +customTripID +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Clicked over position 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/output.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/output.neteditcheckoutput new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/routes.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/routes.netedit new file mode 100644 index 00000000000..6aacf306ccc --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/routes.netedit @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/test.py b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/test.py new file mode 100644 index 00000000000..afb610a1d70 --- /dev/null +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/split/test.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo +# Copyright (C) 2009-2024 German Aerospace Center (DLR) and others. +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/ +# This Source Code 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 + +# @file test.py +# @author Pablo Alvarez Lopez +# @date 2019-07-16 + +# import common functions for netedit tests +import os +import sys + +testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests') +neteditTestRoot = os.path.join( + os.environ.get('TEXTTEST_HOME', testRoot), 'netedit') +sys.path.append(neteditTestRoot) +import neteditTestFunctions as netedit # noqa + +# Open netedit +neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot) + +# go to demand mode +netedit.supermodeDemand() + +# go to select mode +netedit.selectMode() + +# select all using invert +netedit.selectionInvert() + +# go to inspect mode +netedit.inspectMode() + +# inspect selection +netedit.leftClick(referencePosition, netedit.positions.elements.demands.trainStop) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.split, ";;;;", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.split, "", False) + +# change value +netedit.modifyAttribute(netedit.attrs.waypointTrainStop.inspectSelection.split, "customSplit", False) + +# Check undo redo +netedit.checkUndoRedo(referencePosition) + +# save Netedit config +netedit.saveNeteditConfig(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.netedit b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.netedit index 2f50e0b34a2..a495ea4a4df 100644 --- a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.netedit +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.netedit @@ -14,4 +14,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file diff --git a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.neteditcheckoutput b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.neteditcheckoutput index fd9e92e00ab..a495ea4a4df 100644 --- a/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.neteditcheckoutput +++ b/tests/netedit/elements/demands/waypoint/trainstop/inspect_selection/testsuite.neteditcheckoutput @@ -4,12 +4,6 @@ until extension - - - - - - permitted parking @@ -20,4 +14,8 @@ line tripid -speed \ No newline at end of file +speed + +jump + +split \ No newline at end of file