restored missing rail tests refs #21, #14376

eclipse-sumo · Feb 21, 2024 · edce6ad · edce6ad
1 parent 60a801e
commit edce6ad
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 20 deletions.
diff --git a/tests/sumo/rail/portion_working/testsuite.sumo b/tests/sumo/rail/portion_working/testsuite.sumo
@@ -4,6 +4,9 @@ split
 # split a train into two parts without specifing the departPos of the train that is created by splitting
 split_departPosDefault
 
+# split a train into a long rear part and a short front part
+split_longTrain
+
 # join two train parts into a single train
 join
 
@@ -28,5 +31,12 @@ join_front_further
 # the front part of the train is joined to the rear part but front part is already on another edge
 join_front_route_invalid
 
+# join two train parts into a single train. rail signal must allow the train to enter the block where the front part to be joined is already standing
+join_front_signal
+
+# the front part of the train is joined to the rear part (the rear part keeps its id),
+# the route of the front part continues (though it should disappear)
+join_front_route_problem
+
 # a single train has a split and a join-trigger
 locomotive_switches_sides
diff --git a/tests/sumo/rail/rail_signal/guard_insertion/railsignalblocks.sumo b/tests/sumo/rail/rail_signal/guard_insertion/railsignalblocks.sumo
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Jan 31 08:49:44 2019 by Eclipse SUMO Version v1_1_0+0435-678c69824b
+<!-- generated on 2024-02-21 08:22:46 by Eclipse SUMO sumo Version v1_19_0+0923-33f5cfd
 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
-SPDX-License-Identifier: EPL-2.0
+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
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -34,30 +39,34 @@ SPDX-License-Identifier: EPL-2.0
 <railsignal-block-output>
     <railSignal id="A">
         <link linkIndex="0" from="entry_0" to=":A_1_0">
-            <forwardBlock lanes=":A_1_0 beg_0"/>
-            <bidiBlock lanes=":A_0_0 -beg_0 :B_1_0 :B_0_0"/>
-            <backwardBlock lanes=""/>
-            <conflictLinks logicIndex="B_1 B_0"/>
+            <driveWay edges="beg end">
+                <forward lanes=":A_1_0 beg_0"/>
+                <bidi lanes=":A_0_0 -beg_0 :B_1_0 -end_0"/>
+                <flank lanes=":B_0_0"/>
+                <protectingSwitches links=""/>
+                <conflictLinks signals="B_0"/>
+            </driveWay>
         </link>
     </railSignal>
     <railSignal id="B">
         <link linkIndex="0" from="branch_0" to=":B_0_0">
-            <forwardBlock lanes=":B_0_0 -beg_0 :A_0_0 -entry_0"/>
-            <bidiBlock lanes=":B_2_0 beg_0 :A_1_0 entry_0"/>
-            <backwardBlock lanes=":B_1_0"/>
-            <conflictLinks logicIndex="B_1"/>
-        </link>
-        <link linkIndex="1" from="-end_0" to=":B_1_0">
-            <forwardBlock lanes=":B_1_0 -beg_0 :A_0_0 -entry_0"/>
-            <bidiBlock lanes=":B_2_0 beg_0 :A_1_0 entry_0"/>
-            <backwardBlock lanes=":B_0_0"/>
-            <conflictLinks logicIndex="B_0"/>
+            <driveWay edges="-beg -entry">
+                <forward lanes=":B_0_0 -beg_0 :A_0_0 -entry_0"/>
+                <bidi lanes="beg_0 :A_1_0 entry_0"/>
+                <flank lanes=":B_1_0"/>
+                <protectingSwitches links=""/>
+                <conflictLinks signals="B_1"/>
+            </driveWay>
         </link>
+        <link linkIndex="1" from="-end_0" to=":B_1_0"/>
         <link linkIndex="2" from="beg_0" to=":B_2_0">
-            <forwardBlock lanes=":B_2_0 end_0"/>
-            <bidiBlock lanes=":B_1_0 -end_0"/>
-            <backwardBlock lanes=""/>
-            <conflictLinks logicIndex=""/>
+            <driveWay edges="end">
+                <forward lanes=":B_2_0 end_0"/>
+                <bidi lanes=":B_1_0 -end_0"/>
+                <flank lanes=":B_0_0"/>
+                <protectingSwitches links=""/>
+                <conflictLinks signals="B_0"/>
+            </driveWay>
         </link>
     </railSignal>
 </railsignal-block-output>
diff --git a/tests/sumo/rail/rail_signal/testsuite.sumo b/tests/sumo/rail/rail_signal/testsuite.sumo
@@ -87,6 +87,9 @@ circle_backward
 # track layout with a circle and a single railSignal
 circle_1signal
 
+# prevent insertion on short edge before red rail signal
+guard_insertion
+
 # upstream signal that guards switch must take route of approaching trains into account for deciding signal state
 indirect_guard_check_route