Skip to content

Commit

Permalink
Updated netedit tests. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Dec 13, 2024
1 parent 9c00d7d commit 65aca1c
Show file tree
Hide file tree
Showing 131 changed files with 8,721 additions and 75 deletions.

This file was deleted.

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

<!-- generated on 2024-12-13 12:39:26 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
This file 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
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- RouteProbes -->
<routeProbe id="rp_0" begin="0.00" period="3600.00" edge="-E10" file="rp_0.xml"/>
<routeProbe id="rp_1" begin="0.00" period="3600.00" edge="E7" file="rp_1.xml"/>
<routeProbe id="rp_2" begin="0.00" period="3600.00" edge="E6" file="rp_2.xml"/>
<routeProbe id="rp_3" begin="0.00" period="3600.00" edge="-E11" file="rp_3.xml"/>
<!-- Calibrators -->
<calibrator id="ca_0" edge="E10" pos="0.00"/>
<calibrator id="ca_1" edge="E6" pos="0.00"/>
<calibrator id="ca_2" edge="-E7" pos="0.00"/>
<calibrator id="ca_3" edge="-E11" pos="0.00"/>
<calibrator id="ca_5" lane="-E9_1" pos="1.00"/>
<calibrator id="ca_6" lane="E12_1" pos="1.00"/>
<!-- StoppingPlaces -->
<busStop id="bs_0" lane="-E1_1" startPos="4.80" endPos="14.80" lines="line1">
<access lane="-E1_0" pos="19.80"/>
</busStop>
<busStop id="bs_1" lane="E0_1" startPos="7.80" endPos="17.80" lines="line1">
<access lane="E0_0" pos="2.80"/>
</busStop>
<busStop id="bs_2" lane="-E0_1" startPos="4.80" endPos="14.80" lines="line2">
<access lane="-E0_0" pos="19.80"/>
</busStop>
<busStop id="bs_4" lane="E1_1" startPos="7.80" endPos="17.80" lines="line2">
<access lane="E1_0" pos="2.80"/>
</busStop>
<trainStop id="ts_0" lane="E5_0"/>
<trainStop id="ts_1" lane="E8_0"/>
<trainStop id="ts_2" lane="E4_0"/>
<trainStop id="ts_3" lane="E2_0"/>
<containerStop id="ct_0" lane="E10_0" startPos="4.80" endPos="14.80"/>
<containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
<containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
<containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
<parkingArea id="pa_0" lane="-E4_0">
<space x="-26.00" y="10.00"/>
</parkingArea>
<parkingArea id="pa_1" lane="-E2_0">
<space x="26.00" y="10.00"/>
</parkingArea>
<parkingArea id="pa_2" lane="-E8_0">
<space x="26.00" y="-18.00"/>
</parkingArea>
<parkingArea id="pa_3" lane="-E5_0">
<space x="-26.00" y="-18.00"/>
</parkingArea>
<chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
<chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
<chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
<chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
<!-- Detectors -->
<inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
<inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
<inductionLoop id="e1_2" lane="E1_1" pos="2.80" period="300.00" file="e1_2.xml"/>
<inductionLoop id="e1_8" lane="-E1_1" pos="19.80" period="300.00" file="e1_8.xml"/>
<instantInductionLoop id="e1i_0" lane="E12_1" pos="9.80" file="e1i_0.xml"/>
<instantInductionLoop id="e1i_1" lane="-E12_1" pos="2.80" file="e1i_1.xml"/>
<instantInductionLoop id="e1i_2" lane="E9_1" pos="2.80" file="e1i_2.xml"/>
<instantInductionLoop id="e1i_3" lane="-E9_1" pos="9.80" file="e1i_3.xml"/>
<laneAreaDetector id="e2_0" lane="E1_1" pos="7.80" length="10.00" period="300.00" file="e2_0.xml"/>
<laneAreaDetector id="e2_1" lane="-E1_1" pos="4.80" length="10.00" period="300.00" file="e2_1.xml"/>
<laneAreaDetector id="e2_2" lane="-E0_1" pos="4.80" length="10.00" period="300.00" file="e2_2.xml"/>
<laneAreaDetector id="e2_3" lane="E0_1" pos="7.80" length="10.00" period="300.00" file="e2_3.xml"/>
<laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
<laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
<entryExitDetector id="e3_0" pos="-22.00,14.00" period="300.00" file="e3_0.xml">
<detEntry lane="-E4_0" pos="4.80"/>
<detExit lane="E10_0" pos="19.80"/>
</entryExitDetector>
<entryExitDetector id="e3_1" pos="22.00,14.00" period="300.00" file="e3_1.xml">
<detEntry lane="-E2_0" pos="9.80"/>
<detExit lane="E11_0" pos="4.80"/>
</entryExitDetector>
<entryExitDetector id="e3_2" pos="22.00,-14.00" period="300.00" file="e3_2.xml">
<detEntry lane="-E8_0" pos="4.80"/>
<detExit lane="-E7_0" pos="19.80"/>
</entryExitDetector>
<entryExitDetector id="e3_3" pos="-22.00,-14.00" period="300.00" file="e3_3.xml">
<detEntry lane="-E5_0" pos="9.80"/>
<detExit lane="-E6_0" pos="4.80"/>
</entryExitDetector>
<!-- Other additionals -->
<rerouter id="rr_0" edges="E12" pos="-10.00,18.00"/>
<rerouter id="rr_1" edges="-E9" pos="10.00,-18.00"/>
<variableSpeedSign id="vs_1" lanes="-E5_0" pos="-22.00,-10.00"/>
<variableSpeedSign id="vs_2" lanes="-E2_0" pos="22.00,10.00"/>
<vaporizer id="-E10" begin="0.00" end="3600.00"/>
<vaporizer id="-E11" begin="0.00" end="3600.00"/>
<vaporizer id="E6" begin="0.00" end="3600.00"/>
<vaporizer id="E7" begin="0.00" end="3600.00"/>
<!-- Shapes -->
<poly id="po_0" color="red" fill="1" layer="0.00" shape="-12.000000,12.000000 -12.000000,8.000000 -8.000000,8.000000 -8.000000,12.000000 -12.000000,12.000000"/>
<poly id="po_1" color="red" fill="1" layer="0.00" shape="8.000000,12.000000 8.000000,8.000000 12.000000,8.000000 12.000000,12.000000 8.000000,12.000000"/>
<poly id="po_2" color="red" fill="1" layer="0.00" shape="8.000000,-8.000000 8.000000,-12.000000 12.000000,-12.000000 12.000000,-8.000000 8.000000,-8.000000"/>
<poly id="po_3" color="red" fill="1" layer="0.00" shape="-8.000000,-8.000000 -12.000000,-8.000000 -12.000000,-12.000000 -8.000000,-12.000000 -8.000000,-8.000000"/>
<poi id="poi_0" color="red" layer="202.00" x="-26.00" y="8.00"/>
<poi id="poi_1" color="red" layer="202.00" x="-26.00" y="-8.00"/>
<poi id="poi_10" color="red" layer="202.00" lon="0.000234" lat="-0.000180"/>
<poi id="poi_11" color="red" layer="202.00" lon="-0.000234" lat="-0.000180"/>
<poi id="poi_2" color="red" layer="202.00" x="26.00" y="-8.00"/>
<poi id="poi_3" color="red" layer="202.00" x="26.00" y="8.00"/>
<poi id="poi_4" color="red" layer="202.00" lane="E0_1" pos="20.80"/>
<poi id="poi_5" color="red" layer="202.00" lane="-E0_1" pos="1.80"/>
<poi id="poi_6" color="red" layer="202.00" lane="-E1_1" pos="1.80"/>
<poi id="poi_7" color="red" layer="202.00" lane="E1_1" pos="20.80"/>
<poi id="poi_8" color="red" layer="202.00" lon="-0.000234" lat="0.000180"/>
<poi id="poi_9" color="red" layer="202.00" lon="0.000234" lat="0.000180"/>
<!-- TAZs -->
<taz id="taz_0" shape="-18.00,-14.00 -18.00,-16.00 -8.00,-16.00 -8.00,-14.00 -18.00,-14.00" fill="1" color="green">
<tazSource id="-E0" weight="1.00"/>
<tazSink id="-E0" weight="1.00"/>
<tazSource id="-E6" weight="1.00"/>
<tazSink id="-E6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="8.00,-14.00 8.00,-16.00 18.00,-16.00 18.00,-14.00 8.00,-14.00" fill="1" color="green">
<tazSource id="-E7" weight="1.00"/>
<tazSink id="-E7" weight="1.00"/>
<tazSource id="E1" weight="1.00"/>
<tazSink id="E1" weight="1.00"/>
</taz>
<taz id="taz_2" shape="18.00,14.00 8.00,14.00 8.00,16.00 18.00,16.00 18.00,14.00" fill="1" color="green">
<tazSource id="-E1" weight="1.00"/>
<tazSink id="-E1" weight="1.00"/>
<tazSource id="E11" weight="1.00"/>
<tazSink id="E11" weight="1.00"/>
</taz>
<taz id="taz_3" shape="-8.00,14.00 -18.00,14.00 -18.00,16.00 -8.00,16.00 -8.00,14.00" fill="1" color="green">
<tazSource id="E0" weight="1.00"/>
<tazSink id="E0" weight="1.00"/>
<tazSource id="E10" weight="1.00"/>
<tazSink id="E10" weight="1.00"/>
</taz>
<!-- JuPedSim elements -->
<poly id="jps.walkable_area_0" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="-12.000000,-8.000000 -12.000000,-12.000000 -16.000000,-12.000000 -16.000000,-8.000000 -12.000000,-8.000000"/>
<poly id="jps.walkable_area_1" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="-12.000000,8.000000 -16.000000,8.000000 -16.000000,12.000000 -12.000000,12.000000 -12.000000,8.000000"/>
<poly id="jps.walkable_area_2" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="12.000000,8.000000 16.000000,8.000000 16.000000,12.000000 12.000000,12.000000 12.000000,8.000000"/>
<poly id="jps.walkable_area_4" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="12.000000,-8.000000 12.000000,-12.000000 16.000000,-12.000000 16.000000,-8.000000 12.000000,-8.000000"/>
<poly id="jps.obstacle_0" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="20.000000,12.000000 16.000000,12.000000 16.000000,8.000000 20.000000,8.000000 20.000000,12.000000"/>
<poly id="jps.obstacle_1" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="20.000000,-8.000000 16.000000,-8.000000 16.000000,-12.000000 20.000000,-12.000000 20.000000,-8.000000"/>
<poly id="jps.obstacle_2" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="-16.000000,-8.000000 -20.000000,-8.000000 -20.000000,-12.000000 -16.000000,-12.000000 -16.000000,-8.000000"/>
<poly id="jps.obstacle_3" type="jupedsim.obstacle" color="255,204,204" fill="1" layer="2.00" shape="-16.000000,12.000000 -20.000000,12.000000 -20.000000,8.000000 -16.000000,8.000000 -16.000000,12.000000"/>
</additional>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-13 10:36:39 by Eclipse SUMO netedit Version v1_21_0+1355-3ebc9d5fb49
<!-- generated on 2024-12-13 11:47:52 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-13 10:34:59 by Eclipse SUMO netedit Version v1_21_0+1355-3ebc9d5fb49
<!-- generated on 2024-12-13 11:47:52 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
Expand All @@ -14,4 +14,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- MeanDataEdges -->
<edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
<!-- MeanDataLanes -->
<laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
</additional>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
C:\Users\alva_pa\.texttest\tmp\netedit.gui.13Dec103141.20804\netedit.gui\basic\configs\netecfg\open\additionals
C:\Users\alva_pa\.texttest\tmp\netedit.gui.13Dec123324.18224\netedit.gui\basic\configs\netecfg\open\overwritte\cancel\additionals
additionals.add.xml
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-13 12:24:43 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
This file 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
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Routes -->
<route id="r_0" edges="E10 E11"/>
<route id="r_1" edges="-E7 -E6"/>
<route id="r_2" edges="-E2 -E8"/>
<route id="r_4" edges="-E5 -E4"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<trip id="t_0" depart="0.00" from="-E11" to="-E10"/>
<trip id="t_1" depart="0.00" fromJunction="J3" toJunction="J4"/>
<trip id="t_2" depart="0.00" fromTaz="taz_3" toTaz="taz_2"/>
<vehicle id="v_0" depart="0.00" route="r_4"/>
<vehicle id="v_1" depart="0.00">
<route edges="E4 E5"/>
</vehicle>
<flow id="f_0" begin="0.00" from="E6" to="E7" end="3600.00" vehsPerHour="100"/>
<flow id="f_1" begin="0.00" fromJunction="J5" toJunction="J7" end="3600.00" vehsPerHour="100"/>
<flow id="f_2" begin="0.00" fromTaz="taz_1" toTaz="taz_0" end="3600.00" vehsPerHour="100"/>
<person id="p_0" depart="0.00">
<personTrip from="-E1" to="E0"/>
</person>
<personFlow id="pf_0" begin="0.00" end="3600.00" personsPerHour="100">
<personTrip from="-E0" to="E1"/>
</personFlow>
<container id="c_0" depart="0.00">
<transport from="E12" to="E9"/>
</container>
<containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="100">
<transport from="-E9" to="-E12"/>
</containerFlow>
<flow id="f_3" begin="0.00" route="r_2" end="3600.00" vehsPerHour="100"/>
<flow id="f_4" begin="0.00" end="3600.00" vehsPerHour="100">
<route edges="E8 E2"/>
</flow>
</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/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)

