diff --git a/tests/netedit/neteditTestFunctions.py b/tests/netedit/neteditTestFunctions.py index 43fdd9b5d020..73802dd92bb1 100644 --- a/tests/netedit/neteditTestFunctions.py +++ b/tests/netedit/neteditTestFunctions.py @@ -1690,13 +1690,27 @@ def selectionRectangle(referencePosition, startX, startY, endX, endY): time.sleep(DELAY_SELECT) +def selectionApply(): + """ + @brief apply selection + """ + # focus current frame + focusOnFrame() + for _ in range(21): + typeTab() + # type space to select clear option + typeSpace() + # wait for gl debug + time.sleep(DELAY_SELECT) + + def selectionClear(): """ @brief clear selection """ # focus current frame focusOnFrame() - for _ in range(23): + for _ in range(24): typeTab() # type space to select clear option typeSpace() @@ -1710,7 +1724,7 @@ def selectionInvert(): """ # focus current frame focusOnFrame() - for _ in range(24): + for _ in range(25): typeTab() # type space to select invert operation typeSpace() @@ -1724,7 +1738,7 @@ def selectionClearDemand(): """ # focus current frame focusOnFrame() - for _ in range(25): + for _ in range(26): typeTab() # type space to select clear option typeSpace() @@ -1738,7 +1752,7 @@ def selectionInvertDemand(): """ # focus current frame focusOnFrame() - for _ in range(25): + for _ in range(27): typeTab() # type space to select invert operation typeSpace() diff --git a/tests/netedit/selection/basic/default_button/additionals.netedit b/tests/netedit/selection/basic/default_button/additionals.netedit new file mode 100644 index 000000000000..4c139e3af76d --- /dev/null +++ b/tests/netedit/selection/basic/default_button/additionals.netedit @@ -0,0 +1,65 @@ + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/errors.netedit b/tests/netedit/selection/basic/default_button/errors.netedit new file mode 100644 index 000000000000..5f6aa7b30659 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/errors.netedit @@ -0,0 +1,52 @@ +Debug: Selected item 'DEFAULT_PEDTYPE' in DemandElementSelector +Debug: Adding poly 'poly_0' into viewNet +Debug: Additionals has to be saved +Debug: Current saving Status: net saved, additionals unsaved, demand elements saved, data sets saved +Debug: Adding poly 'poly_1' into viewNet +Debug: Adding taz 'TAZ' into viewNet +Debug: Adding poiLane 'POI_0' into viewNet +Debug: Adding poiLane 'POI_1' into viewNet +Debug: Adding poi 'POI_2' into viewNet +Debug: Adding poi 'POI_3' into viewNet +Debug: net has to be saved +Debug: Current saving Status: net unsaved, additionals unsaved, demand elements saved, data sets saved +Debug: Setting new attribute selected 'true' into edge 'gneE1' +Debug: Key DEL (delete) pressed +Debug: Removing poiLane 'POI_0' from viewNet +Debug: Removing poiLane 'POI_1' from viewNet +Debug: Removing connection 'gneE0_0->gneE1_0' from edge 'gneE0' +Debug: net has to be saved +Debug: Current saving Status: net unsaved, additionals unsaved, demand elements saved, data sets saved +Debug: Setting new attribute modificationStatusNotForPrinting 'guessed' into edge 'gneE0' +Debug: invalidating (removing) connections of edge 'gneE0' due it were guessed +Debug: Setting new attribute modificationStatusNotForPrinting 'guessed' into junction 'gneJ1' +Debug: Removing connection 'gneE1_0->gneE0_0' from edge 'gneE1' +Debug: Setting new attribute modificationStatusNotForPrinting 'guessed' into edge 'gneE1' +Debug: invalidating (removing) connections of edge 'gneE1' due it were guessed +Debug: Setting new attribute modificationStatusNotForPrinting 'guessed' into junction 'gneJ0' +Debug: Removing edge 'gneE1' from net +Debug: Additionals saved +Debug: Deleting unreferenced edge 'gneE1' in GNEChange_Attribute +Debug: Deleting unreferenced lane 'gneE1_0' in GNEEdge destructor +Debug: Removing poi 'POI_3' from net in ~GNEChange_Shape() +Debug: Additionals has to be saved +Debug: Current saving Status: net saved, additionals unsaved, demand elements saved, data sets saved +Debug: delete poi 'POI_3' in ~GNEChange_Shape() +Debug: Removing poi 'POI_2' from net in ~GNEChange_Shape() +Debug: delete poi 'POI_2' in ~GNEChange_Shape() +Debug: delete poiLane 'POI_1' in ~GNEChange_Shape() +Debug: delete poiLane 'POI_0' in ~GNEChange_Shape() +Debug: Removing taz 'TAZ' from net in ~GNEChange_TAZElement() +Debug: delete taz 'TAZ' in ~GNEChange_TAZElement() +Debug: Removing poly 'poly_1' from net in ~GNEChange_Shape() +Debug: delete poly 'poly_1' in ~GNEChange_Shape() +Debug: Removing poly 'poly_0' from net in ~GNEChange_Shape() +Debug: delete poly 'poly_0' in ~GNEChange_Shape() +Debug: Deleting unreferenced edge 'gneE0' in AttributeCarriers destructor +Debug: Deleting unreferenced lane 'gneE0_0' in GNEEdge destructor +Debug: Deleting unreferenced junction 'gneJ0' in AttributeCarriers destructor +Debug: Deleting unreferenced junction 'gneJ1' in AttributeCarriers destructor +Debug: Deleting unreferenced vType 'DEFAULT_BIKETYPE' in AttributeCarriers destructor +Debug: Deleting unreferenced vType 'DEFAULT_VEHTYPE' in AttributeCarriers destructor +Debug: Deleting unreferenced pType 'DEFAULT_PEDTYPE' in AttributeCarriers destructor +Debug: Deleting net builder in GNENet destructor diff --git a/tests/netedit/selection/basic/default_button/errors.neteditcheckoutput b/tests/netedit/selection/basic/default_button/errors.neteditcheckoutput new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/selection/basic/default_button/gui-settings.xml b/tests/netedit/selection/basic/default_button/gui-settings.xml new file mode 100644 index 000000000000..812613ce9d12 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/gui-settings.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/tests/netedit/selection/basic/default_button/guisettingsoutput.netedit b/tests/netedit/selection/basic/default_button/guisettingsoutput.netedit new file mode 100644 index 000000000000..a6254b1b5e8f --- /dev/null +++ b/tests/netedit/selection/basic/default_button/guisettingsoutput.netedit @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_additionals.add.xml b/tests/netedit/selection/basic/default_button/input_additionals.add.xml new file mode 100644 index 000000000000..7f04ccbf7769 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_additionals.add.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.con.xml b/tests/netedit/selection/basic/default_button/input_net.con.xml new file mode 100644 index 000000000000..3122fa590f2f --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.con.xml @@ -0,0 +1,40 @@ + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.edg.xml b/tests/netedit/selection/basic/default_button/input_net.edg.xml new file mode 100644 index 000000000000..fd61b1a9080b --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.edg.xml @@ -0,0 +1,42 @@ + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.net.xml b/tests/netedit/selection/basic/default_button/input_net.net.xml new file mode 100644 index 000000000000..89cc68142c25 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.net.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.netccfg b/tests/netedit/selection/basic/default_button/input_net.netccfg new file mode 100644 index 000000000000..da1ac4c05999 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.netccfg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.nod.xml b/tests/netedit/selection/basic/default_button/input_net.nod.xml new file mode 100644 index 000000000000..5660affd0832 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.nod.xml @@ -0,0 +1,44 @@ + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/input_net.tll.xml b/tests/netedit/selection/basic/default_button/input_net.tll.xml new file mode 100644 index 000000000000..7d811cffad1f --- /dev/null +++ b/tests/netedit/selection/basic/default_button/input_net.tll.xml @@ -0,0 +1,40 @@ + + + + + + diff --git a/tests/netedit/selection/basic/default_button/log.netedit b/tests/netedit/selection/basic/default_button/log.netedit new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netedit/selection/basic/default_button/net.netedit b/tests/netedit/selection/basic/default_button/net.netedit new file mode 100644 index 000000000000..e3162cf30811 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/net.netedit @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + diff --git a/tests/netedit/selection/basic/default_button/output.netedit b/tests/netedit/selection/basic/default_button/output.netedit new file mode 100644 index 000000000000..ba08a4985286 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/output.netedit @@ -0,0 +1,4 @@ +TestFunctions: Netedit opened successfully +Finding reference +TestFunctions: 'reference.png' found. Position: 304 - 168 +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/selection/basic/default_button/output.neteditcheckoutput b/tests/netedit/selection/basic/default_button/output.neteditcheckoutput new file mode 100644 index 000000000000..02ab009c0e02 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/output.neteditcheckoutput @@ -0,0 +1 @@ +Loading configuration ... done. diff --git a/tests/netedit/selection/basic/default_button/sumo.sumocfg b/tests/netedit/selection/basic/default_button/sumo.sumocfg new file mode 100644 index 000000000000..0ee2afbc326a --- /dev/null +++ b/tests/netedit/selection/basic/default_button/sumo.sumocfg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tests/netedit/selection/basic/default_button/test.py b/tests/netedit/selection/basic/default_button/test.py new file mode 100644 index 000000000000..b39077fd07a8 --- /dev/null +++ b/tests/netedit/selection/basic/default_button/test.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo +# Copyright (C) 2009-2020 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 2016-11-25 + +# 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 select mode +netedit.selectMode() + +# select edges with speed < 10 and delete it (only one) +netedit.selectionApply() +netedit.deleteSelectedItems() + +# save network +netedit.saveNetwork(referencePosition) + +# save shapes +netedit.saveAdditionals(referencePosition) + +# quit netedit +netedit.quit(neteditProcess) diff --git a/tests/netedit/selection/basic/testsuite.netedit b/tests/netedit/selection/basic/testsuite.netedit index 2b93e870be02..fe6f63030c40 100644 --- a/tests/netedit/selection/basic/testsuite.netedit +++ b/tests/netedit/selection/basic/testsuite.netedit @@ -1,6 +1,9 @@ # default values of selection default +# default values of selection (button) +default_button + # select using click click diff --git a/tests/netedit/selection/basic/testsuite.neteditcheckoutput b/tests/netedit/selection/basic/testsuite.neteditcheckoutput index 2b93e870be02..fe6f63030c40 100644 --- a/tests/netedit/selection/basic/testsuite.neteditcheckoutput +++ b/tests/netedit/selection/basic/testsuite.neteditcheckoutput @@ -1,6 +1,9 @@ # default values of selection default +# default values of selection (button) +default_button + # select using click click