Updated Netedit test, and patching expected results. Refs eclipse-sum…

…o#3045
XFXZ · Oct 8, 2019 · 73f23ac · 73f23ac
1 parent 151cde8
commit 73f23ac
Show file tree

Hide file tree

Showing 123 changed files with 1,022 additions and 2,460 deletions.
diff --git a/tests/netedit/additionalElements/access/inspect/parameters/errors.netedit b/tests/netedit/additionalElements/access/inspect/parameters/errors.netedit
@@ -48,15 +48,9 @@ Debug: Keys Ctrl+Z (Undo) pressed
 Debug: Calling GNEUndoList::undo()
 Debug: Removing access 'busStop_gneE2_1_0access0' in GNEChange_Additional
 Debug: Removed inspected element from Inspected ACs. 0 ACs remains.
-Debug: Keys Ctrl+Z (Undo) pressed
-Debug: Calling GNEUndoList::undo()
-Debug: Removing busStop 'busStop_gneE2_1_0' in GNEChange_Additional
 Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
 Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()
-Debug: Adding busStop 'busStop_gneE2_1_0' in GNEChange_Additional
-Debug: Keys Ctrl+Y (Redo) pressed
-Debug: Calling GNEUndoList::redo()
 Debug: Adding access 'busStop_gneE2_1_0access0' in GNEChange_Additional
 Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()

