Skip to content

Commit

Permalink
Patching netedit expected results. Refs #12846 and #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Jun 26, 2023
1 parent dff0b11 commit 4ce06f8
Show file tree
Hide file tree
Showing 72 changed files with 586 additions and 166 deletions.
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/container/load/type/errors.netedit
View file
@@ -1,3 +1,3 @@
Error: Attribute 'type' in definition of container 'p_1' is empty.
Error: Invalid container type 'dummyType' used in container 'p_2'.
Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.demand.container.25Jan182728.9804/netedit.daily.demand.container/demandelements/container/load/type/routes.rou.xml failed.
Error: Invalid vehicle type 'dummyType' used in container 'p_2'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Jun084850.16884\netedit.gui\demandelements\container\load\type\routes.rou.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/container/load/type/log.netedit
View file
@@ -1,3 +1,3 @@
Error: Attribute 'type' in definition of container 'p_1' is empty.
Error: Invalid container type 'dummyType' used in container 'p_2'.
Error: Loading of C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.22Apr100936.1168\netedit.gui\demandelements\container\load\type\routes.rou.xml failed.
Error: Invalid vehicle type 'dummyType' used in container 'p_2'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Jun084850.16884\netedit.gui\demandelements\container\load\type\routes.rou.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/containerflow/load/type/errors.netedit
View file
@@ -1,3 +1,3 @@
Error: Attribute 'type' in definition of containerFlow 'p_1' is empty.
Error: Invalid containerFlow type 'dummyType' used in containerFlow 'p_2'.
Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.demand.containerflow.25Jan182728.9806/netedit.daily.demand.containerflow/demandelements/containerflow/load/type/routes.rou.xml failed.
Error: Invalid vehicle type 'dummyType' used in containerFlow 'p_2'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Jun084850.16884\netedit.gui\demandelements\containerflow\load\type\routes.rou.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/containerflow/load/type/log.netedit
View file
@@ -1,3 +1,3 @@
Error: Attribute 'type' in definition of containerFlow 'p_1' is empty.
Error: Invalid containerFlow type 'dummyType' used in containerFlow 'p_2'.
Error: Loading of C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.22Apr103431.936\netedit.gui\demandelements\containerflow\load\type\routes.rou.xml failed.
Error: Invalid vehicle type 'dummyType' used in containerFlow 'p_2'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Jun084850.16884\netedit.gui\demandelements\containerflow\load\type\routes.rou.xml failed.
28 changes: 28 additions & 0 deletions tests/netedit/demandelements/flow_taz/create/arrivalposlat/additionals.netedit
View file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-26 09:07:03 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- TAZs -->
<taz id="taz_0" shape="-10.00,30.00 -10.00,10.00 10.00,10.00 10.00,30.00 -10.00,30.00" fill="1" color="blue">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
<tazSource id="gneE6" weight="1.00"/>
<tazSink id="gneE6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="40.00,10.00 40.00,30.00 50.00,30.00 50.00,10.00 40.00,10.00" fill="1" color="red">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
<tazSource id="gneE7" weight="1.00"/>
<tazSink id="gneE7" weight="1.00"/>
</taz>
<taz id="taz_2" shape="10.00,50.00 50.00,50.00 50.00,40.00 10.00,40.00 10.00,50.00" fill="1" color="green">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
</taz>
<taz id="taz_3" shape="10.00,-10.00 10.00,0.00 50.00,0.00 50.00,-10.00 10.00,-10.00" fill="1" color="orange">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
</taz>
</additional>
18 changes: 9 additions & 9 deletions tests/netedit/demandelements/flow_taz/create/arrivalposlat/output.netedit
View file
@@ -1,19 +1,19 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
flow (from-to junctions)
flow (from-to TAZs)
dummySpeed
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
-12
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
max
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
20
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/flow_taz/create/arrivalposlat/test.py
View file
Expand Up @@ -77,8 +77,8 @@
# press enter to create trip
netedit.typeEnter()
# Check undo redo
netedit.undo(referencePosition, 2)
netedit.redo(referencePosition, 2)
netedit.undo(referencePosition, 1)
netedit.redo(referencePosition, 1)

