Skip to content

Commit

Permalink
added new tests. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Jan 6, 2025
1 parent e0d0e22 commit aca85df
Show file tree
Hide file tree
Showing 170 changed files with 8,659 additions and 99 deletions.
40 changes: 20 additions & 20 deletions tests/netedit/attributesEnum.py
Original file line number Diff line number Diff line change
Expand Up @@ -2391,16 +2391,16 @@ class inspectSelection:
extensionEnable = 5
extension = 6
triggered = 7
expected = 9
join = 9
permitted = 10
parking = 11
actType = 13
tripID = 14
line = 15
onDemand = 16
jump = 17
split = 18
expected = 8
join = 8
permitted = 9
parking = 10
actType = 12
tripID = 13
line = 14
onDemand = 15
jump = 16
split = 17

# stop over train stop

Expand Down Expand Up @@ -2452,16 +2452,16 @@ class inspectSelection:
extensionEnable = 5
extension = 6
triggered = 7
expected = 9
join = 9
permitted = 10
parking = 11
actType = 13
tripID = 14
line = 15
onDemand = 16
jump = 17
split = 18
expected = 8
join = 8
permitted = 9
parking = 10
actType = 12
tripID = 13
line = 14
onDemand = 15
jump = 16
split = 17

# stop over container stop

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
TestFunctions: Clicked over position 600 - 179
;;;;

customTripID
customSplit
TestFunctions: Clicked over position 304 - 168
TestFunctions: Clicked over position 304 - 168
TestFunctions: Netedit closed successfully
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-10 10:56:32 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2025-01-06 11:43:58 by Eclipse SUMO netedit Version v1_21_0+1670-ab8067742d2
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Routes -->
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow">
<stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="customTripID" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
<stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="customSplit" jump="4.00" actType="walking"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" expectedContainers="customTripID" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
<stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="customSplit" onDemand="1" jump="8.40" actType="singing"/>
</route>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, netedit.positions.elements.demands.busStop)

# change value
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, ";;;;", False)
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, ";;;;", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, "", False)
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, "", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.join, "customTripID", False)
netedit.modifyAttribute(netedit.attrs.stopBusStop.inspectSelection.split, "customSplit", False)

# Check undo redo
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, netedit.positions.elements.demands.chargingStation)

# change value
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, ";;;;", False)
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, ";;;;", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, "", False)
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, "", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.join, "customTripID", False)
netedit.modifyAttribute(netedit.attrs.stopChargingStation.inspectSelection.split, "customSplit", False)

# Check undo redo
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, netedit.positions.elements.demands.containerStop)

# change value
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, ";;;;", False)
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, ";;;;", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, "", False)
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, "", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.join, "customTripID", False)
netedit.modifyAttribute(netedit.attrs.stopContainerStop.inspectSelection.split, "customSplit", False)

# Check undo redo
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, netedit.positions.elements.demands.parkingArea)

# change value
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, ";;;;", False)
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, ";;;;", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, "", False)
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, "", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.join, "customTripID", False)
netedit.modifyAttribute(netedit.attrs.stopParkingArea.inspectSelection.split, "customSplit", False)

# Check undo redo
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
netedit.leftClick(referencePosition, netedit.positions.elements.demands.trainStop)

# change value
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, ";;;;", False)
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, ";;;;", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, "", False)
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, "", False)

# change value
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.join, "customTripID", False)
netedit.modifyAttribute(netedit.attrs.stopTrainStop.inspectSelection.split, "customSplit", False)

# Check undo redo
netedit.checkUndoRedo(referencePosition)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-10-29 17:23:41 by Eclipse SUMO netedit Version v1_21_0+0570-cf2b8cf0724
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<busStop id="busStopA" lane="Edge2_1" startPos="46.00" endPos="56.00"/>
<busStop id="busStopB" name="i" lane="EdgeCenter1_1" startPos="24.18" endPos="31.09"/>
<trainStop id="trainStopA" lane="Edge2_1" startPos="2.00" endPos="12.00"/>
<trainStop id="trainStopB" name="m" lane="EdgeCenter0_1" startPos="6.05" endPos="12.95"/>
<containerStop id="containerStopA" lane="Edge2_1" startPos="34.00" endPos="44.00"/>
<containerStop id="containerStopB" lane="EdgeCenter1_1" startPos="10.36" endPos="20.73"/>
<parkingArea id="parkingAreaA" lane="Edge2_1" startPos="22.00" endPos="32.00"/>
<parkingArea id="parkingAreaB" lane="EdgeCenter0_1" startPos="16.41" endPos="26.77"/>
<chargingStation id="chargingStationA" lane="Edge2_1" startPos="13.00" endPos="21.00"/>
<chargingStation id="chargingStationB" lane="EdgeCenter1_1" startPos="34.42" endPos="41.58"/>
<!-- Detectors -->
<inductionLoop id="e1_0" lane="Edge4_1" pos="3.00" period="300.00" file="e1_0.xml"/>
<inductionLoop id="e1_1" lane="Edge1_1" pos="27.00" period="300.00" file="e1_1.xml"/>
<!-- TAZs -->
<taz id="taz_green" shape="8.00,10.00 8.00,-10.00 -4.00,-10.00 -4.00,10.00 8.00,10.00" center="6.00,0.00" fill="1" color="green">
<tazSource id="Edge2" weight="1.00"/>
<tazSink id="Edge2" weight="1.00"/>
<tazSource id="Edge3" weight="1.00"/>
<tazSink id="Edge3" weight="1.00"/>
</taz>
<taz id="taz_red" shape="20.00,10.00 20.00,-10.00 42.00,-10.00 42.00,10.00 20.00,10.00" center="22.00,0.00" fill="1" color="red">
<tazSource id="Edge0" weight="1.00"/>
<tazSink id="Edge0" weight="1.00"/>
<tazSource id="Edge5" weight="1.00"/>
<tazSink id="Edge5" weight="1.00"/>
</taz>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-11 16:49:12 by Eclipse SUMO netedit Version v1_20_0+0459-30b40d5d475
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
<interval id="dataSet" begin="0.00" end="3600.00">
<edge id="Edge0"/>
<edge id="Edge1"/>
<edge id="Edge2"/>
<edge id="Edge3"/>
<edge id="Edge4"/>
<edge id="Edge5"/>
</interval>
</data>
Empty file.
Loading

0 comments on commit aca85df

Please sign in to comment.