Updated netedit tests. Refs #3045

eclipse-sumo · Jan 14, 2025 · c99800f · c99800f
1 parent ad18383
commit c99800f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
@@ -223,7 +223,7 @@ class inspectSelection:
         stopOffset = 15
         stopOffsetExceptionButton = 16
         stopOffsetException = 17
-        parameters = 18
+        parameters = 20
 
     class template:
         create = 30

diff --git a/tests/netedit/network/connections/with_tls/net.net.xml b/tests/netedit/network/connections/with_tls/net.net.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2025-01-10 11:17:38 by Eclipse SUMO netedit Version v1_21_0+1797-9b282cfea17
-<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+<!-- generated on 2025-01-14 11:07:35 by Eclipse SUMO netconvert Version v1_21_0+1838-ad18383a075
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <sumo-net-file value="D:\SUMO\tests\netedit\network\connections\with_tls\net.net.xml"/>
+        <node-files value="D:\SUMO\tests\netedit\network\connections\with_tls\net.nod.xml"/>
+        <edge-files value="D:\SUMO\tests\netedit\network\connections\with_tls\net.edg.xml"/>
+        <connection-files value="D:\SUMO\tests\netedit\network\connections\with_tls\net.con.xml"/>
+        <tllogic-files value="D:\SUMO\tests\netedit\network\connections\with_tls\net.tll.xml"/>
     </input>
 
-    <output>
-        <output-file value="D:\SUMO\tests\netedit\network\connections\with_tls\net.net.xml"/>
-    </output>
-
     <processing>
         <geometry.min-radius.fix.railways value="false"/>
         <geometry.max-grade.fix value="false"/>
@@ -29,7 +28,11 @@
         <walkingareas value="0"/>
     </pedestrian>
 
-</neteditConfiguration>
+    <report>
+        <verbose value="true"/>
+    </report>
+
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

diff --git a/tests/netedit/network/connections/with_tls/net.netccfg b/tests/netedit/network/connections/with_tls/net.netccfg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2025-01-10 11:17:47 by Eclipse SUMO netedit Version v1_21_0+1797-9b282cfea17
+<!-- generated on 2025-01-14 11:07:35 by Eclipse SUMO netconvert Version v1_21_0+1838-ad18383a075
 -->
 
-<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <node-files value="D:\SUMO\tests\netedit\network\connections\with_tls\net.nod.xml"/>
@@ -30,4 +30,4 @@
         <walkingareas value="0"/>
     </pedestrian>
 
-</neteditConfiguration>
+</netconvertConfiguration>