# save Netedit config
netedit.saveNeteditConfig(referencePosition)
Expand Down
28 changes: 28 additions & 0 deletions tests/netedit/demandelements/flow_taz/create/containernumber/additionals.netedit
View file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-26 09:05:29 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- TAZs -->
<taz id="taz_0" shape="-10.00,30.00 -10.00,10.00 10.00,10.00 10.00,30.00 -10.00,30.00" fill="1" color="blue">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
<tazSource id="gneE6" weight="1.00"/>
<tazSink id="gneE6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="40.00,10.00 40.00,30.00 50.00,30.00 50.00,10.00 40.00,10.00" fill="1" color="red">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
<tazSource id="gneE7" weight="1.00"/>
<tazSink id="gneE7" weight="1.00"/>
</taz>
<taz id="taz_2" shape="10.00,50.00 50.00,50.00 50.00,40.00 10.00,40.00 10.00,50.00" fill="1" color="green">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
</taz>
<taz id="taz_3" shape="10.00,-10.00 10.00,0.00 50.00,0.00 50.00,-10.00 10.00,-10.00" fill="1" color="orange">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
</taz>
</additional>
18 changes: 9 additions & 9 deletions tests/netedit/demandelements/flow_taz/create/containernumber/output.netedit
View file
@@ -1,19 +1,19 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
flow (from-to junctions)
flow (from-to TAZs)
dummyContainerNumber
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
-12
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
3.5
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
13
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/flow_taz/create/containernumber/routes.netedit
View file
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-03-22 14:50:43 by Eclipse SUMO netedit Version v1_12_0+1584-0cbd35029a6
<!-- generated on 2023-06-26 09:05:29 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Vehicles, persons and containers (sorted by depart) -->
<flow id="f_0" begin="0.00" containerNumber="13" fromTaz="taz_0" toTaz="taz_1" end="3600.00" vehsPerHour="1800.00"/>
<flow id="f_0" begin="0.00" fromTaz="taz_0" toTaz="taz_1" containerNumber="13" end="3600.00" vehsPerHour="1800.00"/>
</routes>
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/flow_taz/create/containernumber/test.py
View file
Expand Up @@ -78,8 +78,8 @@
netedit.typeEnter()

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

# save Netedit config
netedit.saveNeteditConfig(referencePosition)
Expand Down
28 changes: 28 additions & 0 deletions tests/netedit/demandelements/flow_taz/create/departlane/additionals.netedit
View file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-26 09:02:14 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- TAZs -->
<taz id="taz_0" shape="-10.00,30.00 -10.00,10.00 10.00,10.00 10.00,30.00 -10.00,30.00" fill="1" color="blue">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
<tazSource id="gneE6" weight="1.00"/>
<tazSink id="gneE6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="40.00,10.00 40.00,30.00 50.00,30.00 50.00,10.00 40.00,10.00" fill="1" color="red">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
<tazSource id="gneE7" weight="1.00"/>
<tazSink id="gneE7" weight="1.00"/>
</taz>
<taz id="taz_2" shape="10.00,50.00 50.00,50.00 50.00,40.00 10.00,40.00 10.00,50.00" fill="1" color="green">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
</taz>
<taz id="taz_3" shape="10.00,-10.00 10.00,0.00 50.00,0.00 50.00,-10.00 10.00,-10.00" fill="1" color="orange">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
</taz>
</additional>
2 changes: 1 addition & 1 deletion tests/netedit/demandelements/flow_taz/create/departlane/errors.netedit
View file
@@ -1 +1 @@
Error: Invalid departLane used in flowJunctions 'f_1'. 20 is greater than number of lanes
Error: Invalid departLane used in flowTAZs 'f_1'. 20 is greater than number of lanes
2 changes: 1 addition & 1 deletion tests/netedit/demandelements/flow_taz/create/departlane/log.netedit
View file
@@ -1 +1 @@
Error: Invalid departLane used in flowJunctions 'f_1'. 20 is greater than number of lanes
Error: Invalid departLane used in flowTAZs 'f_1'. 20 is greater than number of lanes
18 changes: 9 additions & 9 deletions tests/netedit/demandelements/flow_taz/create/departlane/output.netedit
View file
@@ -1,19 +1,19 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
flow (from-to junctions)
flow (from-to TAZs)
dummyLane
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
-12
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
random
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
20
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/flow_taz/create/departlane/test.py
View file
Expand Up @@ -78,8 +78,8 @@
netedit.typeEnter()

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

