From bdff17e60fa1c0b085f08cb73e5af714ead4ada4 Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Fri, 20 Dec 2024 10:26:04 +0100 Subject: [PATCH] added tests refs #21, #15944 --- .../XML/connections/testsuite.netconvert | 3 + .../unconnected_all/errors.netconvert | 3 + .../unconnected_all/input_plain.con.xml | 56 ++++++ .../unconnected_all/input_plain.edg.xml | 128 ++++++++++++++ .../unconnected_all/input_plain.nod.xml | 44 +++++ .../unconnected_all/net.netconvert | 163 ++++++++++++++++++ .../unconnected_all/options.netconvert | 4 + .../unconnected_all/output.netconvert | 1 + 8 files changed, 402 insertions(+) create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/errors.netconvert create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/input_plain.con.xml create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/net.netconvert create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/options.netconvert create mode 100644 tests/netconvert/import/XML/connections/unconnected_all/output.netconvert diff --git a/tests/netconvert/import/XML/connections/testsuite.netconvert b/tests/netconvert/import/XML/connections/testsuite.netconvert index dcbf4ee9a345..4f1ce0b33a43 100644 --- a/tests/netconvert/import/XML/connections/testsuite.netconvert +++ b/tests/netconvert/import/XML/connections/testsuite.netconvert @@ -95,6 +95,9 @@ prohibit_changing # some edges are disconnected explicitly unconnected +# test for #15944 +unconnected_all + # make sure that parallel left turns all use the same curve parallel_left_turns diff --git a/tests/netconvert/import/XML/connections/unconnected_all/errors.netconvert b/tests/netconvert/import/XML/connections/unconnected_all/errors.netconvert new file mode 100644 index 000000000000..09d05a80fc96 --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/errors.netconvert @@ -0,0 +1,3 @@ +Warning: Lane '-326116286#2_2' is not connected from any incoming edge at junction '25662542'. +Warning: Edge '-4402014#2' is not connected to outgoing edges at junction '25662542'. +Warning: Lane '4402014#0_2' is not connected from any incoming edge at junction '25662542'. diff --git a/tests/netconvert/import/XML/connections/unconnected_all/input_plain.con.xml b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.con.xml new file mode 100644 index 000000000000..ca9dc4da1531 --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.con.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/unconnected_all/input_plain.edg.xml b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.edg.xml new file mode 100644 index 000000000000..75b7588774a0 --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.edg.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/unconnected_all/input_plain.nod.xml b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.nod.xml new file mode 100644 index 000000000000..f95d41829592 --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/input_plain.nod.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/unconnected_all/net.netconvert b/tests/netconvert/import/XML/connections/unconnected_all/net.netconvert new file mode 100644 index 000000000000..3d44c21d120e --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/net.netconvert @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/unconnected_all/options.netconvert b/tests/netconvert/import/XML/connections/unconnected_all/options.netconvert new file mode 100644 index 000000000000..1a06b8ef27d9 --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/options.netconvert @@ -0,0 +1,4 @@ +-x input_plain.con.xml --node-files input_plain.nod.xml --edge-files input_plain.edg.xml --output +net.net.xml --no-turnarounds --no-internal-links + + diff --git a/tests/netconvert/import/XML/connections/unconnected_all/output.netconvert b/tests/netconvert/import/XML/connections/unconnected_all/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/import/XML/connections/unconnected_all/output.netconvert @@ -0,0 +1 @@ +Success.