Skip to content

Commit

Permalink
Added netedit new tests. Refs #14347 and #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Feb 23, 2024
1 parent 719dc32 commit 1c58ed6
Show file tree
Hide file tree
Showing 13 changed files with 478 additions and 0 deletions.
@@ -0,0 +1,11 @@
<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">

<rerouter id="rerouter_0" edges="center0 center1" pos="0.00,10.00" optional=""/>

<rerouter id="rerouter_1" edges="center0 center1" pos="10.00,10.00" optional="dummyOff"/>

<rerouter id="rerouter_2" edges="center0 center1" pos="40.00,-10.00" optional="false"/>

<rerouter id="rerouter_3" edges="center0 center1" pos="50.00,-10.00" optional="true"/>

</additional>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-23 02:37:45 by Eclipse SUMO netedit Version v1_19_0+0968-888aa7a1377
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- Other additionals -->
<rerouter id="rerouter_2" edges="center0 center1" pos="40.00,-10.00"/>
<rerouter id="rerouter_3" edges="center0 center1" pos="50.00,-10.00" optional="1"/>
</additional>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-04-18 13:46:01 by Eclipse SUMO netedit Version v1_16_0+2149-f5731f702e4
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
<interval id="dataSet" begin="0.00" end="3600.00">
<edge id="top"/>
<edge id="center0"/>
<edge id="center1"/>
<edge id="bot"/>
</interval>
</data>
@@ -0,0 +1,3 @@
Error: Attribute 'optional' in definition of rerouter 'rerouter_0' is empty.
Error: Attribute 'optional' in definition of rerouter 'rerouter_1' Invalid Bool Format dummyoff.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.23Feb023717.15452\netedit.gui\additionalelements\rerouter\load\optional\additionals.add.xml failed.
Empty file.

Large diffs are not rendered by default.

@@ -0,0 +1,3 @@
Error: Attribute 'optional' in definition of rerouter 'rerouter_0' is empty.
Error: Attribute 'optional' in definition of rerouter 'rerouter_1' Invalid Bool Format dummyoff.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.23Feb023717.15452\netedit.gui\additionalelements\rerouter\load\optional\additionals.add.xml failed.
195 changes: 195 additions & 0 deletions tests/netedit/additionalelements/rerouter/load/optional/net.netedit
@@ -0,0 +1,195 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-07-06 12:05:46 by Eclipse SUMO netedit Version v1_18_0+0135-de86dee393d
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<additional-files value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/additionals.add.xml"/>
<route-files value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/routes.rou.xml"/>
<data-files value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/datas.dat.xml"/>
<sumo-net-file value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/net.net.xml"/>
</input>
<output>
<output-file value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/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-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
<visualisation>
<gui-settings-file value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/gui-settings.xml"/>
<window-size value="1280, 720"/>
<window-pos value="50,50"/>
<gui-testing value="true"/>
<gui-testing.setting-output value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/guisettingsoutput.xml"/>
</visualisation>
<report>
<no-warnings value="true"/>
<error-log value="/home/palcraft/.texttest/tmp/netedit.daily.additional.basic.06Jul112909.2107/netedit.daily.additional.basic/additionalelements/rerouter/load/off/log.txt"/>
</report>
</configuration>
-->

