Skip to content

Commit

Permalink
Patching Netedit expected results. Refs eclipse-sumo#3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Oct 21, 2019
1 parent 138079c commit dc494f3
Show file tree
Hide file tree
Showing 33 changed files with 862 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 21.10.2019 15:48:48 by Eclipse SUMO netedit Version v1_3_1+0658-138079c8e6
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\input_net.net.xml"/>
</input>
<output>
<output-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\net.net.xml"/>
</output>
<processing>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
<netedit>
<additional-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\additionals.xml"/>
<additionals-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\additionals.xml"/>
<route-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\routes.xml"/>
<demandelements-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\routes.xml"/>
</netedit>
<visualisation>
<gui-settings-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\gui-settings.xml"/>
<window-size value="700,500"/>
<window-pos value="50,50"/>
<gui-testing value="true"/>
<gui-testing-debug value="true"/>
</visualisation>
<report>
<no-warnings value="true"/>
<error-log value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.21Oct154823.5456\netedit.gui\additionalElements\busstop\create\id\log.txt"/>
</report>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<busStop id="busStop_gneE0_0_0" lane="gneE0_0" startPos="17.00" endPos="27.00"/>
<busStop id="custom_ID" lane="gneE0_0" startPos="17.00" endPos="27.00"/>
</additional>
51 changes: 51 additions & 0 deletions tests/netedit/additionalElements/busstop/create/id/errors.netedit
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
Debug: Selected item 'DEFAULT_VEHTYPE' in DemandElementSelector
Debug: Selected item 'DEFAULT_PEDTYPE' in DemandElementSelector
Debug: net has to be saved
Debug: Current saving Status: net unsaved, additionals saved, demand elements saved
Debug: Selected item 'busStop' in TagSelector
Debug: Selected item 'busStop' in TagSelector
Debug: ObjectsUnderCursor: GUIGlObjects: 1, AttributeCarriers: 1, NetElements: 1, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 1, Lanes: 1, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Format of optional positive optional integer attribute 'personCapacity' of busStop with ID 'busStop_gneE0_0_0' is invalid; Cannot be negative; Default value will be used.
Debug: Adding busStop 'busStop_gneE0_0_0' in GNEChange_Additional
Debug: Additionals has to be saved
Debug: Current saving Status: net saved, additionals unsaved, demand elements saved
Debug: ObjectsUnderCursor: GUIGlObjects: 1, AttributeCarriers: 1, NetElements: 1, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 1, Lanes: 1, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Format of optional positive optional integer attribute 'personCapacity' of busStop is invalid; Cannot be negative; Default value will be used.
Debug: ObjectsUnderCursor: GUIGlObjects: 1, AttributeCarriers: 1, NetElements: 1, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 1, Lanes: 1, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Format of optional positive optional integer attribute 'personCapacity' of busStop with ID 'busStop_gneE0_0_0' is invalid; Cannot be negative; Default value will be used.
Debug: ObjectsUnderCursor: GUIGlObjects: 1, AttributeCarriers: 1, NetElements: 1, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 1, Lanes: 1, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Format of optional positive optional integer attribute 'personCapacity' of busStop with ID 'custom_ID' is invalid; Cannot be negative; Default value will be used.
Debug: Adding busStop 'custom_ID' in GNEChange_Additional
Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Keys Ctrl+Z (Undo) pressed
Debug: Calling GNEUndoList::undo()
Debug: Removing busStop 'custom_ID' in GNEChange_Additional
Debug: Keys Ctrl+Z (Undo) pressed
Debug: Calling GNEUndoList::undo()
Debug: Removing busStop 'busStop_gneE0_0_0' in GNEChange_Additional
Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
Debug: Keys Ctrl+Y (Redo) pressed
Debug: Calling GNEUndoList::redo()
Debug: Adding busStop 'busStop_gneE0_0_0' in GNEChange_Additional
Debug: Keys Ctrl+Y (Redo) pressed
Debug: Calling GNEUndoList::redo()
Debug: Adding busStop 'custom_ID' in GNEChange_Additional
Debug: Additionals saved
Debug: Created connection 'fromgneE0_0togneE1_0' in retrieveGNEConnection()
Debug: Created connection 'fromgneE1_0togneE0_0' in retrieveGNEConnection()
Debug: Deleting unreferenced busStop 'custom_ID'
Debug: Additionals has to be saved
Debug: Current saving Status: net saved, additionals unsaved, demand elements saved
Debug: Deleting unreferenced busStop 'busStop_gneE0_0_0'
Debug: Deleting unreferenced edge 'gneE0' in GNENet destructor
Debug: Deleting unreferenced lane 'gneE0_0' in GNEEdge destructor
Debug: Deleting unreferenced connection 'fromgneE0_0togneE1_0' in GNEEdge destructor
Debug: Deleting unreferenced edge 'gneE1' in GNENet destructor
Debug: Deleting unreferenced lane 'gneE1_0' in GNEEdge destructor
Debug: Deleting unreferenced connection 'fromgneE1_0togneE0_0' in GNEEdge destructor
Debug: Deleting unreferenced junction 'gneJ0' in GNENet destructor
Debug: Deleting unreferenced junction 'gneJ1' in GNENet destructor
Debug: Deleting unreferenced vType 'DEFAULT_BIKETYPE' in GNENet destructor
Debug: Deleting unreferenced vType 'DEFAULT_VEHTYPE' in GNENet destructor
Debug: Deleting unreferenced pType 'DEFAULT_PEDTYPE' in GNENet destructor
Debug: Deleting net builder in GNENet destructor
Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Warning: Format of essential unique string attribute 'id' of busStop is invalid; ID contains invalid characters; busStop cannot be created
Warning: There is another busStop with the same ID='busStop_gneE0_0_0'.
92 changes: 92 additions & 0 deletions tests/netedit/additionalElements/busstop/create/id/net.netedit
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 03.09.2018 08:57:05 by Eclipse SUMO netedit Version d6cfaccbb6
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\input_net.net.xml"/>
</input>
<output>
<output-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\net.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
<netedit>
<additionals-output value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\additionals.xml"/>
<shapes-output value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\shapes.xml"/>
</netedit>
<visualisation>
<gui-settings-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\gui-settings.xml"/>
<window-size value="700,500"/>
<window-pos value="50,50"/>
<gui-testing value="true"/>
<gui-testing-debug value="true"/>
<gui-testing-debug-gl value="true"/>
</visualisation>
<report>
<no-warnings value="true"/>
<error-log value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.03Sep085138.2804/netedit.gui/additionalElements/busstop/create\log.txt"/>
</report>
</configuration>
-->

