From 3429e9c7648835060360e999b8de2be9f5e23992 Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Wed, 5 Feb 2025 14:22:42 +0100 Subject: [PATCH] added test refs #21, #16127 --- .../accel_prohibits_change/errors.netconvert | 0 .../input_plain.edg.xml | 40 ++++++++ .../input_plain.nod.xml | 39 ++++++++ .../accel_prohibits_change/net.netconvert | 78 ++++++++++++++++ .../accel_prohibits_change/output.netconvert | 1 + .../accel_prohibits_change2/errors.netconvert | 0 .../input_plain.edg.xml | 41 +++++++++ .../input_plain.nod.xml | 40 ++++++++ .../accel_prohibits_change2/net.netconvert | 91 ++++++++++++++++++ .../accel_prohibits_change2/output.netconvert | 1 + .../connection_guessing/testsuite.netconvert | 6 ++ .../accel_prohibits_change/errors.netconvert | 0 .../input_plain.con.xml | 43 +++++++++ .../input_plain.edg.xml | 40 ++++++++ .../input_plain.nod.xml | 39 ++++++++ .../accel_prohibits_change/net.netconvert | 79 ++++++++++++++++ .../accel_prohibits_change/options.netconvert | 5 + .../accel_prohibits_change/output.netconvert | 1 + .../accel_prohibits_change2/errors.netconvert | 0 .../input_plain.con.xml | 44 +++++++++ .../input_plain.edg.xml | 41 +++++++++ .../input_plain.nod.xml | 40 ++++++++ .../accel_prohibits_change2/net.netconvert | 92 +++++++++++++++++++ .../options.netconvert | 5 + .../accel_prohibits_change2/output.netconvert | 1 + .../XML/connections/testsuite.netconvert | 6 ++ 26 files changed, 773 insertions(+) create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/errors.netconvert create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/net.netconvert create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/output.netconvert create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/errors.netconvert create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/net.netconvert create mode 100644 tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/output.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/errors.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.con.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/net.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/options.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change/output.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/errors.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.con.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/net.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/options.netconvert create mode 100644 tests/netconvert/import/XML/connections/accel_prohibits_change2/output.netconvert diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/errors.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/errors.netconvert new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.edg.xml b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.edg.xml new file mode 100644 index 000000000000..580847726bfc --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.edg.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.nod.xml b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.nod.xml new file mode 100644 index 000000000000..345032c06e52 --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/input_plain.nod.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/net.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/net.netconvert new file mode 100644 index 000000000000..3578af14d5ba --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/net.netconvert @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/output.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/errors.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/errors.netconvert new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.edg.xml b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.edg.xml new file mode 100644 index 000000000000..d132e6bf7844 --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.edg.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.nod.xml b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.nod.xml new file mode 100644 index 000000000000..530b615500c2 --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/input_plain.nod.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/net.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/net.netconvert new file mode 100644 index 000000000000..7210fc29c771 --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/net.netconvert @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/output.netconvert b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/import/XML/connection_guessing/accel_prohibits_change2/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/XML/connection_guessing/testsuite.netconvert b/tests/netconvert/import/XML/connection_guessing/testsuite.netconvert index 6c7150f4d5be..ed40a40184a5 100644 --- a/tests/netconvert/import/XML/connection_guessing/testsuite.netconvert +++ b/tests/netconvert/import/XML/connection_guessing/testsuite.netconvert @@ -120,4 +120,10 @@ verge_left2 # test for #15943 turn_lane_bike + +# test for #16127 +accel_prohibits_change + +# two consecutive edges with acceleration lane +accel_prohibits_change2 ramps diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/errors.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change/errors.netconvert new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.con.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.con.xml new file mode 100644 index 000000000000..71aa8f6a1910 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.con.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.edg.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.edg.xml new file mode 100644 index 000000000000..580847726bfc --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.edg.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.nod.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.nod.xml new file mode 100644 index 000000000000..345032c06e52 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/input_plain.nod.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/net.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change/net.netconvert new file mode 100644 index 000000000000..b75e475f6f64 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/net.netconvert @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/options.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change/options.netconvert new file mode 100644 index 000000000000..d7d18e2889af --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/options.netconvert @@ -0,0 +1,5 @@ +--node-files input_plain.nod.xml --edge-files input_plain.edg.xml --output +net.net.xml --no-turnarounds --no-internal-links +-x input_plain.con.xml + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change/output.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/errors.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change2/errors.netconvert new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.con.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.con.xml new file mode 100644 index 000000000000..158ddc0cbd84 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.con.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.edg.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.edg.xml new file mode 100644 index 000000000000..d132e6bf7844 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.edg.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.nod.xml b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.nod.xml new file mode 100644 index 000000000000..530b615500c2 --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/input_plain.nod.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/net.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change2/net.netconvert new file mode 100644 index 000000000000..11aec9d7d7dc --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/net.netconvert @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/options.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change2/options.netconvert new file mode 100644 index 000000000000..d7d18e2889af --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/options.netconvert @@ -0,0 +1,5 @@ +--node-files input_plain.nod.xml --edge-files input_plain.edg.xml --output +net.net.xml --no-turnarounds --no-internal-links +-x input_plain.con.xml + + diff --git a/tests/netconvert/import/XML/connections/accel_prohibits_change2/output.netconvert b/tests/netconvert/import/XML/connections/accel_prohibits_change2/output.netconvert new file mode 100644 index 000000000000..a9d787cc55cb --- /dev/null +++ b/tests/netconvert/import/XML/connections/accel_prohibits_change2/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/XML/connections/testsuite.netconvert b/tests/netconvert/import/XML/connections/testsuite.netconvert index 4f1ce0b33a43..a4f86d52c3dd 100644 --- a/tests/netconvert/import/XML/connections/testsuite.netconvert +++ b/tests/netconvert/import/XML/connections/testsuite.netconvert @@ -112,3 +112,9 @@ edgeType # conflicting (crossed) connections from the same edge to the same target edge sameEdge_crossed + +# test for #16127 +accel_prohibits_change + +# two consecutive edges with acceleration lane +accel_prohibits_change2