<net version="1.16" 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="-25.00,-15.00,25.00,15.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":JB0_0" function="internal">
<lane id=":JB0_0_0" index="0" disallow="pedestrian" speed="6.51" length="9.03" shape="-26.60,-11.00 -26.25,-13.45 -25.20,-15.20 -23.45,-16.25 -21.00,-16.60"/>
</edge>
<edge id=":JB1_0" function="internal">
<lane id=":JB1_0_0" index="0" disallow="pedestrian" speed="6.51" length="9.03" shape="21.00,-16.60 23.45,-16.25 25.20,-15.20 26.25,-13.45 26.60,-11.00"/>
</edge>
<edge id=":JC0_0" function="internal">
<lane id=":JC0_0_0" index="0" disallow="pedestrian" speed="13.89" length="15.80" shape="-26.60,7.90 -26.60,-7.90"/>
</edge>
<edge id=":JC0_1" function="internal">
<lane id=":JC0_1_0" index="0" disallow="pedestrian" speed="7.88" length="13.71" shape="-26.60,7.90 -26.41,2.34 -25.83,-1.63 -24.86,-4.01 -23.50,-4.80"/>
<lane id=":JC0_1_1" index="1" disallow="pedestrian" speed="7.02" length="10.69" shape="-26.60,7.90 -26.41,3.74 -25.83,0.78 -24.86,-1.01 -23.50,-1.60"/>
</edge>
<edge id=":JC0_3" function="internal">
<lane id=":JC0_3_0" index="0" disallow="pedestrian" speed="7.88" length="13.71" shape="-23.50,4.80 -24.86,4.01 -25.82,1.63 -26.41,-2.34 -26.60,-7.90"/>
</edge>
<edge id=":JC0_4" function="internal">
<lane id=":JC0_4_0" index="0" disallow="pedestrian" speed="3.65" length="4.67" shape="-23.50,1.60 -24.70,0.80 -25.10,0.00 -24.70,-0.80 -23.50,-1.60"/>
</edge>
<edge id=":JC1_0" function="internal">
<lane id=":JC1_0_0" index="0" disallow="pedestrian" speed="13.89" length="15.80" shape="26.60,-7.90 26.60,7.90"/>
</edge>
<edge id=":JC1_1" function="internal">
<lane id=":JC1_1_0" index="0" disallow="pedestrian" speed="7.88" length="13.71" shape="26.60,-7.90 26.41,-2.34 25.83,1.63 24.86,4.01 23.50,4.80"/>
<lane id=":JC1_1_1" index="1" disallow="pedestrian" speed="7.02" length="10.69" shape="26.60,-7.90 26.41,-3.74 25.83,-0.78 24.86,1.01 23.50,1.60"/>
</edge>
<edge id=":JC1_3" function="internal">
<lane id=":JC1_3_0" index="0" disallow="pedestrian" speed="7.88" length="13.71" shape="23.50,-4.80 24.86,-4.01 25.82,-1.63 26.41,2.34 26.60,7.90"/>
</edge>
<edge id=":JC1_4" function="internal">
<lane id=":JC1_4_0" index="0" disallow="pedestrian" speed="3.65" length="4.67" shape="23.50,-1.60 24.70,-0.80 25.10,0.00 24.70,0.80 23.50,1.60"/>
</edge>
<edge id=":JT0_0" function="internal">
<lane id=":JT0_0_0" index="0" disallow="pedestrian" speed="6.51" length="9.03" shape="-21.00,16.60 -23.45,16.25 -25.20,15.20 -26.25,13.45 -26.60,11.00"/>
</edge>
<edge id=":JT1_0" function="internal">
<lane id=":JT1_0_0" index="0" disallow="pedestrian" speed="6.51" length="9.03" shape="26.60,11.00 26.25,13.45 25.20,15.20 23.45,16.25 21.00,16.60"/>
</edge>

<edge id="E0" from="JT0" to="JC0" priority="-1">
<lane id="E0_0" index="0" allow="pedestrian" speed="13.89" length="3.10" width="2.00" shape="-29.20,11.00 -29.20,7.90"/>
<lane id="E0_1" index="1" disallow="pedestrian" speed="13.89" length="3.10" shape="-26.60,11.00 -26.60,7.90"/>
</edge>
<edge id="E1" from="JC0" to="JB0" priority="-1">
<lane id="E1_0" index="0" allow="pedestrian" speed="13.89" length="3.10" width="2.00" shape="-29.20,-7.90 -29.20,-11.00"/>
<lane id="E1_1" index="1" disallow="pedestrian" speed="13.89" length="3.10" shape="-26.60,-7.90 -26.60,-11.00"/>
</edge>
<edge id="E4" from="JB1" to="JC1" priority="-1">
<lane id="E4_0" index="0" allow="pedestrian" speed="13.89" length="3.10" width="2.00" shape="29.20,-11.00 29.20,-7.90"/>
<lane id="E4_1" index="1" disallow="pedestrian" speed="13.89" length="3.10" shape="26.60,-11.00 26.60,-7.90"/>
</edge>
<edge id="E5" from="JC1" to="JT1" priority="-1">
<lane id="E5_0" index="0" allow="pedestrian" speed="13.89" length="3.10" width="2.00" shape="29.20,7.90 29.20,11.00"/>
<lane id="E5_1" index="1" disallow="pedestrian" speed="13.89" length="3.10" shape="26.60,7.90 26.60,11.00"/>
</edge>
<edge id="bot" from="JB0" to="JB1" priority="-1">
<lane id="bot_0" index="0" speed="13.89" length="42.00" shape="-21.00,-16.60 21.00,-16.60"/>
</edge>
<edge id="center0" from="JC1" to="JC0" priority="1">
<lane id="center0_0" index="0" disallow="pedestrian" speed="13.89" length="47.00" shape="23.50,4.80 -23.50,4.80"/>
<lane id="center0_1" index="1" disallow="pedestrian" speed="13.89" length="47.00" shape="23.50,1.60 -23.50,1.60"/>
</edge>
<edge id="center1" from="JC0" to="JC1" priority="1">
<lane id="center1_0" index="0" disallow="pedestrian" speed="13.89" length="47.00" shape="-23.50,-4.80 23.50,-4.80"/>
<lane id="center1_1" index="1" disallow="pedestrian" speed="13.89" length="47.00" shape="-23.50,-1.60 23.50,-1.60"/>
</edge>
<edge id="top" from="JT1" to="JT0" priority="-1">
<lane id="top_0" index="0" speed="13.89" length="42.00" shape="21.00,16.60 -21.00,16.60"/>
</edge>

