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

abcsyald · Oct 19, 2020 · 7090c17 · 7090c17
1 parent 54d92b5
commit 7090c17
Show file tree

Hide file tree

Showing 157 changed files with 777 additions and 725 deletions.
diff --git a/...s/netedit/additionalElements/e1InstantDetector/inspect_selection/blockmove/output.netedit b/...s/netedit/additionalElements/e1InstantDetector/inspect_selection/blockmove/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/blockmove/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/blockmove/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change boolean parameter block move
 netedit.modifyBoolAttribute(7, True)

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/file/output.netedit b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/file/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 %%%;:..&&%$%$
 myOwnOutput.txt
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/file/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/file/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter file with an non valid value
 netedit.modifyAttribute(1, "%%%;:..&&%$%$", True)

diff --git a/...netedit/additionalElements/e1InstantDetector/inspect_selection/friendlypos/output.netedit b/...netedit/additionalElements/e1InstantDetector/inspect_selection/friendlypos/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 dummyTrue
 true
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/friendlypos/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/friendlypos/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change boolean parameter friendlypos
 netedit.modifyAttribute(3, "dummyTrue", True)

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/name/output.netedit b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/name/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 %%%;:..&&%$%$
 customName
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/name/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/name/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter name with an non valid value
 netedit.modifyAttribute(0, "%%%;:..&&%$%$", True)

diff --git a/.../netedit/additionalElements/e1InstantDetector/inspect_selection/parameters/output.netedit b/.../netedit/additionalElements/e1InstantDetector/inspect_selection/parameters/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 dummyGenericParameters
 key1|key2|key3
 key1=value1|key2=value2|key3=value3

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/parameters/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/parameters/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # check parameters
 netedit.checkParameters(referencePosition, 5, True)

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/vtypes/output.netedit b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/vtypes/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 
 Type%%%%%1 T;;yp$2 Type3
 Type1 Type2 Type3