# open additionals
netedit.openAdditionalsAs()

# type space
netedit.typeTab()
netedit.typeTab()
netedit.typeSpace()

# save Netedit config
netedit.saveNeteditConfig(referencePosition)

# quit netedit
netedit.quit(neteditProcess)
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-13 10:32:08 by Eclipse SUMO netedit Version v1_21_0+1355-3ebc9d5fb49
<!-- generated on 2024-12-13 12:40:30 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
Expand All @@ -14,4 +14,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
<interval id="set" begin="0.00" end="3600.00">
<edgeRelation from="-E0" to="E1"/>
<edgeRelation from="-E9" to="-E12"/>
<edgeRelation from="E12" to="E9"/>
<edgeRelation from="-E1" to="E0"/>
<edge id="E10"/>
<edge id="E11"/>
<edge id="-E6"/>
<edge id="-E7"/>
<edge id="-E8"/>
<edge id="-E2"/>
<edge id="-E4"/>
<edge id="-E5"/>
</interval>
</data>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-13 10:32:08 by Eclipse SUMO netedit Version v1_21_0+1355-3ebc9d5fb49
<!-- generated on 2024-12-13 11:49:18 by Eclipse SUMO netedit Version v1_21_0+1367-9c00d7d3b00
This data file 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
Expand All @@ -14,4 +14,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- MeanDataEdges -->
<edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
<!-- MeanDataLanes -->
<laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
</additional>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
C:\Users\alva_pa\.texttest\tmp\netedit.gui.13Dec103611.22532\netedit.gui\basic\configs\netecfg\open\datas
C:\Users\alva_pa\.texttest\tmp\netedit.gui.13Dec123324.18224\netedit.gui\basic\configs\netecfg\open\overwritte\cancel\datas
datas.dat.xml
TestFunctions: Netedit closed successfully
Loading

0 comments on commit 65aca1c

Please sign in to comment.