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
palvarezlopez committed Jan 30, 2025
1 parent 611280d commit 3f694af
Show file tree
Hide file tree
Showing 19 changed files with 453 additions and 92 deletions.
6 changes: 3 additions & 3 deletions tests/netedit/basic/configs/netecfg/open/overwritte/yes/demands/meandatas.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:02:00 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<!-- generated on 2025-01-30 19:02:00 by Eclipse SUMO netedit Version v1_21_0+2145-88153401c0a
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 @@ -15,7 +15,7 @@ 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" excludeEmpty="defaults"/>
<edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
<!-- MeanDataLanes -->
<laneData id="meanDataLane" file="meanDataLaneOutput.xml" excludeEmpty="defaults"/>
<laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
</additional>
6 changes: 3 additions & 3 deletions tests/netedit/basic/configs/netecfg/open/overwritte/yes/meandatas/meandatas.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:02:41 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<!-- generated on 2025-01-30 19:03:22 by Eclipse SUMO netedit Version v1_21_0+2145-88153401c0a
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 @@ -15,7 +15,7 @@ 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" excludeEmpty="defaults"/>
<edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
<!-- MeanDataLanes -->
<laneData id="meanDataLane" file="meanDataLaneOutput.xml" excludeEmpty="defaults"/>
<laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
</additional>
8 changes: 8 additions & 0 deletions tests/netedit/basic/quit/additionals.add.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-07-04 11:01:18 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">

</additional>
8 changes: 8 additions & 0 deletions tests/netedit/basic/quit/datas.dat.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-07-04 11:02:15 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">

</data>
18 changes: 18 additions & 0 deletions tests/netedit/basic/quit/datas.med.add.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-09 14:10:25 by Eclipse SUMO netedit Version v1_21_0+1249-fd285aa0cd6
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">

</additional>
37 changes: 37 additions & 0 deletions tests/netedit/basic/quit/net.con.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:58 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="1"/>
</pedestrian>
</neteditConfiguration>
-->

<connections version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/connections_file.xsd">
<connection from="EdgeExternBot" to="EdgeExternTop" fromLane="0" toLane="0"/>

<connection from="EdgeExternTop" to="EdgeExternBot" fromLane="0" toLane="0"/>

</connections>
37 changes: 37 additions & 0 deletions tests/netedit/basic/quit/net.edg.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:58 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="1"/>
</pedestrian>
</neteditConfiguration>
-->

<edges version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
<location netOffset="0.00,0.00" convBoundary="-60.00,-30.00,60.00,30.00" origBoundary="-10000000000.000000,-10000000000.000000,10000000000.000000,10000000000.000000" projParameter="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"/>

<edge id="EdgeExternBot" from="JunctionExtern0" to="JunctionExtern1" priority="-1" numLanes="1" speed="8.00" shape="-60.00,0.00 -45.00,0.00 -45.00,-25.00 -40.00,-30.00 40.00,-30.00 45.00,-25.00 45.00,0.00 60.00,0.00" length="175.00" width="3.00" disallow="pedestrian"/>
<edge id="EdgeExternTop" from="JunctionExtern1" to="JunctionExtern0" priority="-1" numLanes="1" speed="8.00" shape="60.00,0.00 45.00,0.00 45.00,25.00 40.00,30.00 -40.00,30.00 -45.00,25.00 -45.00,0.00 -60.00,0.00" length="175.00" width="3.00" disallow="pedestrian"/>
</edges>
67 changes: 67 additions & 0 deletions tests/netedit/basic/quit/net.net.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:50 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</input>
<output>
<output-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</output>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="1"/>
</pedestrian>
</neteditConfiguration>
-->

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

<location netOffset="0.00,0.00" convBoundary="-60.00,-30.00,60.00,30.00" origBoundary="-10000000000.000000,-10000000000.000000,10000000000.000000,10000000000.000000" projParameter="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"/>

<edge id=":JunctionExtern0_0" function="internal">
<lane id=":JunctionExtern0_0_0" index="0" disallow="pedestrian" speed="3.53" length="4.38" width="3.00" shape="-60.00,1.50 -61.12,0.75 -61.50,0.00 -61.12,-0.75 -60.00,-1.50"/>
</edge>
<edge id=":JunctionExtern1_0" function="internal">
<lane id=":JunctionExtern1_0_0" index="0" disallow="pedestrian" speed="3.53" length="4.38" width="3.00" shape="60.00,-1.50 61.12,-0.75 61.50,0.00 61.12,0.75 60.00,1.50"/>
</edge>

