patching expected results refs #3834, refs #21

eclipse-sumo · Feb 19, 2018 · 8f56883 · 8f56883
1 parent 5431180
commit 8f56883
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 17 deletions.
diff --git a/tests/netconvert/bugs/ticket2066/net.netconvert b/tests/netconvert/bugs/ticket2066/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Feb 21 16:44:12 2017 by SUMO netconvert Version dev-SVN-r23047
+<!-- generated on Mon Feb 19 08:58:29 2018 by SUMO netconvert Version v0_32_0+0440-df8dc3b
 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,6 +14,10 @@ SPDX-License-Identifier: EPL-2.0
         <connection-files value="input_plain.con.xml"/>
     </input>
 
+    <output>
+        <write-license value="true"/>
+    </output>
+
     <processing>
         <geometry.remove value="true"/>
     </processing>
@@ -44,13 +48,13 @@ SPDX-License-Identifier: EPL-2.0
 
     <junction id="A" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,-0.05 0.00,-6.55"/>
     <junction id="C" type="priority" x="200.00" y="0.00" incLanes="AB_0 AB_1" intLanes=":C_0_0 :C_0_1" shape="201.50,-0.05 201.50,-3.25 198.50,-6.55 198.50,-0.05">
-        <request index="0" response="00" foes="10" cont="0"/>
-        <request index="1" response="01" foes="01" cont="0"/>
+        <request index="0" response="10" foes="10" cont="0"/>
+        <request index="1" response="00" foes="01" cont="0"/>
     </junction>
     <junction id="D" type="dead_end" x="300.00" y="0.00" incLanes="CD_0" intLanes="" shape="300.00,-3.25 300.00,-0.05"/>
 
-    <connection from="AB" to="CD" fromLane="0" toLane="0" via=":C_0_0" dir="s" state="M"/>
-    <connection from="AB" to="CD" fromLane="1" toLane="0" via=":C_0_1" dir="s" state="m"/>
+    <connection from="AB" to="CD" fromLane="0" toLane="0" via=":C_0_0" dir="s" state="m"/>
+    <connection from="AB" to="CD" fromLane="1" toLane="0" via=":C_0_1" dir="s" state="M"/>
 
     <connection from=":C_0" to="CD" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":C_0" to="CD" fromLane="1" toLane="0" dir="s" state="M"/>

diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane/net.netconvert b/tests/netconvert/import/XML/connections/double_con_bikelane/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Feb 21 16:43:59 2017 by SUMO netconvert Version dev-SVN-r23047
+<!-- generated on Mon Feb 19 08:56:02 2018 by SUMO netconvert Version v0_32_0+0440-df8dc3b
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="net.net.xml"/>
     </output>
 
@@ -44,14 +45,14 @@ SPDX-License-Identifier: EPL-2.0
 
     <junction id="C" type="priority" x="200.00" y="0.00" incLanes="WC_0 WC_1 WC_2" intLanes="" shape="201.50,1.60 201.50,-1.60 198.50,-4.90 198.50,4.90">
         <request index="0" response="110" foes="110"/>
-        <request index="1" response="000" foes="101"/>
-        <request index="2" response="010" foes="011"/>
+        <request index="1" response="100" foes="101"/>
+        <request index="2" response="000" foes="011"/>
     </junction>
     <junction id="E" type="dead_end" x="400.00" y="0.00" incLanes="CE_0" intLanes="" shape="400.00,-1.60 400.00,1.60"/>
     <junction id="W" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,4.90 0.00,-4.90"/>
 
     <connection from="WC" to="CE" fromLane="0" toLane="0" dir="s" state="m"/>
