Patching NETEDIT test expected results. Refs eclipse-sumo#3045

abcsyald · Oct 20, 2020 · a2d79e4 · a2d79e4
1 parent 0d061c8
commit a2d79e4
Show file tree

Hide file tree

Showing 30 changed files with 66 additions and 66 deletions.
diff --git a/tests/netedit/netElements/lanes/contextual_menu/duplicate_lane/errors.netedit b/tests/netedit/netElements/lanes/contextual_menu/duplicate_lane/errors.netedit
@@ -63,7 +63,7 @@ Debug: Created crossing ':gneJ3_c0' in retrieveGNECrossing()
 Debug: Created crossing ':gneJ3_c1' in retrieveGNECrossing()
 Debug: Adding lane 'gneE2_0' into edge
 GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,8.40,60.00,30.00
-GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,8.40,60.00,30.00
 Debug: net has to be saved
 Debug: Current saving Status: net unsaved, additionals unsaved, demand elements saved, data sets saved
 Debug: Key F5 (Compute) pressed
@@ -76,7 +76,7 @@ GLDebug: Removing edges during recomputing
 GLDebug: 	Removed object edge:-gneE2 from SUMORTree with boundary -10.00,10.00,60.00,31.60
 GLDebug: 	Removed object edge:gneE0 from SUMORTree with boundary -10.00,-11.60,60.00,10.00
 GLDebug: 	Removed object edge:gneE1 from SUMORTree with boundary -10.00,-10.00,60.00,11.60
-GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,8.40,60.00,30.00
 GLDebug: 	Removed object edge:gneE4 from SUMORTree with boundary 38.40,-10.00,60.00,30.00
 GLDebug: 	Removed object edge:gneE5 from SUMORTree with boundary 40.00,-10.00,61.60,30.00
 GLDebug: 	Removed object edge:gneE8 from SUMORTree with boundary -11.60,-10.00,10.00,30.00
@@ -90,15 +90,15 @@ GLDebug: Add edges during recomputing after calling myNetBuilder->compute(...)
 GLDebug: 	Inserted edge:-gneE2 into SUMORTree with boundary -10.00,10.00,60.00,31.60
 GLDebug: 	Inserted edge:gneE0 into SUMORTree with boundary -10.00,-11.60,60.00,10.00
 GLDebug: 	Inserted edge:gneE1 into SUMORTree with boundary -10.00,-10.00,60.00,11.60
-GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,8.40,60.00,30.00
 GLDebug: 	Inserted edge:gneE4 into SUMORTree with boundary 38.40,-10.00,60.00,30.00
 GLDebug: 	Inserted edge:gneE5 into SUMORTree with boundary 40.00,-10.00,61.60,30.00
 GLDebug: 	Inserted edge:gneE8 into SUMORTree with boundary -11.60,-10.00,10.00,30.00
 GLDebug: 	Inserted edge:gneE9 into SUMORTree with boundary -10.00,-10.00,11.60,30.00
 Debug: Keys Ctrl+Z (Undo) pressed
 Debug: Calling GNEUndoList::undo()
 Debug: Removing lane 'gneE2_0' from edge
-GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,8.40,60.00,30.00
 GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,8.40,60.00,30.00
 Debug: Key F5 (Compute) pressed
 GLDebug: Removing junctions during recomputing
@@ -133,7 +133,7 @@ Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()
 Debug: Adding lane 'gneE2_0' into edge
 GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,8.40,60.00,30.00
-GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,8.40,60.00,30.00
 Debug: Additionals saved
 GLDebug: Removing junctions during recomputing
 GLDebug: 	Removed object junction:gneJ0 from SUMORTree with boundary -13.20,-13.20,13.20,13.20
@@ -144,7 +144,7 @@ GLDebug: Removing edges during recomputing
 GLDebug: 	Removed object edge:-gneE2 from SUMORTree with boundary -10.00,10.00,60.00,31.60
 GLDebug: 	Removed object edge:gneE0 from SUMORTree with boundary -10.00,-11.60,60.00,10.00
 GLDebug: 	Removed object edge:gneE1 from SUMORTree with boundary -10.00,-10.00,60.00,11.60
-GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Removed object edge:gneE2 from SUMORTree with boundary -10.00,8.40,60.00,30.00
 GLDebug: 	Removed object edge:gneE4 from SUMORTree with boundary 38.40,-10.00,60.00,30.00
 GLDebug: 	Removed object edge:gneE5 from SUMORTree with boundary 40.00,-10.00,61.60,30.00
 GLDebug: 	Removed object edge:gneE8 from SUMORTree with boundary -11.60,-10.00,10.00,30.00
