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 Oct 1, 2024
1 parent ceb52d3 commit a70841d
Show file tree
Hide file tree
Showing 320 changed files with 12,788 additions and 4,082 deletions.
185 changes: 14 additions & 171 deletions tests/netedit/attributesEnum.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,24 +281,6 @@ class inspectSelection:
stopOffsetException = 15
parameters = 18

class contextualMenu:
duplicateLane = 1
setCustomLaneShape = 2
resetCustomLaneShape = 3
resetOppositeLaneShape = 4
addRestrictedLane = 3
removeRestrictedLane = 4
transformRestrictedLane = 4

class restrictedLanes:
sidewalk = 1
bikelane = 2
buslane = 3
greenvergeFront = 4
greenvergeBack = 4

contextualMenuLane = 11

# connection


Expand Down Expand Up @@ -1044,9 +1026,10 @@ class create:
vTypes = 9
nextEdges = 10
detectPersons = 11
timeThreshold = 13
speedThreshold = 14
expectArrival = 15
openEntry = 13
timeThreshold = 14
speedThreshold = 15
expectArrival = 16

class inspect:
id = 1
Expand All @@ -1057,10 +1040,11 @@ class inspect:
vTypes = 6
nextEdges = 7
detectPersons = 8
timeThreshold = 10
speedThreshold = 11
expectArrival = 12
parameters = 15
openEntry = 10
timeThreshold = 11
speedThreshold = 12
expectArrival = 13
parameters = 16

class inspectSelection:
period = 1
Expand All @@ -1069,10 +1053,11 @@ class inspectSelection:
vTypes = 4
nextEdges = 5
detectPersons = 6
timeThreshold = 8
speedThreshold = 9
expectArrival = 10
parameters = 13
openEntry = 8
timeThreshold = 9
speedThreshold = 10
expectArrival = 11
parameters = 14

# entryExit

Expand Down Expand Up @@ -1684,20 +1669,6 @@ class inspectSelection:
depart = 17
parameters = 20

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlow = 3
routeFlowEmbedded = 4
flow = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# trip (from-to junctions)


Expand Down Expand Up @@ -1763,21 +1734,6 @@ class inspectSelection:
depart = 17
parameters = 20

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlow = 3
routeFlowEmbedded = 4
trip = 5
flow = 6

class reverse:
current = 1
add = 2

reverseElement = 8
transformTo = 9

# trip (from-to TAZs)


Expand Down Expand Up @@ -1843,16 +1799,6 @@ class inspectSelection:
depart = 17
parameters = 20

class transform:
flow = 1

class reverse:
current = 1
add = 2

reverseElement = 8
transformTo = 9

# vehicle (over route)


Expand Down Expand Up @@ -1919,20 +1865,6 @@ class inspectSelection:
depart = 17
parameters = 20

class transform:
vehicleEmbedded = 1
routeFlow = 2
routeFlowEmbedded = 3
trip = 4
flow = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# vehicle (embedded route)


Expand Down Expand Up @@ -1998,20 +1930,6 @@ class inspectSelection:
depart = 17
parameters = 20

class transform:
vehicle = 1
routeFlow = 2
routeFlowEmbedded = 3
trip = 4
flow = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# flow (from-to edges)


Expand Down Expand Up @@ -2093,20 +2011,6 @@ class inspectSelection:
spacingOption = 25
parameters = 25

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlow = 3
routeFlowEmbedded = 4
trip = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# flow (from-to junctions)


Expand Down Expand Up @@ -2187,21 +2091,6 @@ class inspectSelection:
spacingOption = 25
parameters = 25

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlow = 3
routeFlowEmbedded = 4
trip = 5
flow = 6

class reverse:
current = 1
add = 2

reverseElement = 8
transformTo = 9

# flow (from-to TAZs)


Expand Down Expand Up @@ -2282,16 +2171,6 @@ class inspectSelection:
spacingOption = 25
parameters = 25

class transform:
trip = 1

class reverse:
current = 1
add = 2

reverseElement = 8
transformTo = 9

# flow (over route)


Expand Down Expand Up @@ -2373,20 +2252,6 @@ class inspectSelection:
spacingOption = 25
parameters = 25

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlowEmbedded = 3
trip = 4
flow = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# flow (embedded route)


Expand Down Expand Up @@ -2467,20 +2332,6 @@ class inspectSelection:
spacingOption = 25
parameters = 25

class transform:
vehicle = 1
vehicleEmbedded = 2
routeFlow = 3
trip = 4
flow = 5

class reverse:
current = 1
add = 2

reverseElement = 9
transformTo = 10

# stop over bus stop


Expand Down Expand Up @@ -3202,8 +3053,6 @@ class inspectSelection:
depart = 6
parameters = 9

transformTo = 8


class personFlow:
class create:
Expand Down Expand Up @@ -3246,8 +3095,6 @@ class inspectSelection:
spacingOption = 14
parameters = 16

transformTo = 8

# PersonPlans


Expand Down Expand Up @@ -3817,8 +3664,6 @@ class inspectSelection:
depart = 6
parameters = 9

transformTo = 8


class containerFlow:
class create:
Expand Down Expand Up @@ -3861,8 +3706,6 @@ class inspectSelection:
spacingOption = 14
parameters = 16

transformTo = 8

# PersonPlans


Expand Down
6 changes: 6 additions & 0 deletions tests/netedit/contextualMenuOperations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,12 @@ class transformJunctions:
subMenuAPosition = 1
subMenuBPosition = 0

