Skip to content

Commit

Permalink
Patching NETEDIT test expected results. Refs eclipse-sumo#3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Oct 19, 2020
1 parent 829ac81 commit 54d92b5
Show file tree
Hide file tree
Showing 131 changed files with 319 additions and 295 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 582 - 365
TestFunctions: Clicked over position 582 - 368
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
netedit.inspectMode()

# inspect busstops
netedit.leftClick(referencePosition, 278, 197)
netedit.leftClick(referencePosition, 278, 200)

# disable friendlyPos
netedit.modifyBoolAttribute(1, False)
netedit.modifyBoolAttribute(1, True)

# go to select mode
netedit.selectMode()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 582 - 365
TestFunctions: Clicked over position 582 - 368
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
netedit.inspectMode()

# inspect busstops
netedit.leftClick(referencePosition, 278, 197)
netedit.leftClick(referencePosition, 278, 200)

# disable friendlyPos
netedit.modifyBoolAttribute(1, False)
netedit.modifyBoolAttribute(1, True)

# go to select mode
netedit.selectMode()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 582 - 365
TestFunctions: Clicked over position 582 - 368
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
netedit.inspectMode()

# inspect busstops
netedit.leftClick(referencePosition, 278, 197)
netedit.leftClick(referencePosition, 278, 200)

# disable friendlyPos
netedit.modifyBoolAttribute(1, False)
netedit.modifyBoolAttribute(1, True)

# go to select mode
netedit.selectMode()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 582 - 365
TestFunctions: Clicked over position 582 - 368
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
netedit.inspectMode()

# inspect busstops
netedit.leftClick(referencePosition, 278, 197)
netedit.leftClick(referencePosition, 278, 200)

# disable friendlyPos
netedit.modifyBoolAttribute(1, False)
netedit.modifyBoolAttribute(1, True)