<tlLogic id="gneJ0" type="static" programID="0" offset="0">
<phase duration="42" state="GGGrr"/>
<phase duration="3" state="yyyrr"/>
<phase duration="42" state="rrrGG"/>
<phase duration="3" state="rrryy"/>
</tlLogic>
<tlLogic id="gneJ1" type="static" programID="0" offset="0">
<phase duration="42" state="GGGrr"/>
<phase duration="3" state="yyyrr"/>
<phase duration="42" state="rrrGG"/>
<phase duration="3" state="rrryy"/>
</tlLogic>

<junction id="JB0" type="priority" x="-25.00" y="-15.00" incLanes="E1_0 E1_1" intLanes=":JB0_0_0" shape="-30.20,-11.00 -25.00,-11.00 -24.56,-13.22 -24.00,-14.00 -23.22,-14.56 -22.22,-14.89 -21.00,-15.00 -21.00,-18.20 -23.81,-18.00 -26.11,-17.40 -27.90,-16.40 -29.18,-15.00 -29.94,-13.20">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="JB1" type="priority" x="25.00" y="-15.00" incLanes="bot_0" intLanes=":JB1_0_0" shape="25.00,-11.00 30.20,-11.00 29.94,-13.20 29.18,-15.00 27.90,-16.40 26.11,-17.40 23.81,-18.00 21.00,-18.20 21.00,-15.00 23.22,-14.56 24.00,-14.00 24.56,-13.22 24.89,-12.22">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="JC0" type="traffic_light" x="-25.00" y="0.00" incLanes="E0_0 E0_1 center0_0 center0_1" intLanes=":JC0_0_0 :JC0_1_0 :JC0_1_1 :JC0_3_0 :JC0_4_0" shape="-30.20,7.90 -25.00,7.90 -24.83,7.07 -24.62,6.78 -24.33,6.57 -23.96,6.44 -23.50,6.40 -23.50,-6.40 -24.33,-6.57 -24.62,-6.77 -24.83,-7.07 -24.96,-7.44 -25.00,-7.90 -30.20,-7.90">
<request index="0" response="00000" foes="01000" cont="0"/>
<request index="1" response="00000" foes="11000" cont="0"/>
<request index="2" response="00000" foes="11000" cont="0"/>
<request index="3" response="00111" foes="00111" cont="0"/>
<request index="4" response="00110" foes="00110" cont="0"/>
</junction>
<junction id="JC1" type="traffic_light" x="25.00" y="0.00" incLanes="E4_0 E4_1 center1_0 center1_1" intLanes=":JC1_0_0 :JC1_1_0 :JC1_1_1 :JC1_3_0 :JC1_4_0" shape="25.00,7.90 30.20,7.90 30.20,-7.90 25.00,-7.90 24.83,-7.07 24.62,-6.78 24.33,-6.57 23.96,-6.44 23.50,-6.40 23.50,6.40 24.33,6.57 24.62,6.77 24.83,7.07 24.96,7.44">
<request index="0" response="00000" foes="01000" cont="0"/>
<request index="1" response="00000" foes="11000" cont="0"/>
<request index="2" response="00000" foes="11000" cont="0"/>
<request index="3" response="00111" foes="00111" cont="0"/>
<request index="4" response="00110" foes="00110" cont="0"/>
</junction>
<junction id="JT0" type="priority" x="-25.00" y="15.00" incLanes="top_0" intLanes=":JT0_0_0" shape="-21.00,18.20 -21.00,15.00 -23.22,14.56 -24.00,14.00 -24.56,13.22 -24.89,12.22 -25.00,11.00 -30.20,11.00 -29.94,13.20 -29.18,15.00 -27.90,16.40 -26.11,17.40 -23.81,18.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="JT1" type="priority" x="25.00" y="15.00" incLanes="E5_0 E5_1" intLanes=":JT1_0_0" shape="30.20,11.00 25.00,11.00 24.56,13.22 24.00,14.00 23.22,14.56 22.22,14.89 21.00,15.00 21.00,18.20 23.81,18.00 26.11,17.40 27.90,16.40 29.18,15.00 29.94,13.20">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="E0" to="E1" fromLane="1" toLane="1" via=":JC0_0_0" tl="gneJ0" linkIndex="0" dir="s" state="O"/>
<connection from="E0" to="center1" fromLane="1" toLane="0" via=":JC0_1_0" tl="gneJ0" linkIndex="1" dir="l" state="O"/>
<connection from="E0" to="center1" fromLane="1" toLane="1" via=":JC0_1_1" tl="gneJ0" linkIndex="2" dir="l" state="O"/>
<connection from="E1" to="bot" fromLane="1" toLane="0" via=":JB0_0_0" dir="l" state="M"/>
<connection from="E4" to="E5" fromLane="1" toLane="1" via=":JC1_0_0" tl="gneJ1" linkIndex="0" dir="s" state="O"/>
<connection from="E4" to="center0" fromLane="1" toLane="0" via=":JC1_1_0" tl="gneJ1" linkIndex="1" dir="l" state="O"/>
<connection from="E4" to="center0" fromLane="1" toLane="1" via=":JC1_1_1" tl="gneJ1" linkIndex="2" dir="l" state="O"/>
<connection from="E5" to="top" fromLane="1" toLane="0" via=":JT1_0_0" dir="l" state="M"/>
<connection from="bot" to="E4" fromLane="0" toLane="1" via=":JB1_0_0" dir="l" state="M"/>
<connection from="center0" to="E1" fromLane="0" toLane="1" via=":JC0_3_0" tl="gneJ0" linkIndex="3" dir="l" state="o"/>
<connection from="center0" to="center1" fromLane="1" toLane="1" via=":JC0_4_0" tl="gneJ0" linkIndex="4" dir="t" state="o"/>
<connection from="center1" to="E5" fromLane="0" toLane="1" via=":JC1_3_0" tl="gneJ1" linkIndex="3" dir="l" state="o"/>
<connection from="center1" to="center0" fromLane="1" toLane="1" via=":JC1_4_0" tl="gneJ1" linkIndex="4" dir="t" state="o"/>
<connection from="top" to="E0" fromLane="0" toLane="1" via=":JT0_0_0" dir="l" state="M"/>