-    <connection from="WC" to="CE" fromLane="1" toLane="0" dir="s" state="M"/>
-    <connection from="WC" to="CE" fromLane="2" toLane="0" dir="s" state="m"/>
+    <connection from="WC" to="CE" fromLane="1" toLane="0" dir="s" state="m"/>
+    <connection from="WC" to="CE" fromLane="2" toLane="0" dir="s" state="M"/>
 
 </net>
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/errors.netconvert b/tests/netconvert/import/XML/connections/double_con_bikelane2/errors.netconvert
@@ -0,0 +1,2 @@
+Warning: Target lane 'CE_0' is already connected from 'WC'.
+Warning: Target lane 'CE_0' is already connected from 'WC'.
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.con.xml b/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.con.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 30 Sep 2015 07:25:57 AM CEST by Netedit Version dev-SVN-r18964I
+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">
+
+    <output>
+        <output-file value="net.net.xml"/>
+        <plain-output-prefix value="/scr2/debug/1859/input_plain"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+</configuration>
+-->
+
+<connections version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/connections_file.xsd">
+    <connection from="WC" to="CE" fromLane="0" toLane="0"/>
+    <connection from="WC" to="CE" fromLane="1" toLane="0"/>
+    <connection from="WC" to="CE" fromLane="2" toLane="0"/>
+
+</connections>
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.edg.xml b/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.edg.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 30 Sep 2015 07:25:57 AM CEST by Netedit Version dev-SVN-r18964I
+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">
+
+    <output>
+        <output-file value="net.net.xml"/>
+        <plain-output-prefix value="/scr2/debug/1859/input_plain"/>
+    </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="1" numLanes="1" speed="13.89" spreadType="center"/>
+    <edge id="WC" from="W" to="C" priority="1" numLanes="3" speed="13.89" spreadType="center">
+        <lane index="2" allow="bicycle"/>
+    </edge>
+</edges>
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.nod.xml b/tests/netconvert/import/XML/connections/double_con_bikelane2/input_plain.nod.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 30 Sep 2015 07:25:57 AM CEST by Netedit Version dev-SVN-r18964I
+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">
+
+    <output>
+        <output-file value="net.net.xml"/>
+        <plain-output-prefix value="/scr2/debug/1859/input_plain"/>
+    </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="0.00,0.00" convBoundary="-200.00,0.00,200.00,0.00" origBoundary="10000000000.00,10000000000.00,-10000000000.00,-10000000000.00" projParameter="!"/>
+
+    <node id="C" x="0.00" y="0.00" type="priority"/>
+    <node id="E" x="200.00" y="0.00" type="unregulated"/>
+    <node id="W" x="-200.00" y="0.00" type="unregulated"/>
+</nodes>
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/net.netconvert b/tests/netconvert/import/XML/connections/double_con_bikelane2/net.netconvert
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Mon Feb 19 08:57:54 2018 by SUMO netconvert Version v0_32_0+0440-df8dc3b
+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/netconvertConfiguration.xsd">
+
+    <input>
+        <node-files value="input_plain.nod.xml"/>
+        <edge-files value="input_plain.edg.xml"/>
+        <connection-files value="input_plain.con.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <output-file value="net.net.xml"/>
+    </output>
+
+    <processing>
+        <no-internal-links value="true"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
+</configuration>
+-->
+
+<net version="0.27" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="200.00,0.00" convBoundary="0.00,0.00,400.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="CE" from="C" to="E" priority="1" spreadType="center">
+        <lane id="CE_0" index="0" speed="13.89" length="200.00" shape="201.50,0.00 400.00,0.00"/>
+    </edge>
+    <edge id="WC" from="W" to="C" priority="1" spreadType="center">
+        <lane id="WC_0" index="0" speed="13.89" length="200.00" shape="0.00,-3.30 198.50,-3.30"/>
+        <lane id="WC_1" index="1" speed="13.89" length="200.00" shape="0.00,0.00 198.50,0.00"/>
+        <lane id="WC_2" index="2" allow="bicycle" speed="13.89" length="200.00" shape="0.00,3.30 198.50,3.30"/>
+    </edge>
+
+    <junction id="C" type="priority" x="200.00" y="0.00" incLanes="WC_0 WC_1 WC_2" intLanes="" shape="201.50,1.60 201.50,-1.60 198.50,-4.90 198.50,4.90">
+        <request index="0" response="010" foes="110"/>
+        <request index="1" response="000" foes="101"/>
+        <request index="2" response="011" foes="011"/>
+    </junction>
+    <junction id="E" type="dead_end" x="400.00" y="0.00" incLanes="CE_0" intLanes="" shape="400.00,-1.60 400.00,1.60"/>
+    <junction id="W" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,4.90 0.00,-4.90"/>
+
+    <connection from="WC" to="CE" fromLane="0" toLane="0" dir="s" state="m"/>
+    <connection from="WC" to="CE" fromLane="1" toLane="0" dir="s" state="M"/>
+    <connection from="WC" to="CE" fromLane="2" toLane="0" dir="s" state="m"/>
+
+</net>
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/options.netconvert b/tests/netconvert/import/XML/connections/double_con_bikelane2/options.netconvert
@@ -0,0 +1,2 @@
+--edge-files=input_plain.edg.xml --node-files=input_plain.nod.xml -x
+input_plain.con.xml --output=net.net.xml --no-internal-links
diff --git a/tests/netconvert/import/XML/connections/double_con_bikelane2/output.netconvert b/tests/netconvert/import/XML/connections/double_con_bikelane2/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/import/XML/connections/double_con_default/net.netconvert b/tests/netconvert/import/XML/connections/double_con_default/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Feb 21 16:43:59 2017 by SUMO netconvert Version dev-SVN-r23047
+<!-- generated on Mon Feb 19 08:56:02 2018 by SUMO netconvert Version v0_32_0+0440-df8dc3b
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <output-file value="net.net.xml"/>
     </output>
 
@@ -43,15 +44,15 @@ SPDX-License-Identifier: EPL-2.0
     </edge>
 
     <junction id="C" type="priority" x="200.00" y="0.00" incLanes="WC_0 WC_1 WC_2" intLanes="" shape="201.50,1.60 201.50,-1.60 198.50,-4.90 198.50,4.90">
-        <request index="0" response="000" foes="110"/>
-        <request index="1" response="001" foes="101"/>
-        <request index="2" response="011" foes="011"/>
+        <request index="0" response="110" foes="110"/>
+        <request index="1" response="100" foes="101"/>
+        <request index="2" response="000" foes="011"/>
     </junction>
     <junction id="E" type="dead_end" x="400.00" y="0.00" incLanes="CE_0" intLanes="" shape="400.00,-1.60 400.00,1.60"/>
     <junction id="W" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,4.90 0.00,-4.90"/>
 
-    <connection from="WC" to="CE" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="WC" to="CE" fromLane="0" toLane="0" dir="s" state="m"/>
     <connection from="WC" to="CE" fromLane="1" toLane="0" dir="s" state="m"/>
-    <connection from="WC" to="CE" fromLane="2" toLane="0" dir="s" state="m"/>
+    <connection from="WC" to="CE" fromLane="2" toLane="0" dir="s" state="M"/>
 
 </net>
diff --git a/tests/netconvert/import/XML/connections/testsuite.netconvert b/tests/netconvert/import/XML/connections/testsuite.netconvert
@@ -70,9 +70,12 @@ double_con_custom_unsafe
 # two connections from the same edge to the same lane. Priority resolved by the offramp heuristic (rightmost lane has priority)
 double_con_offramp
 
-# two connections from the same edge to the same lane. Priority resolved by defaults
+# 3 connections from the same edge to the same lane. Bikelane should yield.
 double_con_bikelane
 
+# 3 connections from the same edge to the same lane. Bikelane should yield
+double_con_bikelane2
+
 # custom position for internal junction
 contPos