diff --git a/tests/netedit/additionalElements/access/inspect/parameters/test.py b/tests/netedit/additionalElements/access/inspect/parameters/test.py
@@ -50,39 +50,8 @@
 # delete Access
 netedit.leftClick(referencePosition, 208, 280)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(5, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(5, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(5, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(5, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(5, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(5, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(5, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(5, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(5, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(5, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 9)
-netedit.redo(referencePosition, 9)
+# check parameters
+netedit.checkParameters(referencePosition, 5, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/access/inspect_selection/parameters/errors.netedit b/tests/netedit/additionalElements/access/inspect_selection/parameters/errors.netedit
@@ -82,23 +82,9 @@ Debug: Setting previous attribute selected '0' into edge 'gneE0'
 Debug: Setting previous attribute selected '0' into junction 'gneJ1'
 Debug: Setting previous attribute selected '0' into edge 'gneE1'
 Debug: Setting previous attribute selected '0' into junction 'gneJ0'
-Debug: Keys Ctrl+Z (Undo) pressed
-Debug: Calling GNEUndoList::undo()
-Debug: Removing access 'busStopBaccess0' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 1 ACs remains.
-Debug: Removing busStop 'busStopB' in GNEChange_Additional
-Debug: Removing access 'busStopAaccess0' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 0 ACs remains.
-Debug: Removing busStop 'busStopA' in GNEChange_Additional
 Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
 Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()
-Debug: Adding busStop 'busStopA' in GNEChange_Additional
-Debug: Adding access 'busStopAaccess0' in GNEChange_Additional
-Debug: Adding busStop 'busStopB' in GNEChange_Additional
-Debug: Adding access 'busStopBaccess0' in GNEChange_Additional
-Debug: Keys Ctrl+Y (Redo) pressed
-Debug: Calling GNEUndoList::redo()
 Debug: Setting new attribute selected 'true' into junction 'gneJ0'
 Debug: Setting new attribute selected 'true' into edge 'gneE1'
 Debug: Setting new attribute selected 'true' into junction 'gneJ1'

diff --git a/tests/netedit/additionalElements/access/inspect_selection/parameters/test.py b/tests/netedit/additionalElements/access/inspect_selection/parameters/test.py
@@ -40,39 +40,8 @@
 # inspect Access
 netedit.leftClick(referencePosition, 326, 308)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(3, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(3, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(3, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(3, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(3, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(3, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(3, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(3, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(3, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(3, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 9)
-netedit.redo(referencePosition, 9)
+# check parameters
+netedit.checkParameters(referencePosition, 3, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/busstop/inspect/parameters/test.py b/tests/netedit/additionalElements/busstop/inspect/parameters/test.py
@@ -43,39 +43,8 @@
 # inspect first busStop
 netedit.leftClick(referencePosition, 250, 190)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(9, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(9, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(9, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(9, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(9, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(9, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(9, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(9, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(9, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(9, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 8)
-netedit.redo(referencePosition, 8)
+# check parameters
+netedit.checkParameters(referencePosition, 9, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/busstop/inspect_selection/parameters/test.py b/tests/netedit/additionalElements/busstop/inspect_selection/parameters/test.py
@@ -37,39 +37,8 @@
 # inspect busstops
 netedit.leftClick(referencePosition, 150, 265)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(5, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(5, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(5, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(5, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(5, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(5, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(5, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(5, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(5, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(5, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 8)
-netedit.redo(referencePosition, 8)
+# check parameters
+netedit.checkParameters(referencePosition, 5, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/calibrator/inspect/parameters/test.py b/tests/netedit/additionalElements/calibrator/inspect/parameters/test.py
@@ -40,39 +40,8 @@
 # inspect calibrator
 netedit.leftClick(referencePosition, 300, 215)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(8, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(8, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(8, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(8, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(8, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(8, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(8, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(8, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(8, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(8, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 8)
-netedit.redo(referencePosition, 8)
+# check parameters
+netedit.checkParameters(referencePosition, 8, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/calibrator/inspect_selection/parameters/errors.netedit b/tests/netedit/additionalElements/calibrator/inspect_selection/parameters/errors.netedit
@@ -87,25 +87,9 @@ Debug: Setting previous attribute selected '0' into edge 'gneE0'
 Debug: Setting previous attribute selected '0' into junction 'gneJ1'
 Debug: Setting previous attribute selected '0' into edge 'gneE1'
 Debug: Setting previous attribute selected '0' into junction 'gneJ0'
-Debug: Keys Ctrl+Z (Undo) pressed
-Debug: Calling GNEUndoList::undo()
-Debug: Removing routeProbe 'customRouteProbeName' in GNEChange_Additional
-Debug: Removing routeProbe 'RouteProbeB' in GNEChange_Additional
-Debug: Removing routeProbe 'RouteProbeA' in GNEChange_Additional
-Debug: Removing calibrator 'calibratorB' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 1 ACs remains.
-Debug: Removing calibrator 'calibratorA' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 0 ACs remains.
 Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
 Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()
-Debug: Adding calibrator 'calibratorA' in GNEChange_Additional
-Debug: Adding calibrator 'calibratorB' in GNEChange_Additional
-Debug: Adding routeProbe 'RouteProbeA' in GNEChange_Additional
-Debug: Adding routeProbe 'RouteProbeB' in GNEChange_Additional
-Debug: Adding routeProbe 'customRouteProbeName' in GNEChange_Additional
-Debug: Keys Ctrl+Y (Redo) pressed
-Debug: Calling GNEUndoList::redo()
 Debug: Setting new attribute selected 'true' into junction 'gneJ0'
 Debug: Setting new attribute selected 'true' into edge 'gneE1'
 Debug: Setting new attribute selected 'true' into junction 'gneJ1'

diff --git a/tests/netedit/additionalElements/calibrator/inspect_selection/parameters/test.py b/tests/netedit/additionalElements/calibrator/inspect_selection/parameters/test.py
@@ -37,39 +37,8 @@
 # inspect calibrator
 netedit.leftClick(referencePosition, 310, 140)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(6, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(6, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(6, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(6, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(6, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(6, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(6, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(6, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(6, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(6, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 9)
-netedit.redo(referencePosition, 9)
+# check parameters
+netedit.checkParameters(referencePosition, 6, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/chargingstation/inspect/parameters/test.py b/tests/netedit/additionalElements/chargingstation/inspect/parameters/test.py
@@ -43,39 +43,8 @@
 # inspect first chargingStation
 netedit.leftClick(referencePosition, 250, 168)
 
-# Change generic parameters with an invalid value (dummy)
-netedit.modifyAttribute(11, "dummyGenericParameters", True)
-
-# Change generic parameters with an invalid value (invalid format)
-netedit.modifyAttribute(11, "key1|key2|key3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(11, "key1=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (empty values)
-netedit.modifyAttribute(11, "key1=|key2=|key3=", True)
-
-# Change generic parameters with a valid value (clear parameters)
-netedit.modifyAttribute(11, "", True)
-
-# Change generic parameters with an valid value (duplicated keys)
-netedit.modifyAttribute(11, "key1duplicated=value1|key1duplicated=value2|key3=value3", True)
-
-# Change generic parameters with a valid value (duplicated values)
-netedit.modifyAttribute(11, "key1=valueDuplicated|key2=valueDuplicated|key3=valueDuplicated", True)
-
-# Change generic parameters with an invalid value (invalid key characters)
-netedit.modifyAttribute(11, "keyInvalid.;%>%$$=value1|key2=value2|key3=value3", True)
-
-# Change generic parameters with a invalid value (invalid value characters)
-netedit.modifyAttribute(11, "key1=valueInvalid%;%$<>$$%|key2=value2|key3=value3", True)
-
-# Change generic parameters with a valid value
-netedit.modifyAttribute(11, "keyFinal1=value1|keyFinal2=value2|keyFinal3=value3", True)
-
-# Check undo redo
-netedit.undo(referencePosition, 8)
-netedit.redo(referencePosition, 8)
+# check parameters
+netedit.checkParameters(referencePosition, 11, True)
 
 # save additionals
 netedit.saveAdditionals(referencePosition)

diff --git a/tests/netedit/additionalElements/chargingstation/inspect_selection/parameters/errors.netedit b/tests/netedit/additionalElements/chargingstation/inspect_selection/parameters/errors.netedit
@@ -70,19 +70,9 @@ Debug: Setting previous attribute selected '0' into edge 'gneE0'
 Debug: Setting previous attribute selected '0' into junction 'gneJ1'
 Debug: Setting previous attribute selected '0' into edge 'gneE1'
 Debug: Setting previous attribute selected '0' into junction 'gneJ0'
-Debug: Keys Ctrl+Z (Undo) pressed
-Debug: Calling GNEUndoList::undo()
-Debug: Removing chargingStation 'chargingStationB' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 1 ACs remains.
-Debug: Removing chargingStation 'chargingStationA' in GNEChange_Additional
-Debug: Removed inspected element from Inspected ACs. 0 ACs remains.
 Debug: ObjectsUnderCursor: GUIGlObjects: 0, AttributeCarriers: 0, NetElements: 0, Additionals: 0, DemandElements: 0, Shapes: 0, Junctions: 0, Edges: 0, Lanes: 0, Crossings: 0, Connections: 0, TAZs: 0, POIs: 0, Polys: 0
 Debug: Keys Ctrl+Y (Redo) pressed
 Debug: Calling GNEUndoList::redo()
-Debug: Adding chargingStation 'chargingStationA' in GNEChange_Additional
-Debug: Adding chargingStation 'chargingStationB' in GNEChange_Additional
-Debug: Keys Ctrl+Y (Redo) pressed
-Debug: Calling GNEUndoList::redo()
 Debug: Setting new attribute selected 'true' into junction 'gneJ0'
 Debug: Setting new attribute selected 'true' into edge 'gneE1'
 Debug: Setting new attribute selected 'true' into junction 'gneJ1'