From a2d79e4a84785e2997e2dea3873358863187b852 Mon Sep 17 00:00:00 2001 From: "Alvarez Lopez, Pablo" Date: Tue, 20 Oct 2020 14:12:06 +0200 Subject: [PATCH] Patching NETEDIT test expected results. Refs #3045 --- .../contextual_menu/duplicate_lane/errors.netedit | 14 +++++++------- .../lanes/inspect/acceleration/output.netedit | 2 +- .../netElements/lanes/inspect/acceleration/test.py | 2 +- .../netElements/lanes/inspect/allow/output.netedit | 2 +- .../netElements/lanes/inspect/allow/test.py | 2 +- .../lanes/inspect/customshape/output.netedit | 4 ++-- .../netElements/lanes/inspect/customshape/test.py | 4 ++-- .../lanes/inspect/disallow/output.netedit | 2 +- .../netElements/lanes/inspect/disallow/test.py | 2 +- .../lanes/inspect/endoffset/output.netedit | 2 +- .../netElements/lanes/inspect/endoffset/test.py | 2 +- .../netElements/lanes/inspect/parameters/test.py | 2 +- .../netElements/lanes/inspect/speed/output.netedit | 2 +- .../netElements/lanes/inspect/speed/test.py | 2 +- .../netElements/lanes/inspect/width/output.netedit | 2 +- .../netElements/lanes/inspect/width/test.py | 2 +- .../inspect_selected/acceleration/output.netedit | 6 +++--- .../lanes/inspect_selected/acceleration/test.py | 6 +++--- .../lanes/inspect_selected/allow/output.netedit | 6 +++--- .../lanes/inspect_selected/allow/test.py | 6 +++--- .../lanes/inspect_selected/disallow/output.netedit | 6 +++--- .../lanes/inspect_selected/disallow/test.py | 6 +++--- .../inspect_selected/endoffset/output.netedit | 6 +++--- .../lanes/inspect_selected/endoffset/test.py | 6 +++--- .../inspect_selected/parameters/output.netedit | 6 +++--- .../lanes/inspect_selected/parameters/test.py | 6 +++--- .../lanes/inspect_selected/speed/output.netedit | 6 +++--- .../lanes/inspect_selected/speed/test.py | 6 +++--- .../lanes/inspect_selected/width/output.netedit | 6 +++--- .../lanes/inspect_selected/width/test.py | 6 +++--- 30 files changed, 66 insertions(+), 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 index f9e277aeadf9..536eb9924ef4 100644 --- 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,7 +90,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 @@ -98,7 +98,7 @@ GLDebug: Inserted edge:gneE9 into SUMORTree with boundary -10.00,-10.00,11.60,3 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 index f6cbe39e41b8..8b2ca4baeecd 100644 --- 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 index 4af279313f78..1b372bd1e863 100755 --- 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 index ed5636047d8c..b947e6b098d5 100644 --- 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 index 28d2781e8266..864a87ddc796 100755 --- 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 index 8da1ae8d5bbf..e47fc4856df1 100644 --- 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 index 133141fee0cf..400e3905b12a 100755 --- 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 index 378e4adf2f39..0e16d7e43d4f 100644 --- 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 index bd7b40ebbb54..415484968092 100755 --- 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 index 7daa48a507a0..5b205dd2de1d 100644 --- 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 index c11ea4336b81..d910ecdeab3f 100755 --- 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 index f4bfe2d980fa..51b2c264e720 100755 --- 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 index 2dcfa977b9fc..d2a683997128 100644 --- 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 index 96cd3ec00e21..28e587e75057 100755 --- 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 index 85219a3b49dc..0a4f75a47f68 100644 --- 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 index 0a8a40851c93..2e499a45346e 100755 --- 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 index 0a4e6fad524b..8cff101d7c10 100644 --- 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 index 16a8da789f59..da29178adc5e 100755 --- 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 index 7eed7979656b..923537e95ebe 100644 --- 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 index 291e3bd6d90b..e844f4e4fc9c 100755 --- 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 index 3a0504b0d929..08634e68290b 100644 --- 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 index 0565797fb3c6..7a5a38dcae14 100755 --- 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 index f9cd3d172631..1ba06cd0be03 100644 --- 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 index 1e63f9fdba48..ffea5ea5047e 100755 --- 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 index 4df91477f477..0985b0af5d97 100644 --- 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 index 1f8658593a56..bce27cc01cc7 100755 --- 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 index 94aba34ef7a6..2db648103df1 100644 --- 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 diff --git a/tests/netedit/netElements/lanes/inspect_selected/speed/test.py b/tests/netedit/netElements/lanes/inspect_selected/speed/test.py index bf270f642f95..a07ef6264f76 100755 --- a/tests/netedit/netElements/lanes/inspect_selected/speed/test.py +++ b/tests/netedit/netElements/lanes/inspect_selected/speed/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 0 with a non valid value (empty speed) netedit.modifyAttribute(0, "", True) diff --git a/tests/netedit/netElements/lanes/inspect_selected/width/output.netedit b/tests/netedit/netElements/lanes/inspect_selected/width/output.netedit index d0e9ec103596..43b2d4f4b34d 100644 --- a/tests/netedit/netElements/lanes/inspect_selected/width/output.netedit +++ b/tests/netedit/netElements/lanes/inspect_selected/width/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 dummyWidth -2 diff --git a/tests/netedit/netElements/lanes/inspect_selected/width/test.py b/tests/netedit/netElements/lanes/inspect_selected/width/test.py index d1b31de046a5..f19869f2ef9c 100755 --- a/tests/netedit/netElements/lanes/inspect_selected/width/test.py +++ b/tests/netedit/netElements/lanes/inspect_selected/width/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 3 with a non valid value (dummy) netedit.modifyAttribute(5, "dummyWidth", True)