<net version="1.3" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="25.00,0.00" convBoundary="0.00,0.00,50.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":gneJ0_0" function="internal">
<lane id=":gneJ0_0_0" index="0" speed="3.65" length="4.67" shape="0.00,1.60 -1.20,0.80 -1.60,0.00 -1.20,-0.80 0.00,-1.60"/>
</edge>
<edge id=":gneJ1_0" function="internal">
<lane id=":gneJ1_0_0" index="0" speed="3.65" length="4.67" shape="50.00,-1.60 51.20,-0.80 51.60,0.00 51.20,0.80 50.00,1.60"/>
</edge>

<edge id="gneE0" from="gneJ0" to="gneJ1" priority="1">
<lane id="gneE0_0" index="0" speed="13.89" length="50.00" shape="0.00,-1.60 50.00,-1.60"/>
</edge>
<edge id="gneE1" from="gneJ1" to="gneJ0" priority="1">
<lane id="gneE1_0" index="0" speed="13.89" length="50.00" shape="50.00,1.60 0.00,1.60"/>
</edge>

<tlLogic id="gneJ0" type="static" programID="0" offset="0">
<phase duration="87" state="G"/>
<phase duration="3" state="y"/>
</tlLogic>
<tlLogic id="gneJ1" type="static" programID="0" offset="0">
<phase duration="87" state="G"/>
<phase duration="3" state="y"/>
</tlLogic>