@@ -158,7 +158,7 @@ GLDebug: Add edges during recomputing after calling myNetBuilder->compute(...)
 GLDebug: 	Inserted edge:-gneE2 into SUMORTree with boundary -10.00,10.00,60.00,31.60
 GLDebug: 	Inserted edge:gneE0 into SUMORTree with boundary -10.00,-11.60,60.00,10.00
 GLDebug: 	Inserted edge:gneE1 into SUMORTree with boundary -10.00,-10.00,60.00,11.60
-GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,5.20,60.00,30.00
+GLDebug: 	Inserted edge:gneE2 into SUMORTree with boundary -10.00,8.40,60.00,30.00
 GLDebug: 	Inserted edge:gneE4 into SUMORTree with boundary 38.40,-10.00,60.00,30.00
 GLDebug: 	Inserted edge:gneE5 into SUMORTree with boundary 40.00,-10.00,61.60,30.00
 GLDebug: 	Inserted edge:gneE8 into SUMORTree with boundary -11.60,-10.00,10.00,30.00

diff --git a/tests/netedit/netElements/lanes/inspect/acceleration/output.netedit b/tests/netedit/netElements/lanes/inspect/acceleration/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/netElements/lanes/inspect/acceleration/test.py b/tests/netedit/netElements/lanes/inspect/acceleration/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 5 with a valid value
 netedit.modifyBoolAttribute(7, True)

diff --git a/tests/netedit/netElements/lanes/inspect/allow/output.netedit b/tests/netedit/netElements/lanes/inspect/allow/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 DummyAllowed
 
 authority  army, passenger; taxi. tram

diff --git a/tests/netedit/netElements/lanes/inspect/allow/test.py b/tests/netedit/netElements/lanes/inspect/allow/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 1 with an non valid value (dummy)
 netedit.modifyAttribute(2, "DummyAllowed", True)

diff --git a/tests/netedit/netElements/lanes/inspect/customshape/output.netedit b/tests/netedit/netElements/lanes/inspect/customshape/output.netedit
@@ -1,10 +1,10 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 dummyShape
 
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 13.112,16.22 34.19,16.11
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/netElements/lanes/inspect/customshape/test.py b/tests/netedit/netElements/lanes/inspect/customshape/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 6 with an non valid value (dummy)
 netedit.modifyAttribute(8, "dummyShape", True)
@@ -50,7 +50,7 @@
 netedit.rebuildNetwork()
 
 # inspect edge again after recomputing
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 6 with a valid value
 netedit.modifyAttribute(6, "13.112,16.22 34.19,16.11", True)

diff --git a/tests/netedit/netElements/lanes/inspect/disallow/output.netedit b/tests/netedit/netElements/lanes/inspect/disallow/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 DummyDisallowed
 
 authority  army, passenger; taxi. tram

diff --git a/tests/netedit/netElements/lanes/inspect/disallow/test.py b/tests/netedit/netElements/lanes/inspect/disallow/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 2 with an non valid value
 netedit.modifyAttribute(4, "DummyDisallowed", True)

diff --git a/tests/netedit/netElements/lanes/inspect/endoffset/output.netedit b/tests/netedit/netElements/lanes/inspect/endoffset/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 dummyEndOffset
 
 -3

diff --git a/tests/netedit/netElements/lanes/inspect/endoffset/test.py b/tests/netedit/netElements/lanes/inspect/endoffset/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 4 with a non valid value (dummy)
 netedit.modifyAttribute(6, "dummyEndOffset", True)

diff --git a/tests/netedit/netElements/lanes/inspect/parameters/test.py b/tests/netedit/netElements/lanes/inspect/parameters/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # check parameters
 netedit.checkParameters(referencePosition, 10, True)

diff --git a/tests/netedit/netElements/lanes/inspect/speed/output.netedit b/tests/netedit/netElements/lanes/inspect/speed/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 
 dummySpeed
 -13

diff --git a/tests/netedit/netElements/lanes/inspect/speed/test.py b/tests/netedit/netElements/lanes/inspect/speed/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 0 with a non valid value (empty speed)
 netedit.modifyAttribute(0, "", True)