<edge id="EdgeExternBot" from="JunctionExtern0" to="JunctionExtern1" priority="-1" length="175.00" shape="-60.00,0.00 -45.00,0.00 -45.00,-25.00 -40.00,-30.00 40.00,-30.00 45.00,-25.00 45.00,0.00 60.00,0.00">
<lane id="EdgeExternBot_0" index="0" disallow="pedestrian" speed="8.00" length="175.00" width="3.00" shape="-60.00,-1.50 -46.50,-1.50 -46.50,-25.62 -40.62,-31.50 40.62,-31.50 46.50,-25.62 46.50,-1.50 60.00,-1.50"/>
</edge>
<edge id="EdgeExternTop" from="JunctionExtern1" to="JunctionExtern0" priority="-1" length="175.00" shape="60.00,0.00 45.00,0.00 45.00,25.00 40.00,30.00 -40.00,30.00 -45.00,25.00 -45.00,0.00 -60.00,0.00">
<lane id="EdgeExternTop_0" index="0" disallow="pedestrian" speed="8.00" length="175.00" width="3.00" shape="60.00,1.50 46.50,1.50 46.50,25.62 40.62,31.50 -40.62,31.50 -46.50,25.62 -46.50,1.50 -60.00,1.50"/>
</edge>

<junction id="JunctionExtern0" type="priority" x="-60.00" y="0.00" incLanes="EdgeExternTop_0" intLanes=":JunctionExtern0_0_0" shape="-60.00,0.00 -60.00,3.00 -60.00,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="JunctionExtern1" type="priority" x="60.00" y="0.00" incLanes="EdgeExternBot_0" intLanes=":JunctionExtern1_0_0" shape="60.00,0.00 60.00,-3.00 60.00,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="EdgeExternBot" to="EdgeExternTop" fromLane="0" toLane="0" via=":JunctionExtern1_0_0" dir="t" state="M"/>
<connection from="EdgeExternTop" to="EdgeExternBot" fromLane="0" toLane="0" via=":JunctionExtern0_0_0" dir="t" state="M"/>

<connection from=":JunctionExtern0_0" to="EdgeExternBot" fromLane="0" toLane="0" dir="t" state="M"/>
<connection from=":JunctionExtern1_0" to="EdgeExternTop" fromLane="0" toLane="0" dir="t" state="M"/>

</net>
34 changes: 34 additions & 0 deletions tests/netedit/basic/quit/net.netccfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:58 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
-->

<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">

<input>
<node-files value="D:\SUMO\tests\netedit\basic\quit\net.nod.xml"/>
<edge-files value="D:\SUMO\tests\netedit\basic\quit\net.edg.xml"/>
<connection-files value="D:\SUMO\tests\netedit\basic\quit\net.con.xml"/>
<tllogic-files value="D:\SUMO\tests\netedit\basic\quit\net.tll.xml"/>
</input>

<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>

<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>

<pedestrian>
<walkingareas value="1"/>
</pedestrian>

</neteditConfiguration>
37 changes: 37 additions & 0 deletions tests/netedit/basic/quit/net.nod.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:58 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="1"/>
</pedestrian>
</neteditConfiguration>
-->

<nodes version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
<location netOffset="0.00,0.00" convBoundary="-60.00,-30.00,60.00,30.00" origBoundary="-10000000000.000000,-10000000000.000000,10000000000.000000,10000000000.000000" projParameter="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"/>

<node id="JunctionExtern0" x="-60.00" y="0.00" type="priority"/>
<node id="JunctionExtern1" x="60.00" y="0.00" type="priority"/>
</nodes>
33 changes: 33 additions & 0 deletions tests/netedit/basic/quit/net.tll.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-30 14:31:58 by Eclipse SUMO netedit Version v1_21_0+2140-a3a4c2d371c
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="D:\SUMO\tests\netedit\basic\quit\net.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="1"/>
</pedestrian>
</neteditConfiguration>
-->

<tlLogics version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tllogic_file.xsd">
</tlLogics>
32 changes: 21 additions & 11 deletions tests/netedit/basic/quit/no_saving/additionals/test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
netedit.createEdgeMode()

# Create two nodes
netedit.leftClick(referencePosition, netedit.positions.tmp)
netedit.leftClick(referencePosition, netedit.positions.tmp)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.right)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.right)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left)

# go to additional mode
netedit.additionalMode()
Expand All @@ -42,7 +44,7 @@
netedit.changeElement("busStop")

# create busStop in mode "reference left"
netedit.leftClick(referencePosition, netedit.positions.tmp)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.center, offsetY=20)

# go to demand mode
netedit.supermodeDemand()
Expand All @@ -51,17 +53,25 @@
netedit.routeMode()

# create route using three edges
netedit.leftClick(referencePosition, netedit.positions.tmp)
netedit.leftClick(referencePosition, netedit.positions.tmp)
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.center, offsetY=20)

# press enter to create route
netedit.typeEnter()

# save network
netedit.saveNetwork(True, referencePosition)
# Go to data supermode
netedit.supermodeData()

# save routes
netedit.saveDemandElements(True, referencePosition)
# change to edgeData
netedit.edgeData()

# quit netedit without saving additionals
netedit.quit(neteditProcess, False, False, True, False, False, False)
# create dataSet
netedit.createDataSet()

# create data interval
netedit.createDataInterval()

# create edgeData
netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.center, offsetY=20)

# quit netedit without saving
netedit.quit(neteditProcess, True, False, True, True, True, False, True, False)
Loading

0 comments on commit 3f694af

Please sign in to comment.