Skip to content

Commit

Permalink
Patching netedit test. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Sep 6, 2023
1 parent a5da73d commit 7e6f85e
Show file tree
Hide file tree
Showing 22 changed files with 77 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
netedit.leftClick(referencePosition, 474, 194)

# Change parameter id with a non valid value (non existent ID)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "dummyEdge", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edge, "dummyEdge", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "top", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edge, "top", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (Duplicated ID)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "ca_0", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "ca_0", True)

# Change parameter id with a non valid value (Invalid ID)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "Id with spaces", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "Id with spaces", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.id, "correctID", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.id, "correctID", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "///;;", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "///;;", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.vTypes, "type1 type2", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.vTypes, "type1 type2", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
calibratorLane
TestFunctions: Clicked over position 616 - 418
TestFunctions: Clicked over position 767 - 397
dummyEdge
dummyLane
top
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (non existent ID)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "dummyEdge", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.lane, "dummyLane", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.edgeLane, "top", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.lane, "top", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.name, "///", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.name, "///", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.name, "customName", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.name, "customName", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.output, "///;;", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.output, "///;;", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.output, "myOwnFilename", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.output, "myOwnFilename", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
netedit.leftClick(referencePosition, 463, 229)

# check parameters
netedit.checkParameters(referencePosition, netedit.attrs.calibrator.inspect.parameters, True)
netedit.checkParameters(referencePosition, netedit.attrs.calibrator.inspectLane.parameters, True)

# save netedit config
netedit.saveNeteditConfig(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (dummy)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "dummyFreq", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "dummyFreq", True)

# Change parameter id with a non valid value (negative)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "-12", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "-12", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.frequency, "12.5", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.frequency, "12.5", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (dummy)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "dummyPos", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "dummyPos", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "-12", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "-12", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "5000", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "5000", True)

# Change parameter id with a valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.pos, "10", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.pos, "10", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "///;;", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "///;;", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "nonExistentRouteProbe", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "nonExistentRouteProbe", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.routeProbe, "routeProbe_0", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.routeProbe, "routeProbe_0", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, 463, 229)

# Change parameter id with a non valid value (invalid characters)
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "dummyJam", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "dummyJam", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "-5", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "-5", True)

# Change parameter id with valid value
netedit.modifyAttribute(netedit.attrs.calibrator.inspect.jamTreshold, "7.7", True)
netedit.modifyAttribute(netedit.attrs.calibrator.inspectLane.jamTreshold, "7.7", True)

# Check undos and redos
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- chargingStation A -->
<chargingStation id="chargingStationA" lane="center1_1" startPos="5" endPos="10" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" friendlyPos="false">
<chargingStation id="chargingStationA" lane="center1_1" startPos="5" endPos="10" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="electric" waitingTime="600" friendlyPos="false">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA3" value="valueA2"/>
<param key="KeyA2" value="valueA3"/>
</chargingStation>

<!-- chargingStation B -->
<chargingStation id="chargingStationB" lane="center1_1" startPos="15" endPos="20" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2.00" name="chargingStationNameB" friendlyPos="true">
<chargingStation id="chargingStationB" lane="center1_1" startPos="15" endPos="20" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2.00" name="chargingStationNameB" chargeType="fuel" waitingTime="500" friendlyPos="true">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB3" value="valueB2"/>
<param key="KeyB2" value="valueB3"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:07:53 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:27:26 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="6300">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="electric" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</chargingStation>
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="6300">
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="6300" chargeType="fuel" waitingTime="500.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB2" value="valueB3"/>
<param key="KeyB3" value="valueB2"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:06:24 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:25:37 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</chargingStation>
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB2" value="valueB3"/>
<param key="KeyB3" value="valueB2"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:05:14 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:24:03 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.50" chargeDelay="1000">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</chargingStation>
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.50" chargeInTransit="1" chargeDelay="2000">
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.50" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB2" value="valueB3"/>
<param key="KeyB3" value="valueB2"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:02:21 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:20:30 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</chargingStation>
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB2" value="valueB3"/>
<param key="KeyB3" value="valueB2"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:01:12 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:18:57 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="commonName" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000">
<chargingStation id="chargingStationA" name="commonName" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
</chargingStation>
<chargingStation id="chargingStationB" name="commonName" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
<chargingStation id="chargingStationB" name="commonName" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
<param key="KeyB1" value="valueB1"/>
<param key="KeyB2" value="valueB3"/>
<param key="KeyB3" value="valueB2"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-13 16:10:41 by Eclipse SUMO netedit Version v1_16_0+0157-fcef944c26c
<!-- generated on 2023-09-06 16:50:55 by Eclipse SUMO netedit Version v1_18_0+1441-a5da73da77a
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="center1_1" startPos="5.00" endPos="10.00" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<param key="keyFinal1" value="value1"/>
<param key="keyFinal2" value="value2"/>
<param key="keyFinal3" value="value3"/>
</chargingStation>
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000">
<chargingStation id="chargingStationB" name="chargingStationNameB" lane="center1_1" startPos="15.00" endPos="20.00" friendlyPos="true" power="13000.00" efficiency="0.85" chargeInTransit="1" chargeDelay="2000" chargeType="fuel" waitingTime="500.00">
<param key="keyFinal1" value="value1"/>
<param key="keyFinal2" value="value2"/>
<param key="keyFinal3" value="value3"/>
Expand Down
Loading

0 comments on commit 7e6f85e

Please sign in to comment.