Skip to content

Commit

Permalink
Updated netedit test. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Jan 8, 2025
1 parent f93b985 commit b7da9dd
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 30 deletions.
6 changes: 3 additions & 3 deletions tests/netedit/attributesEnum.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,9 @@ class inspectSelection:
chargeInTrainsit = 5
chargeDelay = 6
chargeType = 7
waitingTime = 9
parkingArea = 10
parameters = 13
waitingTime = 8
parkingArea = 9
parameters = 12

# access

Expand Down
2 changes: 1 addition & 1 deletion tests/netedit/elements/additionals/chargingstation/inspect_selection/additionals.add.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<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="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="electric" waitingTime="600" friendlyPos="false">
<chargingStation id="chargingStationA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="0" chargeDelay="1.00" name="chargingStationNameA" chargeType="battery-exchange" waitingTime="600" friendlyPos="false">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA3" value="valueA2"/>
<param key="KeyA2" value="valueA3"/>
Expand Down
4 changes: 2 additions & 2 deletions ...it/elements/additionals/chargingstation/inspect_selection/chargedelay/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:51:17 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:58:44 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="6300" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
4 changes: 2 additions & 2 deletions ...lements/additionals/chargingstation/inspect_selection/chargeintransit/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:51:02 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:57:01 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeInTransit="1" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
4 changes: 2 additions & 2 deletions ...dit/elements/additionals/chargingstation/inspect_selection/efficiency/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:51:04 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:55:32 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.50" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
4 changes: 2 additions & 2 deletions ...it/elements/additionals/chargingstation/inspect_selection/friendlypos/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:50:38 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:52:11 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" friendlyPos="true" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
4 changes: 2 additions & 2 deletions ...s/netedit/elements/additionals/chargingstation/inspect_selection/name/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:50:33 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:50:43 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="commonName" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="commonName" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
4 changes: 2 additions & 2 deletions ...dit/elements/additionals/chargingstation/inspect_selection/parameters/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:53:25 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 16:06:48 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="21000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="keyFinal1" value="value1"/>
<param key="keyFinal2" value="value2"/>
<param key="keyFinal3" value="value3"/>
Expand Down
4 changes: 2 additions & 2 deletions .../netedit/elements/additionals/chargingstation/inspect_selection/power/additionals.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-06-21 15:50:56 by Eclipse SUMO netedit Version v1_20_0+0745-4885fc9a1a0
<!-- generated on 2025-01-08 15:53:51 by Eclipse SUMO netedit Version v1_21_0+1753-5c4601afe0a
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
Expand All @@ -15,7 +15,7 @@ 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 -->
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="11000.00" efficiency="0.65" chargeDelay="1000" chargeType="electric" waitingTime="600.00">
<chargingStation id="chargingStationA" name="chargingStationNameA" lane="EdgeCenter1_1" startPos="16.71" endPos="26.71" power="11000.00" efficiency="0.65" chargeDelay="1000" chargeType="battery-exchange" waitingTime="600.00">
<param key="KeyA1" value="valueA1"/>
<param key="KeyA2" value="valueA3"/>
<param key="KeyA3" value="valueA2"/>
Expand Down
5 changes: 3 additions & 2 deletions ...dit/elements/additionals/rerouterelements/destprobreroute/load/probability/errors.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a destProbReroute Invalid Number Format (double) dummyProb.
Error: Probability of destProbReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/destprobreroute/load/probability/additionals.add.xml failed.
Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-30.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\destprobreroute\load\probability\additionals.add.xml failed.
5 changes: 3 additions & 2 deletions ...etedit/elements/additionals/rerouterelements/destprobreroute/load/probability/log.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a destProbReroute Invalid Number Format (double) dummyProb.
Error: Probability of destProbReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/destprobreroute/load/probability/additionals.add.xml failed.
Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build destProbReroute with ID 'EdgeCenter0' in netedit; Attribute probability cannot be negative (-30.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\destprobreroute\load\probability\additionals.add.xml failed.
5 changes: 3 additions & 2 deletions .../elements/additionals/rerouterelements/parkingareareroute/load/probability/errors.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a parkingAreaReroute Invalid Number Format (double) dummyProb.
Error: Probability of parkingAreaReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/parkingareareroute/load/probability/additionals.add.xml failed.
Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-30.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\parkingareareroute\load\probability\additionals.add.xml failed.
5 changes: 3 additions & 2 deletions ...dit/elements/additionals/rerouterelements/parkingareareroute/load/probability/log.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a parkingAreaReroute Invalid Number Format (double) dummyProb.
Error: Probability of parkingAreaReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/parkingareareroute/load/probability/additionals.add.xml failed.
Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build parkingAreaReroute with ID 'parkingArea' in netedit; Attribute probability cannot be negative (-30.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\parkingareareroute\load\probability\additionals.add.xml failed.
5 changes: 3 additions & 2 deletions ...it/elements/additionals/rerouterelements/routeprobreroute/load/probability/errors.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a routeProbReroute Invalid Number Format (double) dummyProbability.
Error: Probability of routeProbReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/routeprobreroute/load/probability/additionals.add.xml failed.
Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-50.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\routeprobreroute\load\probability\additionals.add.xml failed.
5 changes: 3 additions & 2 deletions ...tedit/elements/additionals/rerouterelements/routeprobreroute/load/probability/log.netedit
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Error: Attribute 'probability' in definition of a routeProbReroute Invalid Number Format (double) dummyProbability.
Error: Probability of routeProbReroute must be equal or greater than 0
Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.27Jun141222.28750/netedit.gui/elements/additionals/rerouterelements/routeprobreroute/load/probability/additionals.add.xml failed.
Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-1.00).
Error: Could not build routeProbReroute with ID 'route_0' in netedit; Attribute probability cannot be negative (-50.00).
Error: Loading of C:\Users\alva_pa\.texttest\tmp\netedit.gui.08Jan140902.4912\netedit.gui\elements\additionals\rerouterelements\routeprobreroute\load\probability\additionals.add.xml failed.

0 comments on commit b7da9dd

Please sign in to comment.