diff --git a/tests/netedit/netElements/lanes/inspect/width/output.netedit b/tests/netedit/netElements/lanes/inspect/width/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 348
+TestFunctions: Clicked over position 554 - 333
 dummyWidth
 
 -2

diff --git a/tests/netedit/netElements/lanes/inspect/width/test.py b/tests/netedit/netElements/lanes/inspect/width/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect edge
-netedit.leftClick(referencePosition, 250, 180)
+netedit.leftClick(referencePosition, 250, 165)
 
 # Change parameter 3 with a non valid value (dummy)
 netedit.modifyAttribute(5, "dummyWidth", True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/acceleration/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/acceleration/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/netElements/lanes/inspect_selected/acceleration/test.py b/tests/netedit/netElements/lanes/inspect_selected/acceleration/test.py
@@ -38,16 +38,16 @@
 netedit.selectMode()
 
 # select first lane
-netedit.leftClick(referencePosition, 250, 173)
+netedit.leftClick(referencePosition, 250, 165)
 
 # select second lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # go to inspect mode
 netedit.inspectMode()
 
 # inspect lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # Change parameter 5 with a valid value
 netedit.modifyBoolAttribute(7, True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/allow/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/allow/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 DummyAllowed
 
 authority  army, passenger; taxi. tram

diff --git a/tests/netedit/netElements/lanes/inspect_selected/allow/test.py b/tests/netedit/netElements/lanes/inspect_selected/allow/test.py
@@ -38,16 +38,16 @@
 netedit.selectMode()
 
 # select first lane
-netedit.leftClick(referencePosition, 250, 173)
+netedit.leftClick(referencePosition, 250, 165)
 
 # select second lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # go to inspect mode
 netedit.inspectMode()
 
 # inspect lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # Change parameter 1 with an non valid value (dummy)
 netedit.modifyAttribute(2, "DummyAllowed", True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/disallow/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/disallow/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 DummyDisallowed
 
 authority  army, passenger; taxi. tram

diff --git a/tests/netedit/netElements/lanes/inspect_selected/disallow/test.py b/tests/netedit/netElements/lanes/inspect_selected/disallow/test.py
@@ -38,16 +38,16 @@
 netedit.selectMode()
 
 # select first lane
-netedit.leftClick(referencePosition, 250, 173)
+netedit.leftClick(referencePosition, 250, 165)
 
 # select second lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # go to inspect mode
 netedit.inspectMode()
 
 # inspect lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # Change parameter 2 with an non valid value
 netedit.modifyAttribute(4, "DummyDisallowed", True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/endoffset/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/endoffset/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 dummyEndOffset
 
 -3

diff --git a/tests/netedit/netElements/lanes/inspect_selected/endoffset/test.py b/tests/netedit/netElements/lanes/inspect_selected/endoffset/test.py
@@ -38,16 +38,16 @@
 netedit.selectMode()
 
 # select first lane
-netedit.leftClick(referencePosition, 250, 173)
+netedit.leftClick(referencePosition, 250, 165)
 
 # select second lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # go to inspect mode
 netedit.inspectMode()
 
 # inspect lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # Change parameter 4 with a non valid value (dummy)
 netedit.modifyAttribute(6, "dummyEndOffset", True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/parameters/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/parameters/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 dummyGenericParameters
 key1|key2|key3
 key1=value1|key2=value2|key3=value3

diff --git a/tests/netedit/netElements/lanes/inspect_selected/parameters/test.py b/tests/netedit/netElements/lanes/inspect_selected/parameters/test.py
@@ -38,16 +38,16 @@
 netedit.selectMode()
 
 # select first lane
-netedit.leftClick(referencePosition, 250, 173)
+netedit.leftClick(referencePosition, 250, 165)
 
 # select second lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # go to inspect mode
 netedit.inspectMode()
 
 # inspect lane
-netedit.leftClick(referencePosition, 250, 112)
+netedit.leftClick(referencePosition, 250, 105)
 
 # check parameters
 netedit.checkParameters(referencePosition, 9, True)

diff --git a/tests/netedit/netElements/lanes/inspect_selected/speed/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/speed/output.netedit
@@ -1,9 +1,9 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 554 - 341
-TestFunctions: Clicked over position 554 - 280
-TestFunctions: Clicked over position 554 - 280
+TestFunctions: Clicked over position 554 - 333
+TestFunctions: Clicked over position 554 - 273
+TestFunctions: Clicked over position 554 - 273
 
 dummySpeed
 -13