diff --git a/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/vtypes/test.py b/tests/netedit/additionalElements/e1InstantDetector/inspect_selection/vtypes/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter vtypes with a empty value
 netedit.modifyAttribute(2, "", True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/blockmove/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/blockmove/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/blockmove/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/blockmove/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change boolean parameter block move
 netedit.modifyBoolAttribute(8, True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/file/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/file/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 %%%;:..&&%$%$
 myOwnOutput.txt
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/file/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/file/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter file with an non valid value
 netedit.modifyAttribute(2, "%%%;:..&&%$%$", True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/freq/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/freq/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 dummyFrequency
 -100
 120

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/freq/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/freq/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter freq with a non valid value (non numeral)
 netedit.modifyAttribute(0, "dummyFrequency", True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/friendlypos/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/friendlypos/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 dummyTrue
 true
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/friendlypos/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/friendlypos/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change boolean parameter friendlypos
 netedit.modifyAttribute(4, "dummyTrue", True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/name/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/name/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 %%%;:..&&%$%$
 customName
 TestFunctions: Clicked over position 304 - 168

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/name/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/name/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter name with an non valid value
 netedit.modifyAttribute(1, "%%%;:..&&%$%$", True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/parameters/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/parameters/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 dummyGenericParameters
 key1|key2|key3
 key1=value1|key2=value2|key3=value3

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/parameters/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/parameters/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # check parameters
 netedit.checkParameters(referencePosition, 6, True)

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/vtypes/output.netedit b/tests/netedit/additionalElements/e1detector/inspect_selection/vtypes/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 454 - 423
+TestFunctions: Clicked over position 454 - 408
 
 Type%%%%%1 T;;yp$2 Type3
 Type1 Type2 Type3

diff --git a/tests/netedit/additionalElements/e1detector/inspect_selection/vtypes/test.py b/tests/netedit/additionalElements/e1detector/inspect_selection/vtypes/test.py
@@ -38,7 +38,7 @@
 netedit.inspectMode()
 
 # inspect E1
-netedit.leftClick(referencePosition, 150, 255)
+netedit.leftClick(referencePosition, 150, 240)
 
 # Change parameter vtypes with a empty value
 netedit.modifyAttribute(3, "", True)

diff --git a/tests/netedit/additionalElements/e3detector/create/blockmove/output.netedit b/tests/netedit/additionalElements/e3detector/create/blockmove/output.netedit
@@ -5,13 +5,13 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 0
 25
 e3Detector
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 detEntry
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 TestFunctions: Clicked over position 604 - 418
 detExit
-TestFunctions: Clicked over position 404 - 268
-TestFunctions: Clicked over position 604 - 568
+TestFunctions: Clicked over position 404 - 258
+TestFunctions: Clicked over position 604 - 538
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e3detector/create/blockmove/test.py b/tests/netedit/additionalElements/e3detector/create/blockmove/test.py
@@ -41,7 +41,7 @@
 netedit.changeDefaultBoolValue(10)
 
 # try to create E3 with block movement
-netedit.leftClick(referencePosition, 100, 90)
+netedit.leftClick(referencePosition, 100, 85)
 
 # restore block movement
 netedit.changeDefaultBoolValue(10)
@@ -50,14 +50,14 @@
 netedit.changeElement("detEntry")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 250)
 
 # select entry detector
 netedit.changeElement("detExit")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 370)
 
 # Check undo redo

diff --git a/tests/netedit/additionalElements/e3detector/create/default/output.netedit b/tests/netedit/additionalElements/e3detector/create/default/output.netedit
@@ -5,13 +5,13 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 0
 25
 e3Detector
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 detEntry
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 TestFunctions: Clicked over position 604 - 418
 detExit
-TestFunctions: Clicked over position 404 - 268
-TestFunctions: Clicked over position 604 - 568
+TestFunctions: Clicked over position 404 - 258
+TestFunctions: Clicked over position 604 - 538
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e3detector/create/default/test.py b/tests/netedit/additionalElements/e3detector/create/default/test.py
@@ -38,20 +38,20 @@
 netedit.changeElement("e3Detector")
 
 # create E3 with default parameters
-netedit.leftClick(referencePosition, 100, 90)
+netedit.leftClick(referencePosition, 100, 85)
 
 # select entry detector
 netedit.changeElement("detEntry")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 250)
 
 # select entry detector
 netedit.changeElement("detExit")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 370)
 
 # Check undo redo

diff --git a/tests/netedit/additionalElements/e3detector/create/default_nochilds/output.netedit b/tests/netedit/additionalElements/e3detector/create/default_nochilds/output.netedit
@@ -5,7 +5,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 0
 25
 e3Detector
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e3detector/create/default_nochilds/test.py b/tests/netedit/additionalElements/e3detector/create/default_nochilds/test.py
@@ -38,7 +38,7 @@
 netedit.changeElement("e3Detector")
 
 # create E3 with default parameters
-netedit.leftClick(referencePosition, 100, 90)
+netedit.leftClick(referencePosition, 100, 85)
 
 # Check undo redo
 netedit.undo(referencePosition, 1)

diff --git a/tests/netedit/additionalElements/e3detector/create/file/output.netedit b/tests/netedit/additionalElements/e3detector/create/file/output.netedit
@@ -6,15 +6,15 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 25
 e3Detector
 %%%$$%%$%
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 myOwnFile.txt
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 detEntry
-TestFunctions: Clicked over position 404 - 268
+TestFunctions: Clicked over position 404 - 258
 TestFunctions: Clicked over position 604 - 418
 detExit
-TestFunctions: Clicked over position 404 - 268
-TestFunctions: Clicked over position 604 - 568
+TestFunctions: Clicked over position 404 - 258
+TestFunctions: Clicked over position 604 - 538
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/additionalElements/e3detector/create/file/test.py b/tests/netedit/additionalElements/e3detector/create/file/test.py
@@ -41,26 +41,26 @@
 netedit.changeDefaultValue(5, "%%%$$%%$%")
 
 # try to create E3 with invalid file
-netedit.leftClick(referencePosition, 100, 90)
+netedit.leftClick(referencePosition, 100, 85)
 
 # set valid file
 netedit.changeDefaultValue(5, "myOwnFile.txt")
 
 # create E3 with valid file
-netedit.leftClick(referencePosition, 100, 90)
+netedit.leftClick(referencePosition, 100, 85)
 
 # select entry detector
 netedit.changeElement("detEntry")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 250)
 
 # select entry detector
 netedit.changeElement("detExit")
 
 # Create Entry and exit detectors for all E3 detectors (except for the first, that only have one Entry)
-netedit.leftClick(referencePosition, 100, 90)  # select E3
+netedit.leftClick(referencePosition, 100, 85)  # select E3
 netedit.leftClick(referencePosition, 300, 370)
 
 # Check undo redo