# save Netedit config
netedit.saveNeteditConfig(referencePosition)
Expand Down
28 changes: 28 additions & 0 deletions tests/netedit/demandelements/flow_taz/create/insertionchecks/additionals.netedit
View file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-26 09:19:00 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- TAZs -->
<taz id="taz_0" shape="-10.00,30.00 -10.00,10.00 10.00,10.00 10.00,30.00 -10.00,30.00" fill="1" color="blue">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
<tazSource id="gneE6" weight="1.00"/>
<tazSink id="gneE6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="40.00,10.00 40.00,30.00 50.00,30.00 50.00,10.00 40.00,10.00" fill="1" color="red">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
<tazSource id="gneE7" weight="1.00"/>
<tazSink id="gneE7" weight="1.00"/>
</taz>
<taz id="taz_2" shape="10.00,50.00 50.00,50.00 50.00,40.00 10.00,40.00 10.00,50.00" fill="1" color="green">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
</taz>
<taz id="taz_3" shape="10.00,-10.00 10.00,0.00 50.00,0.00 50.00,-10.00 10.00,-10.00" fill="1" color="orange">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
</taz>
</additional>
10 changes: 5 additions & 5 deletions tests/netedit/demandelements/flow_taz/create/insertionchecks/output.netedit
View file
@@ -1,13 +1,13 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
flow (from-to junctions)
flow (from-to TAZs)
%%%%%%
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
leaderGap junction speedLimit pedestrian
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/flow_taz/create/insertionchecks/routes.netedit
View file
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-25 11:08:47 by Eclipse SUMO netedit Version v1_14_1+1914-f1c7c144c82
<!-- generated on 2023-06-26 09:19:00 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Vehicles, persons and containers (sorted by depart) -->
<flow id="f_0" begin="0.00" insertionChecks="leaderGap junction speedLimit pedestrian all" fromTaz="taz_0" toTaz="taz_1" end="3600.00" vehsPerHour="1800.00"/>
<flow id="f_0" begin="0.00" fromTaz="taz_0" toTaz="taz_1" insertionChecks="leaderGap junction speedLimit pedestrian all" end="3600.00" vehsPerHour="1800.00"/>
</routes>
6 changes: 3 additions & 3 deletions tests/netedit/demandelements/flow_taz/create/insertionchecks/test.py
View file
Expand Up @@ -49,7 +49,7 @@

# set valid Line
netedit.changeDefaultValue(netedit.attrs.flowTAZ.create.insertionChecks,
"leaderGap TAZ speedLimit pedestrian")
"leaderGap junction speedLimit pedestrian")

# create trip
netedit.leftClick(referencePosition, 50, 250)
Expand All @@ -59,8 +59,8 @@
netedit.typeEnter()

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

# save Netedit config
netedit.saveNeteditConfig(referencePosition)
Expand Down
28 changes: 28 additions & 0 deletions tests/netedit/demandelements/flow_taz/create/number/additionals.netedit
View file
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-26 09:13:50 by Eclipse SUMO netedit Version v1_17_0+1257-dff0b114716
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- TAZs -->
<taz id="taz_0" shape="-10.00,30.00 -10.00,10.00 10.00,10.00 10.00,30.00 -10.00,30.00" fill="1" color="blue">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
<tazSource id="gneE6" weight="1.00"/>
<tazSink id="gneE6" weight="1.00"/>
</taz>
<taz id="taz_1" shape="40.00,10.00 40.00,30.00 50.00,30.00 50.00,10.00 40.00,10.00" fill="1" color="red">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
<tazSource id="gneE7" weight="1.00"/>
<tazSink id="gneE7" weight="1.00"/>
</taz>
<taz id="taz_2" shape="10.00,50.00 50.00,50.00 50.00,40.00 10.00,40.00 10.00,50.00" fill="1" color="green">
<tazSource id="gneE5" weight="1.00"/>
<tazSink id="gneE5" weight="1.00"/>
</taz>
<taz id="taz_3" shape="10.00,-10.00 10.00,0.00 50.00,0.00 50.00,-10.00 10.00,-10.00" fill="1" color="orange">
<tazSource id="gneE2" weight="1.00"/>
<tazSink id="gneE2" weight="1.00"/>
</taz>
</additional>
22 changes: 11 additions & 11 deletions tests/netedit/demandelements/flow_taz/create/number/output.netedit
View file
@@ -1,22 +1,22 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
flow (from-to junctions)
flow (from-to TAZs)
dummyTerminate
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
number
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
dummy
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
-30
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
20.5
TestFunctions: Clicked over position 384 - 528
TestFunctions: Clicked over position 389 - 245
TestFunctions: Clicked over position 354 - 418
TestFunctions: Clicked over position 734 - 418
22
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
Expand Down

0 comments on commit 4ce06f8

Please sign in to comment.