Skip to content

Commit

Permalink
Patching netedit expected results. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Nov 10, 2023
1 parent df295cd commit 25c981f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 17 deletions.
4 changes: 2 additions & 2 deletions tests/netedit/demandelements/stop/containerstop/create/tripid/routes.netedit
View file
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:29:27 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 10:15:46 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Vehicles, persons and containers (sorted by depart) -->
<trip id="trip" depart="0.00" from="Edge0" to="Edge2">
<stop containerStop="containerStopA" duration="60.00"/>
<stop containerStop="containerStopA" duration="60.00"/>
<stop containerStop="containerStopA" duration="60.00" tripId="tripID"/>
</trip>
</routes>
2 changes: 1 addition & 1 deletion tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/output.netedit
View file
@@ -1,7 +1,7 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 679 - 180
TestFunctions: Clicked over position 919 - 159
dummyValue

-5
Expand Down
6 changes: 3 additions & 3 deletions tests/netedit/demandelements/stop/containerstop/inspect_selection/jump/routes.netedit
View file
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:33:15 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 10:16:07 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
-->

<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="3.50" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
<stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop busStop="busStopB" duration="3.50" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
<stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" 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
2 changes: 1 addition & 1 deletion tests/netedit/demandelements/stop/containerstop/inspect_selection/split/output.netedit
View file
@@ -1,7 +1,7 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 679 - 180
TestFunctions: Clicked over position 919 - 159
;;;;

customTripID
Expand Down
6 changes: 3 additions & 3 deletions tests/netedit/demandelements/stop/containerstop/inspect_selection/split/routes.netedit
View file
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:36:03 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 10:15:44 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
-->

<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="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="customTripID"/>
<stop containerStop="containerStopA" 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"/>
</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" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="customTripID"/>
<stop containerStop="containerStopB" 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"/>
</route>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0"/>
Expand Down
10 changes: 3 additions & 7 deletions tests/netedit/demandelements/stop/trainstop/create/no_parent/routes.netedit
View file
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:39:36 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 10:20:35 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
-->

<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="Edge3 Edge4 Edge5" color="yellow">
<stop trainStop="trainStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop trainStop="trainStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
</route>
<route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0"/>
<vehicle id="vehicle_1" depart="0.00" route="route_1"/>
Expand Down

0 comments on commit 25c981f

Please sign in to comment.