# go to select mode
netedit.selectMode()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
dummyEdge
gneE3
TestFunctions: Clicked over position 304 - 168
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (non existent ID)
netedit.modifyAttribute(1, "dummyEdge", True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
dummyFreq
-12
12.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (dummy)
netedit.modifyAttribute(3, "dummyFreq", True)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 08.03.2019 14:07:27 by Eclipse SUMO netedit Version v1_1_0+1177-ae4e665b46
<!-- generated on 19.10.2020 10:53:01 by Eclipse SUMO netedit Version v1_7_0+0644-c2b60a409c
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\input_net.net.xml"/>
<sumo-net-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\input_net.net.xml"/>
</input>
<output>
<output-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\net.net.xml"/>
<output-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\net.net.xml"/>
</output>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
Expand All @@ -29,28 +30,34 @@
</pedestrian>
<netedit>
<additionals-output value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\additionals.xml"/>
<demandelements-output value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\routes.xml"/>
<additional-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\additionals.xml"/>
<additionals-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\additionals.xml"/>
<route-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\routes.xml"/>
<demandelements-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\routes.xml"/>
<data-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\datas.xml"/>
<dataelements-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\datas.xml"/>
</netedit>
<visualisation>
<gui-settings-file value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\gui-settings.xml"/>
<gui-settings-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\gui-settings.xml"/>
<window-size value="700,500"/>
<window-pos value="50,50"/>
<gui-testing value="true"/>
<gui-testing-debug value="true"/>
<gui-testing-debug-gl value="true"/>
<gui-testing.setting-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\guisettingsoutput.xml"/>
</visualisation>
<report>
<no-warnings value="true"/>
<error-log value="C:/Users/SUMO-Test/.texttest/tmp/netedit.gui.3_from_08Mar135632.5892/netedit.gui/additionalElements/calibrator/inspect/id\log.txt"/>
<aggregate-warnings value="5"/>
<error-log value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.19Oct105218.7180\netedit.gui\additionalElements\calibrator\inspect\id\log.txt"/>
</report>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<calibrator id="calibrator_gneE3_1" edge="gneE3" pos="0.00"/>
<calibrator id="correctID" edge="gneE3" pos="0.00"/>
<calibrator id="calibrator_gneE3_0" edge="gneE3" pos="0.00"/>
<calibrator id="correctID" edge="gneE2" pos="0.00"/>
</additional>
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ Debug: Format of optional optional string attribute 'routeProbe' of calibrator w
Debug: Adding calibrator 'calibrator_gneE3_0' in GNEChange_Additional
Debug: Additionals has to be saved
Debug: Current saving Status: net saved, additionals unsaved, demand elements saved, data sets saved
Debug: Format of optional optional string attribute 'routeProbe' of calibrator with ID 'calibrator_gneE3_1' is invalid; RouteProbe ID contains invalid characters; Default value will be used.
Debug: Adding calibrator 'calibrator_gneE3_1' in GNEChange_Additional
Debug: Format of optional optional string attribute 'routeProbe' of calibrator with ID 'calibrator_gneE2_1' is invalid; RouteProbe ID contains invalid characters; Default value will be used.
Debug: Adding calibrator 'calibrator_gneE2_1' in GNEChange_Additional
Debug: Value 'calibrator_gneE3_0' for attribute id of calibrator isn't valid
Debug: Value 'Id with spaces' for attribute id of calibrator isn't valid
Debug: Setting new attribute id 'correctID' into calibrator 'calibrator_gneE3_0'
Debug: Setting new attribute id 'correctID' into calibrator 'calibrator_gneE2_1'
Debug: Keys Ctrl+Z (Undo) pressed
Debug: Calling GNEUndoList::undo()
Debug: Setting previous attribute id 'calibrator_gneE3_0' into calibrator 'correctID'
Debug: Setting previous attribute id 'calibrator_gneE2_1' into calibrator 'correctID'
Debug: Keys Ctrl+Z (Undo) pressed
Debug: Calling GNEUndoList::undo()
Debug: Removing calibrator 'calibrator_gneE3_1' in GNEChange_Additional
Debug: Removing calibrator 'calibrator_gneE2_1' in GNEChange_Additional
Debug: Keys Ctrl+Z (Undo) pressed
Debug: Calling GNEUndoList::undo()
Debug: Removing calibrator 'calibrator_gneE3_0' in GNEChange_Additional
Expand All @@ -35,10 +35,10 @@ Debug: Calling GNEUndoList::redo()
Debug: Adding calibrator 'calibrator_gneE3_0' in GNEChange_Additional
Debug: Keys Ctrl+Y (Redo) pressed
Debug: Calling GNEUndoList::redo()
Debug: Adding calibrator 'calibrator_gneE3_1' in GNEChange_Additional
Debug: Adding calibrator 'calibrator_gneE2_1' in GNEChange_Additional
Debug: Keys Ctrl+Y (Redo) pressed
Debug: Calling GNEUndoList::redo()
Debug: Setting new attribute id 'correctID' into calibrator 'calibrator_gneE3_0'
Debug: Setting new attribute id 'correctID' into calibrator 'calibrator_gneE2_1'
Debug: Additionals saved
GLDebug: Removing junctions during recomputing
GLDebug: Removed object junction:gneJ0 from SUMORTree with boundary -12.00,-12.00,12.00,12.00
Expand Down Expand Up @@ -68,10 +68,10 @@ Debug: Created crossing ':gneJ0_c0' in retrieveGNECrossing()
Debug: Created crossing ':gneJ0_c1' in retrieveGNECrossing()
Debug: Created crossing ':gneJ1_c0' in retrieveGNECrossing()
Debug: Created crossing ':gneJ1_c1' in retrieveGNECrossing()
Debug: Deleting unreferenced calibrator 'calibrator_gneE3_1'
Debug: Deleting unreferenced calibrator 'correctID'
Debug: Additionals has to be saved
Debug: Current saving Status: net saved, additionals unsaved, demand elements saved, data sets saved
Debug: Deleting unreferenced calibrator 'correctID'
Debug: Deleting unreferenced calibrator 'calibrator_gneE3_0'
Debug: Deleting unreferenced edge 'gneE0' in AttributeCarriers destructor
Debug: Deleting unreferenced lane 'gneE0_0' in GNEEdge destructor
Debug: Deleting unreferenced connection 'fromgneE0_0togneE1_0' in GNEEdge destructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<viewsettings>
<scheme name="testing">
<opengl dither="0" fps="0" drawBoundaries="0" forceDrawPositionSelection="0" forceDrawRectangleSelection="0"/>
<opengl dither="0" fps="0" drawBoundaries="0" forceDrawPositionSelection="0" forceDrawRectangleSelection="0" forceDrawDottedContour="0"/>
<background backgroundColor="white" showGrid="1" gridXSize="1.00" gridYSize="1.00"/>
<edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" showLinkRules="1" showRails="1" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed"
<edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" showLinkRules="1" showRails="1" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed" edgeValueHideCheck="0" edgeValueHideThreshold="0.00"
edgeName_show="0" edgeName_size="60.00" edgeName_color="orange" edgeName_bgColor="128,0,0,0" edgeName_constantSize="1"
internalEdgeName_show="0" internalEdgeName_size="45.00" internalEdgeName_color="128,64,0" internalEdgeName_bgColor="128,0,0,0" internalEdgeName_constantSize="1"
cwaEdgeName_show="0" cwaEdgeName_size="60.00" cwaEdgeName_color="magenta" cwaEdgeName_bgColor="128,0,0,0" cwaEdgeName_constantSize="1"
Expand Down Expand Up @@ -112,6 +112,9 @@
<entry color="204,204,204" threshold="0.00"/>
<entry color="red" threshold="1.00"/>
</colorScheme>
<colorScheme name="by edgeData (numerical, streetwise)" interpolated="1">
<entry color="204,204,204" name="missing data"/>
</colorScheme>
<scalingScheme name="default">
<entry color="1.00" name="uniform"/>
</scalingScheme>
Expand Down Expand Up @@ -182,7 +185,7 @@
</colorScheme>
</junctions>
<additionals addMode="0" add_minSize="1.00" add_exaggeration="1.00" add_constantSize="0" add_constantSizeSelected="0" addName_show="0" addName_size="60.00" addName_color="255,0,128" addName_bgColor="128,0,0,0" addName_constantSize="1" addFullName_show="0" addFullName_size="60.00" addFullName_color="255,0,128" addFullName_bgColor="128,0,0,0" addFullName_constantSize="1"/>
<pois poi_minSize="0.00" poi_exaggeration="1.00" poi_constantSize="0" poi_constantSizeSelected="0" poiName_show="0" poiName_size="50.00" poiName_color="255,0,128" poiName_bgColor="128,0,0,0" poiName_constantSize="1" poiType_show="0" poiType_size="60.00" poiType_color="255,0,128" poiType_bgColor="128,0,0,0" poiType_constantSize="1">
<pois poiTextParam="PARAM_TEXT" poi_minSize="0.00" poi_exaggeration="1.00" poi_constantSize="0" poi_constantSizeSelected="0" poiName_show="0" poiName_size="50.00" poiName_color="255,0,128" poiName_bgColor="128,0,0,0" poiName_constantSize="1" poiType_show="0" poiType_size="60.00" poiType_color="255,0,128" poiType_bgColor="128,0,0,0" poiType_constantSize="1" poiText_show="0" poiText_size="80.00" poiText_color="140,0,255" poiText_bgColor="128,0,0,0" poiText_constantSize="1">
<colorScheme name="given POI color">
<entry color="red"/>
</colorScheme>
Expand All @@ -206,7 +209,7 @@
<entry color="orange"/>
</colorScheme>
</polys>
<legend showSizeLegend="1" showColorLegend="0"/>
<legend showSizeLegend="1" showColorLegend="0" showVehicleColorLegend="0"/>
</scheme>
<viewport zoom="100.00" x="50.00" y="24.80" angle="0.00"/>
<viewport zoom="100.00" x="0.00" y="15.20" angle="0.00"/>
</viewsettings>
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 308
TestFunctions: Clicked over position 474 - 438
TestFunctions: Clicked over position 588 - 433
TestFunctions: Clicked over position 474 - 448
TestFunctions: Clicked over position 672 - 393
calibrator_gneE3_0
Id with spaces
correctID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
netedit.leftClick(referencePosition, 245, 140)

# create second calibrator
netedit.leftClick(referencePosition, 170, 270)
netedit.leftClick(referencePosition, 170, 280)

# go to inspect mode
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 284, 265)
netedit.leftClick(referencePosition, 368, 225)

# Change parameter id with a non valid value (Duplicated ID)
netedit.modifyAttribute(0, "calibrator_gneE3_0", True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
///
customName
TestFunctions: Clicked over position 304 - 168
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(4, "///", True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
///;;
myOwnFilename
TestFunctions: Clicked over position 304 - 168
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(6, "///;;", True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
dummyGenericParameters
key1|key2|key3
key1=value1|key2=value2|key3=value3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# check parameters
netedit.checkParameters(referencePosition, 8, True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
dummyPos
-12
5000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (dummy)
netedit.modifyAttribute(2, "dummyPos", True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
calibrator
TestFunctions: Clicked over position 549 - 348
TestFunctions: Clicked over position 659 - 413
TestFunctions: Clicked over position 659 - 398
///;;
customRouteProbeName
TestFunctions: Clicked over position 304 - 168
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
netedit.inspectMode()

# inspect calibrator
netedit.leftClick(referencePosition, 355, 245)
netedit.leftClick(referencePosition, 355, 230)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(5, "///;;", True)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 551 - 311
TestFunctions: Clicked over position 551 - 298
dummyFreq
-12
12.5
Expand Down
Loading

0 comments on commit 54d92b5

Please sign in to comment.