From 9de533d77d5160987ca598245382d0c3c677a0e4 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 27 Sep 2024 11:35:47 +0200 Subject: [PATCH] Updated netedit tests. Refs #3045 --- tests/netedit/attributesEnum.py | 4 +- .../edgedata/inspect/parameters/datas.netedit | 5 +- .../edgedata/inspect/parameters/log.netedit | 3 + .../shapeend/additionals.netedit | 25 +- .../inspect_selected/shapeend/datas.netedit | 22 + .../shapeend/guisettingsoutput.netedit | 21 +- .../inspect_selected/shapeend/log.netedit | 16 + .../inspect_selected/shapeend/net.netedit | 228 +++---- .../inspect_selected/shapeend/output.netedit | 4 +- .../inspect_selected/shapeend/routes.netedit | 31 + .../shapestart/additionals.netedit | 25 +- .../inspect_selected/shapestart/datas.netedit | 22 + .../shapestart/guisettingsoutput.netedit | 21 +- .../inspect_selected/shapestart/log.netedit | 24 + .../inspect_selected/shapestart/net.netedit | 228 +++---- .../shapestart/output.netedit | 4 +- .../shapestart/routes.netedit | 31 + .../big_radius/additionals.netedit | 10 +- .../roundabouts/big_radius/net.netedit | 150 +++-- .../roundabouts/big_radius/test.py | 3 + .../split_junction_and_reconnect/net.netedit | 82 +-- .../junctions/inspect/no_tls/net.net.xml | 14 +- .../no_tls/unselected/pos/output.netedit | 2 +- .../inspect/no_tls/unselected/pos/test.py | 4 +- .../alternateoneway/additionals.netedit | 26 + .../tllayout/alternateoneway/datas.netedit | 25 + .../alternateoneway/guisettingsoutput.netedit | 225 +++++++ .../tllayout/alternateoneway/net.netedit | 435 ++++++++++++ .../tllayout/alternateoneway/output.netedit | 2 +- .../tllayout/alternateoneway/routes.netedit | 22 + .../inspect/tls/unselected/pos/output.netedit | 2 +- .../inspect/tls/unselected/pos/test.py | 4 +- .../alternateoneway/additionals.netedit | 30 +- .../tllayout/alternateoneway/datas.netedit | 25 + .../alternateoneway/guisettingsoutput.netedit | 31 +- .../tllayout/alternateoneway/net.netedit | 619 ++++++++++-------- .../tllayout/alternateoneway/output.netedit | 2 +- .../tllayout/alternateoneway/routes.netedit | 22 + .../lanes/inspect/parameters/net.netedit | 24 +- .../network/lanes/inspect/type/net.netedit | 20 +- .../inspect_selected/changeright/net.netedit | 40 +- .../disallowed/army/additionals.netedit | 4 +- .../select_vtypes/disallowed/army/net.netedit | 71 +- .../trafficlights/edit_click/gui-settings.xml | 3 - tests/netedit/viewPositions.py | 6 +- 45 files changed, 1811 insertions(+), 806 deletions(-) create mode 100644 tests/netedit/network/edges/inspect_selected/shapeend/datas.netedit create mode 100644 tests/netedit/network/edges/inspect_selected/shapeend/routes.netedit create mode 100644 tests/netedit/network/edges/inspect_selected/shapestart/datas.netedit create mode 100644 tests/netedit/network/edges/inspect_selected/shapestart/routes.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/additionals.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/datas.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/guisettingsoutput.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/net.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/routes.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/datas.netedit create mode 100644 tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/routes.netedit delete mode 100644 tests/netedit/network/trafficlights/edit_click/gui-settings.xml diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py index 36cec592f942..1a1c869e9e98 100644 --- a/tests/netedit/attributesEnum.py +++ b/tests/netedit/attributesEnum.py @@ -261,7 +261,7 @@ class inspect: stopOffset = 15 stopOffsetExceptionButton = 16 stopOffsetException = 17 - parameters = 20 + parameters = 18 class inspectSelection: speed = 1 @@ -3611,6 +3611,7 @@ class inspectSelection: lines = 2 group = 3 + class walk: class edge: class edge: @@ -3759,6 +3760,7 @@ class inspectSelection: speed = 2 duration = 3 + class walkEdges: class create: arrivalPos = 8 diff --git a/tests/netedit/elements/datas/edgedata/inspect/parameters/datas.netedit b/tests/netedit/elements/datas/edgedata/inspect/parameters/datas.netedit index 09a51ef1304b..f02de0a407b4 100644 --- a/tests/netedit/elements/datas/edgedata/inspect/parameters/datas.netedit +++ b/tests/netedit/elements/datas/edgedata/inspect/parameters/datas.netedit @@ -1,6 +1,6 @@ - + + + diff --git a/tests/netedit/elements/datas/edgedata/inspect/parameters/log.netedit b/tests/netedit/elements/datas/edgedata/inspect/parameters/log.netedit index e69de29bb2d1..ab4fde35e75a 100644 --- a/tests/netedit/elements/datas/edgedata/inspect/parameters/log.netedit +++ b/tests/netedit/elements/datas/edgedata/inspect/parameters/log.netedit @@ -0,0 +1,3 @@ +Warning: Invalid format of attribute (dummyGenericParameters) +Warning: Invalid format of attribute (key1) +Warning: Invalid format of attribute (keyInvalid.;%>%$$=1) diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/additionals.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/additionals.netedit index 770832699511..81bfa94b071e 100644 --- a/tests/netedit/network/edges/inspect_selected/shapeend/additionals.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapeend/additionals.netedit @@ -1,14 +1,25 @@ - - - - - - - + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/datas.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/datas.netedit new file mode 100644 index 000000000000..4e53f6d36fb4 --- /dev/null +++ b/tests/netedit/network/edges/inspect_selected/shapeend/datas.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/guisettingsoutput.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/guisettingsoutput.netedit index bd60b2f06120..c6bb2f3a56d8 100644 --- a/tests/netedit/network/edges/inspect_selected/shapeend/guisettingsoutput.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapeend/guisettingsoutput.netedit @@ -1,8 +1,8 @@ - - - + + + @@ -35,10 +36,10 @@ - - - - + + + + @@ -119,7 +120,7 @@ - + showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0" junctionValueHideCheck="0" junctionValueHideThreshold="0.00" junctionValueHideCheck2="0" junctionValueHideThreshold2="100.00" junctionValueSetNeutral="0" junctionValueNeutralThreshold="0.00" junctionValueFixRange="0"> @@ -220,5 +221,5 @@ - + diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/log.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/log.netedit index e69de29bb2d1..c5a52467f1e7 100644 --- a/tests/netedit/network/edges/inspect_selected/shapeend/log.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapeend/log.netedit @@ -0,0 +1,16 @@ +Warning: Found angle of 152.66 degrees at edge '-E2', segment 1. +Warning: Found angle of 101.10 degrees at edge 'EdgeExternTop', segment 5. +Warning: Shape for junction 'J4' has distance 73.03 to its given position. +Warning: Shape for junction 'J5' has distance 39.38 to its given position. +Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00). +Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00). +Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.96 due to turning radius of 2.80 (length=2.69, angle=90.00). +Warning: Found angle of 135.72 degrees at edge '-E1', segment 0. +Warning: Found sharp turn with radius 5.32 at the start of edge '-E1'. +Warning: Found angle of 152.66 degrees at edge '-E2', segment 1. +Warning: Found angle of 101.10 degrees at edge 'EdgeExternTop', segment 5. +Warning: Shape for junction 'J4' has distance 73.03 to its given position. +Warning: Shape for junction 'J5' has distance 39.38 to its given position. +Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00). +Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00). +Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.96 due to turning radius of 2.80 (length=2.69, angle=90.00). diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/net.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/net.netedit index 2072717986c2..00f3d61da043 100644 --- a/tests/netedit/network/edges/inspect_selected/shapeend/net.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapeend/net.netedit @@ -1,17 +1,29 @@ - - + - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - + + - - + + + + + + + - - + + + + + + + - - - + + - - - + + + + + + + - - + + + + + + + - - + + - - - - - + + - - - - + + + + + + + + + + - - - - + + - - - - - + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/output.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/output.netedit index 39c5c9b0f5d1..616645371f58 100644 --- a/tests/netedit/network/edges/inspect_selected/shapeend/output.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapeend/output.netedit @@ -1,9 +1,7 @@ TestFunctions: Netedit opened successfully Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 -TestFunctions: Clicked over position 744 - 328 -TestFunctions: Clicked over position 744 - 288 -TestFunctions: Clicked over position 744 - 328 +TestFunctions: Clicked over position 704 - 418 dummyShapeEnd 24 14,15.5 diff --git a/tests/netedit/network/edges/inspect_selected/shapeend/routes.netedit b/tests/netedit/network/edges/inspect_selected/shapeend/routes.netedit new file mode 100644 index 000000000000..35708713dbbb --- /dev/null +++ b/tests/netedit/network/edges/inspect_selected/shapeend/routes.netedit @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/additionals.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/additionals.netedit index 2d461a7ab88e..6592848bf505 100644 --- a/tests/netedit/network/edges/inspect_selected/shapestart/additionals.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapestart/additionals.netedit @@ -1,14 +1,25 @@ - - - - - - - + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/datas.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/datas.netedit new file mode 100644 index 000000000000..d4d8e6a06854 --- /dev/null +++ b/tests/netedit/network/edges/inspect_selected/shapestart/datas.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/guisettingsoutput.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/guisettingsoutput.netedit index bd60b2f06120..c6bb2f3a56d8 100644 --- a/tests/netedit/network/edges/inspect_selected/shapestart/guisettingsoutput.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapestart/guisettingsoutput.netedit @@ -1,8 +1,8 @@ - - - + + + @@ -35,10 +36,10 @@ - - - - + + + + @@ -119,7 +120,7 @@ - + showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0" junctionValueHideCheck="0" junctionValueHideThreshold="0.00" junctionValueHideCheck2="0" junctionValueHideThreshold2="100.00" junctionValueSetNeutral="0" junctionValueNeutralThreshold="0.00" junctionValueFixRange="0"> @@ -220,5 +221,5 @@ - + diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/log.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/log.netedit index e69de29bb2d1..87a3aadd5068 100644 --- a/tests/netedit/network/edges/inspect_selected/shapestart/log.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapestart/log.netedit @@ -0,0 +1,24 @@ +Warning: Found angle of 109.83 degrees at edge '-E2', segment 0. +Warning: Found angle of 179.27 degrees at edge 'E1', segment 0. +Warning: Found sharp turn with radius 0.25 at the start of edge 'E1'. +Warning: Found angle of 116.57 degrees at edge 'EdgeExternTop', segment 0. +Warning: Shape for junction 'J0' has distance 38.55 to its given position. +Warning: Shape for junction 'J4' has distance 50.71 to its given position. +Warning: Shape for junction 'J5' has distance 38.75 to its given position. +Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00). +Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00). +Warning: Speed of straight connection '-E1_1->E1_1' reduced by 10.79 due to turning radius of 15.41 (length=40.05, angle=168.91). +Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.89 due to turning radius of 2.91 (length=2.27, angle=75.28). +Warning: Speed of straight connection 'EdgeExternBot_0->EdgeExternTop_0' reduced by 9.51 due to turning radius of 3.49 (length=3.58, angle=90.00). +Warning: Found angle of 109.83 degrees at edge '-E2', segment 0. +Warning: Found angle of 179.27 degrees at edge 'E1', segment 0. +Warning: Found sharp turn with radius 0.25 at the start of edge 'E1'. +Warning: Shape for junction 'J0' has distance 38.55 to its given position. +Warning: Shape for junction 'J4' has distance 50.71 to its given position. +Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00). +Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00). +Warning: Speed of straight connection '-E1_1->E1_1' reduced by 10.79 due to turning radius of 15.41 (length=40.05, angle=168.91). +Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.89 due to turning radius of 2.91 (length=2.27, angle=75.28). +Warning: 6 total messages of type: Found angle of % degrees at edge '%', segment %. +Warning: 6 total messages of type: Shape for junction '%' has distance % to its given position. +Warning: 6 total messages of type: Speed of % connection '%' reduced by % due to turning radius of % (length=%, angle=%). diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/net.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/net.netedit index dbd5c77afc86..49095147a4c6 100644 --- a/tests/netedit/network/edges/inspect_selected/shapestart/net.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapestart/net.netedit @@ -1,17 +1,29 @@ - - + - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - + + - - + + + + + + + - - + + + + + + + - - - + + - - - + + + + + + + - - + + + + + + + - - + + - - - - - + + - - - - + + + + + + + + + + - - - - + + - - - - - + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/output.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/output.netedit index 6b3e132ac501..64060fab9822 100644 --- a/tests/netedit/network/edges/inspect_selected/shapestart/output.netedit +++ b/tests/netedit/network/edges/inspect_selected/shapestart/output.netedit @@ -1,9 +1,7 @@ TestFunctions: Netedit opened successfully Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 -TestFunctions: Clicked over position 744 - 328 -TestFunctions: Clicked over position 744 - 288 -TestFunctions: Clicked over position 744 - 328 +TestFunctions: Clicked over position 704 - 418 dummyShapeStart 34 diff --git a/tests/netedit/network/edges/inspect_selected/shapestart/routes.netedit b/tests/netedit/network/edges/inspect_selected/shapestart/routes.netedit new file mode 100644 index 000000000000..394bbeb2741f --- /dev/null +++ b/tests/netedit/network/edges/inspect_selected/shapestart/routes.netedit @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/additionals.netedit b/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/additionals.netedit index 2cc66028793e..5b4e33bad8ed 100644 --- a/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/additionals.netedit +++ b/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/additionals.netedit @@ -1,6 +1,6 @@ - - - - - + + + + diff --git a/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/net.netedit b/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/net.netedit index 34a2eef7aeb9..b7651bad43fa 100644 --- a/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/net.netedit +++ b/tests/netedit/network/junctions/contextual_menu/roundabouts/big_radius/net.netedit @@ -1,6 +1,6 @@ - diff --git a/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/output.netedit b/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/output.netedit index d24d424f520b..3ab1fe9f8efe 100644 --- a/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/output.netedit +++ b/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/output.netedit @@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168 TestFunctions: Clicked over position 802 - 404 dummy position -25.00,0.00 -TestFunctions: Clicked over position 582 - 405 +TestFunctions: Clicked over position 662 - 405 -15.00, 15.00 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 diff --git a/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/test.py b/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/test.py index 9331880cbc00..42371197b7f7 100644 --- a/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/test.py +++ b/tests/netedit/network/junctions/inspect/no_tls/unselected/pos/test.py @@ -51,10 +51,10 @@ netedit.rebuildNetwork() # inspect central node in new position -netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left) +netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left, offsetX=80) # change position with a valid value -netedit.modifyAttribute(netedit.attrs.junction.inspect.pos, "-15.00, 15.00", True) +netedit.modifyAttribute(netedit.attrs.junction.inspect.pos, "-15.00, 15.00", False) # rebuild network netedit.rebuildNetwork() diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/additionals.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/additionals.netedit new file mode 100644 index 000000000000..3dce22add3b8 --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/additionals.netedit @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/datas.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/datas.netedit new file mode 100644 index 000000000000..c8afdedbe6d0 --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/guisettingsoutput.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/guisettingsoutput.netedit new file mode 100644 index 000000000000..c6bb2f3a56d8 --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/guisettingsoutput.netedit @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/net.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/net.netedit new file mode 100644 index 000000000000..0977d65c8dcf --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/net.netedit @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/output.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/output.netedit index 498938ebeb06..ae5bd8ed48e5 100644 --- a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/output.netedit +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/output.netedit @@ -8,4 +8,4 @@ dummyTLS alternateoneway TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 -[log] TestFunctions: Netedit already closed +TestFunctions: Netedit closed successfully diff --git a/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/routes.netedit b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/routes.netedit new file mode 100644 index 000000000000..87e188d1fe0e --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/selected/tllayout/alternateoneway/routes.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/pos/output.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/pos/output.netedit index d24d424f520b..3ab1fe9f8efe 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/pos/output.netedit +++ b/tests/netedit/network/junctions/inspect/tls/unselected/pos/output.netedit @@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168 TestFunctions: Clicked over position 802 - 404 dummy position -25.00,0.00 -TestFunctions: Clicked over position 582 - 405 +TestFunctions: Clicked over position 662 - 405 -15.00, 15.00 TestFunctions: Clicked over position 304 - 168 TestFunctions: Clicked over position 304 - 168 diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/pos/test.py b/tests/netedit/network/junctions/inspect/tls/unselected/pos/test.py index 9331880cbc00..42371197b7f7 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/pos/test.py +++ b/tests/netedit/network/junctions/inspect/tls/unselected/pos/test.py @@ -51,10 +51,10 @@ netedit.rebuildNetwork() # inspect central node in new position -netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left) +netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.left, offsetX=80) # change position with a valid value -netedit.modifyAttribute(netedit.attrs.junction.inspect.pos, "-15.00, 15.00", True) +netedit.modifyAttribute(netedit.attrs.junction.inspect.pos, "-15.00, 15.00", False) # rebuild network netedit.rebuildNetwork() diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/additionals.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/additionals.netedit index 365e3baa7f9c..fe48dfee07cd 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/additionals.netedit +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/additionals.netedit @@ -1,16 +1,26 @@ - - - - - - - - - - + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/datas.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/datas.netedit new file mode 100644 index 000000000000..cb05dfdfd578 --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/datas.netedit @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/guisettingsoutput.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/guisettingsoutput.netedit index f42d13114e3b..c6bb2f3a56d8 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/guisettingsoutput.netedit +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/guisettingsoutput.netedit @@ -1,13 +1,13 @@ - - - + + + edgeValue_show="0" edgeValue_size="100.00" edgeValue_color="cyan" edgeValue_bgColor="128,0,0,0" edgeValue_constantSize="1" edgeValue_onlySelected="0" edgeScaleValue_show="0" edgeScaleValue_size="100.00" edgeScaleValue_color="blue" edgeScaleValue_bgColor="128,0,0,0" edgeScaleValue_constantSize="1" edgeScaleValue_onlySelected="0"> @@ -21,6 +21,7 @@ + @@ -35,10 +36,10 @@ - - - - + + + + @@ -113,13 +114,13 @@ - + - - @@ -151,7 +152,7 @@ junctionName_show="0" junctionName_size="60.00" junctionName_color="192,255,128" junctionName_bgColor="128,0,0,0" junctionName_constantSize="1" junctionName_onlySelected="0" internalJunctionName_show="0" internalJunctionName_size="50.00" internalJunctionName_color="0,204,128" internalJunctionName_bgColor="128,0,0,0" internalJunctionName_constantSize="1" internalJunctionName_onlySelected="0" tlsPhaseIndex_show="0" tlsPhaseIndex_size="150.00" tlsPhaseIndex_color="yellow" tlsPhaseIndex_bgColor="128,0,0,0" tlsPhaseIndex_constantSize="1" tlsPhaseIndex_onlySelected="0" tlsPhaseName_show="0" tlsPhaseName_size="150.00" tlsPhaseName_color="orange" tlsPhaseName_bgColor="128,0,0,0" tlsPhaseName_constantSize="1" tlsPhaseName_onlySelected="0" - showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0"> + showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0" junctionValueHideCheck="0" junctionValueHideThreshold="0.00" junctionValueHideCheck2="0" junctionValueHideThreshold2="100.00" junctionValueSetNeutral="0" junctionValueNeutralThreshold="0.00" junctionValueFixRange="0"> @@ -190,7 +191,7 @@ - + @@ -217,8 +218,8 @@ - + - + diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/net.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/net.netedit index 5662332bb5a3..5d466856e1a5 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/net.netedit +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/net.netedit @@ -1,17 +1,28 @@ - - + - + - - + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/output.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/output.netedit index 278cc6896808..53874bf9c059 100644 --- a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/output.netedit +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/output.netedit @@ -1,7 +1,7 @@ TestFunctions: Netedit opened successfully Finding reference TestFunctions: 'reference.png' found. Position: 304 - 168 -TestFunctions: Clicked over position 629 - 418 +TestFunctions: Clicked over position 802 - 404 dummyTLS alternateoneway TestFunctions: Clicked over position 304 - 168 diff --git a/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/routes.netedit b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/routes.netedit new file mode 100644 index 000000000000..e2fd07d0d074 --- /dev/null +++ b/tests/netedit/network/junctions/inspect/tls/unselected/tllayout/alternateoneway/routes.netedit @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/tests/netedit/network/lanes/inspect/parameters/net.netedit b/tests/netedit/network/lanes/inspect/parameters/net.netedit index 5582edd1661f..09010978da0b 100644 --- a/tests/netedit/network/lanes/inspect/parameters/net.netedit +++ b/tests/netedit/network/lanes/inspect/parameters/net.netedit @@ -1,6 +1,6 @@ - - - diff --git a/tests/netedit/network/lanes/select_vtypes/disallowed/army/net.netedit b/tests/netedit/network/lanes/select_vtypes/disallowed/army/net.netedit index 305e5fe72e58..a8746ebb363d 100644 --- a/tests/netedit/network/lanes/select_vtypes/disallowed/army/net.netedit +++ b/tests/netedit/network/lanes/select_vtypes/disallowed/army/net.netedit @@ -1,6 +1,6 @@ -