<connection from=":JB0_0" to="bot" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":JB1_0" to="E4" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":JC0_0" to="E1" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":JC0_1" to="center1" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":JC0_1" to="center1" fromLane="1" toLane="1" dir="l" state="M"/>
<connection from=":JC0_3" to="E1" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":JC0_4" to="center1" fromLane="0" toLane="1" dir="t" state="M"/>
<connection from=":JC1_0" to="E5" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":JC1_1" to="center0" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":JC1_1" to="center0" fromLane="1" toLane="1" dir="l" state="M"/>
<connection from=":JC1_3" to="E5" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":JC1_4" to="center0" fromLane="0" toLane="1" dir="t" state="M"/>
<connection from=":JT0_0" to="E0" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":JT1_0" to="top" fromLane="0" toLane="0" dir="l" state="M"/>

</net>
@@ -0,0 +1,4 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Netedit closed successfully
Empty file.
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-04-18 13:46:01 by Eclipse SUMO netedit Version v1_16_0+2149-f5731f702e4
-->

<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="center1 E5 top E0 E1 bot E4 center0"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<flow id="f_0" begin="0.00" route="r_0" end="3600.00" vehsPerHour="180.00"/>
</routes>
Expand Up @@ -16,4 +16,6 @@ vtypes

off

optional

parameters
Expand Up @@ -16,4 +16,6 @@ vtypes

off

optional

parameters

0 comments on commit 1c58ed6

Please sign in to comment.