# transform vehicles over TAZs
class transformTAZs:
mainMenuPosition = 12
subMenuAPosition = 1
subMenuBPosition = 0

# transform persons
class transformPerson:
mainMenuPosition = 11
Expand Down
4 changes: 2 additions & 2 deletions tests/netedit/elements/additionals/access/load/invalid_parent/errors.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Error: Attribute 'id' is missing in definition of a busStop.
Error: 'access' must be defined within the definition of a 'busStop' (found '').
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.1_from_24Sep152204.37981/netedit.gui/elements/additionals/access/load/invalid_parent/additionals.add.xml failed.
Error: 'access' must be defined within the definition of a 'busStop'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.01Oct142054.16744\netedit.gui\elements\additionals\access\load\invalid_parent\additionals.add.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/elements/additionals/access/load/invalid_parent/log.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Error: Attribute 'id' is missing in definition of a busStop.
Error: 'access' must be defined within the definition of a 'busStop' (found '').
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.1_from_24Sep152204.37981/netedit.gui/elements/additionals/access/load/invalid_parent/additionals.add.xml failed.
Error: 'access' must be defined within the definition of a 'busStop'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.01Oct142054.16744\netedit.gui\elements\additionals\access\load\invalid_parent\additionals.add.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/elements/additionals/access/load/no_parent/errors.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Error: 'access' must be defined within the definition of a 'busStop' (found rootFile '').
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.1_from_24Sep152204.37981/netedit.gui/elements/additionals/access/load/no_parent/additionals.add.xml failed.
Error: 'access' must be defined within the definition of a 'busStop'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.01Oct142054.16744\netedit.gui\elements\additionals\access\load\no_parent\additionals.add.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/elements/additionals/access/load/no_parent/log.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Error: 'access' must be defined within the definition of a 'busStop' (found rootFile '').
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.1_from_24Sep152204.37981/netedit.gui/elements/additionals/access/load/no_parent/additionals.add.xml failed.
Error: 'access' must be defined within the definition of a 'busStop'.
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.01Oct142054.16744\netedit.gui\elements\additionals\access\load\no_parent\additionals.add.xml failed.
4 changes: 2 additions & 2 deletions tests/netedit/elements/additionals/e3detector/inspect_selection/additionals.add.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">

<!-- E3 A -->
<entryExitDetector id="entryExitDetector_A" period="100.00" file="fileA.txt" name="A" nextEdges="EdgeCenter0" detectPersons="walkBackward" vTypes="type1 type2 type3" timeThreshold="1.00" speedThreshold="1.39" expectArrival="true" pos="-6.00,10.00">
<entryExitDetector id="entryExitDetector_A" period="100.00" file="fileA.txt" name="A" openEntry="true" nextEdges="EdgeCenter0" detectPersons="walkBackward" vTypes="type1 type2 type3" timeThreshold="1.00" speedThreshold="1.39" expectArrival="true" pos="-6.00,10.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA3" value="valueA2"/>
<param key="KeyA2" value="valueA3"/>
Expand All @@ -10,7 +10,7 @@
</entryExitDetector>

<!-- E3 B -->
<entryExitDetector id="entryExitDetector_B" period="120.00" file="fileB.txt" name="B" timeThreshold="2.00" speedThreshold="3.39" nextEdges="Edge3" detectPersons="car" vTypes="type4 type5 type6" expectArrival="false" pos="6.00,10.00">
<entryExitDetector id="entryExitDetector_B" period="120.00" file="fileB.txt" name="B" openEntry="false" timeThreshold="2.00" speedThreshold="3.39" nextEdges="Edge3" detectPersons="car" vTypes="type4 type5 type6" expectArrival="false" pos="6.00,10.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB3" value="valueB2"/>
<param key="KeyB2" value="valueB3"/>
Expand Down
6 changes: 3 additions & 3 deletions ...tedit/elements/additionals/e3detector/inspect_selection/expectArrival/additionals.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 2024-09-22 16:34:22 by Eclipse SUMO netedit Version v1_20_0+2108-65a749ef018
<!-- generated on 2024-10-01 14:38:15 by Eclipse SUMO netedit Version v1_20_0+2204-fb162b24262
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,14 +15,14 @@ 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">
<!-- Detectors -->
<entryExitDetector id="entryExitDetector_A" name="A" pos="-6.00,10.00" period="100.00" file="fileA.txt" vTypes="type1 type2 type3" expectArrival="1">
<entryExitDetector id="entryExitDetector_A" name="A" pos="-6.00,10.00" period="100.00" file="fileA.txt" vTypes="type1 type2 type3" expectArrival="1" openEntry="1">
<detEntry lane="EdgeCenter0_0" pos="5.00"/>
<detExit lane="EdgeCenter0_0" pos="25.00"/>
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</entryExitDetector>
<entryExitDetector id="entryExitDetector_B" name="B" pos="6.00,10.00" period="120.00" file="fileB.txt" vTypes="type4 type5 type6" timeThreshold="2000" speedThreshold="3.39">
<entryExitDetector id="entryExitDetector_B" name="B" pos="6.00,10.00" period="120.00" file="fileB.txt" vTypes="type4 type5 type6" timeThreshold="2000" speedThreshold="3.39" expectArrival="1">
<detEntry lane="EdgeCenter1_0" pos="10.00"/>
<detExit lane="EdgeCenter1_0" pos="30.00"/>
<param key="KeyB1" value="valueB1"/>
Expand Down
Loading

0 comments on commit a70841d

Please sign in to comment.