<junction id="gneJ0" type="traffic_light" x="0.00" y="0.00" incLanes="gneE1_0" intLanes=":gneJ0_0_0" shape="0.00,0.00 0.00,3.20 0.00,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="gneJ1" type="traffic_light" x="50.00" y="0.00" incLanes="gneE0_0" intLanes=":gneJ1_0_0" shape="50.00,0.00 50.00,-3.20 50.00,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="gneE0" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_0_0" tl="gneJ1" linkIndex="0" dir="t" state="O"/>
<connection from="gneE1" to="gneE0" fromLane="0" toLane="0" via=":gneJ0_0_0" tl="gneJ0" linkIndex="0" dir="t" state="O"/>

<connection from=":gneJ0_0" to="gneE0" fromLane="0" toLane="0" dir="t" state="M"/>
<connection from=":gneJ1_0" to="gneE1" fromLane="0" toLane="0" dir="t" state="M"/>

</net>
14 changes: 14 additions & 0 deletions tests/netedit/additionalElements/busstop/create/id/output.netedit
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
busStop
TestFunctions: Clicked over position 554 - 418
;;;;;;;;;;;;;;;;
TestFunctions: Clicked over position 554 - 418
busStop_gneE0_0_0
TestFunctions: Clicked over position 554 - 418
custom_ID
TestFunctions: Clicked over position 554 - 418
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
70 changes: 70 additions & 0 deletions tests/netedit/additionalElements/busstop/create/id/test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#!/usr/bin/env python
# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.org/sumo
# Copyright (C) 2009-2019 German Aerospace Center (DLR) and others.
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v20.html
# SPDX-License-Identifier: EPL-2.0

# @file test.py
# @author Pablo Alvarez Lopez
# @date 2016-11-25
# @version $Id$

# 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 additional mode
netedit.additionalMode()

# select busStop
netedit.changeElement("busStop")

# create busStop in mode "reference left"
netedit.leftClick(referencePosition, 250, 250)

# enable ID
netedit.changeDefaultBoolValue(2)

# set invalid ID (duplicated
netedit.changeDefaultValue(3, ";;;;;;;;;;;;;;;;")

# create busStop in mode "reference left"
netedit.leftClick(referencePosition, 250, 250)

# set invalid ID (duplicated
netedit.changeDefaultValue(3, "busStop_gneE0_0_0")

# create busStop in mode "reference left"
netedit.leftClick(referencePosition, 250, 250)

# set invalid ID (duplicated
netedit.changeDefaultValue(3, "custom_ID")

# create busStop in mode "reference left"
netedit.leftClick(referencePosition, 250, 250)

# Check undo redo
netedit.undo(referencePosition, 2)
netedit.redo(referencePosition, 2)

# save additionals
netedit.saveAdditionals(referencePosition)

# save network
netedit.saveNetwork(referencePosition)

# quit netedit
netedit.quit(neteditProcess)

Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 21.10.2019 16:00:21 by Eclipse SUMO netedit Version v1_3_1+0658-138079c8e6
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\input_net.net.xml"/>
</input>
<output>
<output-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\net.net.xml"/>
</output>
<processing>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
<netedit>
<additional-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\additionals.xml"/>
<additionals-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\additionals.xml"/>
<route-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\routes.xml"/>
<demandelements-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\routes.xml"/>
</netedit>
<visualisation>
<gui-settings-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\gui-settings.xml"/>
<window-size value="700,500"/>
<window-pos value="50,50"/>
<gui-testing value="true"/>
<gui-testing-debug value="true"/>
</visualisation>
<report>
<no-warnings value="true"/>
<error-log value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.2_from_21Okt155643.10384\netedit.gui\additionalElements\chargingstation\create\id\log.txt"/>
</report>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<chargingStation id="chargingStation_0" lane="gneE0_0" startPos="17.00" endPos="27.00"/>
<chargingStation id="custom_ID" lane="gneE0_0" startPos="17.00" endPos="27.00"/>
</additional>
Loading

0 comments on commit dc494f3

Please sign in to comment.