patching expected results refs #21, #14501

eclipse-sumo · Mar 13, 2024 · e656cf8 · e656cf8
1 parent c7704f3
commit e656cf8
Show file tree

Hide file tree

Showing 8 changed files with 330 additions and 5 deletions.
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/errors.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/errors.netconvert
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/input_plain.edg.xml b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/input_plain.edg.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 29 Jan 2014 03:30:12 PM CET by Netedit Version dev-SVN-r15523
+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
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netedit.exeConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net4a.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="net4a.net.xml"/>
+        <plain-output-prefix value="/scr1/erdm_ja/sip-svn-trunk/projects/colombo/prototype4/plain4a"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+</configuration>
+-->
+
+<edges version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
+    <edge id="CE" from="C" to="E" priority="2" numLanes="1" speed="13.89" sidewalkWidth="2"/>
+    <edge id="CN" from="C" to="N" priority="1" numLanes="1" speed="13.89" sidewalkWidth="2"/>
+    <edge id="CW" from="C" to="W" priority="2" numLanes="1" speed="13.89" sidewalkWidth="2"/>
+    <edge id="EC" from="E" to="C" priority="2" numLanes="2" speed="13.89" sidewalkWidth="2"/>
+    <edge id="NC" from="N" to="C" priority="1" numLanes="2" speed="13.89" sidewalkWidth="2"/>
+    <edge id="WC" from="W" to="C" priority="2" numLanes="2" speed="13.89" sidewalkWidth="2"/>
+</edges>
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/input_plain.nod.xml b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/input_plain.nod.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 29 Jan 2014 03:30:12 PM CET by Netedit Version dev-SVN-r15523
+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
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netedit.exeConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net4a.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="net4a.net.xml"/>
+        <plain-output-prefix value="/scr1/erdm_ja/sip-svn-trunk/projects/colombo/prototype4/plain4a"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+</configuration>
+-->
+
+<nodes version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
+    <location netOffset="100.00,100.00" convBoundary="0.00,0.00,200.00,200.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <node id="C" x="100.00" y="100.00" type="traffic_light" tl="C"/>
+    <node id="E" x="200.00" y="100.00" type="priority"/>
+    <node id="N" x="100.00" y="200.00" type="dead_end"/>
+    <node id="S" x="100.00" y="0.00" type="priority"/>
+    <node id="W" x="0.00" y="100.00" type="dead_end"/>
+</nodes>
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/net.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/net.netconvert
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/options.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/options.netconvert
@@ -0,0 +1,3 @@
+-e input_plain.edg.xml -n input_plain.nod.xml
+--tls.default-type NEMA
+--crossings.guess
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/output.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_3arm_crossing/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/import/XML/tl_types/NEMA/NEMA_4arm_crossing/net.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/NEMA_4arm_crossing/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-13 12:31:32 by Eclipse SUMO netconvert Version v1_19_0+1263-7909fcacf14
+<!-- generated on 2024-03-13 14:59:18 by Eclipse SUMO netconvert Version v1_19_0+1264-9f2af095d39
 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
@@ -213,13 +213,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <tlLogic id="C" type="NEMA" programID="0" offset="0">
         <phase duration="90" state="rrrrrrrrrrrrrrGGrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="1"/>
-        <phase duration="90" state="rrrrGGggrrrrrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="2"/>
+        <phase duration="90" state="rrrrgGggrrrrrrrrGrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="2"/>
         <phase duration="90" state="rrrrrrGGrrrrrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="5"/>
-        <phase duration="90" state="rrrrrrrrrrrrGGggrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="6"/>
+        <phase duration="90" state="rrrrrrrrrrrrgGggrrGr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="6"/>
         <phase duration="90" state="rrrrrrrrrrGGrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="3"/>
-        <phase duration="90" state="GGggrrrrrrrrrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="4"/>
+        <phase duration="90" state="gGggrrrrrrrrrrrrrrrG" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="4"/>
         <phase duration="90" state="rrGGrrrrrrrrrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="7"/>
-        <phase duration="90" state="rrrrrrrrGGggrrrrrrrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="8"/>
+        <phase duration="90" state="rrrrrrrrgGggrrrrrGrr" minDur="5" maxDur="50" vehext="2" yellow="3" red="2" name="8"/>
         <param key="barrier2Phases" value="2,6"/>
         <param key="barrierPhases" value="4,8"/>
         <param key="ring1" value="1,2,3,4"/>

diff --git a/tests/netconvert/import/XML/tl_types/NEMA/testsuite.netconvert b/tests/netconvert/import/XML/tl_types/NEMA/testsuite.netconvert
@@ -31,3 +31,6 @@ NEMA_2arm_turn
 
 # declare a NEMA controller for a network with pedestrian infrastructure
 NEMA_4arm_crossing
+
+# declare a NEMA controller for a network with pedestrian infrastructure
+NEMA_3arm_crossing