tests

eclipse-sumo · Aug 29, 2024 · b675ce2 · b675ce2
1 parent 925c6ed
commit b675ce2
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 13 deletions.
diff --git a/tests/netedit/elements/demands/container/volatile_recomputing/routes.netedit b/tests/netedit/elements/demands/container/volatile_recomputing/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-02 15:39:13 by Eclipse SUMO netedit Version v1_20_0+1519-a635611cf51
+<!-- generated on 2024-08-29 13:02:09 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
 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
@@ -14,7 +14,7 @@ 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">
-    <!-- Vehicles, containers and containers (sorted by depart) -->
+    <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
         <tranship from="EdgeExternBot" to="EdgeExternTop"/>
     </container>

diff --git a/tests/netedit/elements/demands/containerflow/create/containersperhour/routes.netedit b/tests/netedit/elements/demands/containerflow/create/containersperhour/routes.netedit
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-06 13:58:54 by Eclipse SUMO netedit Version v1_18_0+0135-de86dee393d
+<!-- generated on 2024-08-29 13:04:01 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
+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">
-    <!-- Vehicles, containers and containers (sorted by depart) -->
+    <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="7.30" end="3600.00" containersPerHour="1800">
         <tranship from="Edge0" busStop="busStopA"/>
     </containerFlow>

diff --git a/tests/netedit/elements/demands/containerflow/inspect/containersperhour/output.netedit b/tests/netedit/elements/demands/containerflow/inspect/containersperhour/output.netedit
@@ -4,7 +4,7 @@ TestFunctions: 'reference.png' found. Position: 304 - 168
 containerFlow
 TestFunctions: Clicked over position 685 - 611
 TestFunctions: Clicked over position 798 - 194
-TestFunctions: Clicked over position 465 - 642
+TestFunctions: Clicked over position 465 - 644
 dummyTerminate
 containersPerHour
 dummy

diff --git a/tests/netedit/elements/demands/containerflow/inspect/containersperhour/routes.netedit b/tests/netedit/elements/demands/containerflow/inspect/containersperhour/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-25 12:01:12 by Eclipse SUMO netedit Version v1_20_0+0810-10da16f3700
+<!-- generated on 2024-08-29 13:06:06 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
 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
@@ -14,8 +14,8 @@ 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">
-    <!-- Vehicles, containers and containers (sorted by depart) -->
+    <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="25.99991333362222434289">
-        <tranship from="Edge0" to="Edge2"/>
+        <transport from="Edge0" to="Edge2" lines="ANY"/>
     </containerFlow>
 </routes>
diff --git a/...netedit/elements/demands/containerflow/inspect_selection/containersperhour/output.netedit b/...netedit/elements/demands/containerflow/inspect_selection/containersperhour/output.netedit
@@ -1,7 +1,7 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 465 - 642
+TestFunctions: Clicked over position 465 - 644
 dummyTerminate
 containersPerHour
 dummy

diff --git a/...netedit/elements/demands/containerflow/inspect_selection/containersperhour/routes.netedit b/...netedit/elements/demands/containerflow/inspect_selection/containersperhour/routes.netedit
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-02 14:45:56 by Eclipse SUMO netedit Version v1_18_0+2345-1e1f4673c2b
+<!-- generated on 2024-08-29 13:08:10 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
+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">
-    <!-- Vehicles, containers and containers (sorted by depart) -->
+    <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="10.00" departPos="0.00" color="red" end="3600.00" containersPerHour="25.99991333362222434289">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>

diff --git a/tests/netedit/elements/demands/containerflow/volatile_recomputing/routes.netedit b/tests/netedit/elements/demands/containerflow/volatile_recomputing/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-09 15:35:01 by Eclipse SUMO netedit Version v1_20_0+1763-a87dd661c22
+<!-- generated on 2024-08-29 13:08:44 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
 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
@@ -14,7 +14,7 @@ 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">
-    <!-- Vehicles, containers and containers (sorted by depart) -->
+    <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="100">
         <tranship from="EdgeExternBot" to="EdgeExternTop"/>
     </containerFlow>