From 6628181cd0a9c36a2476f6af7b7ab2d5ad2c6060 Mon Sep 17 00:00:00 2001 From: namdre Date: Mon, 19 Nov 2018 14:19:46 +0100 Subject: [PATCH] added test refs #4813 --- .../SUMO/checkLaneFoes/errors.netconvert | 0 .../SUMO/checkLaneFoes/input_net.net.xml | 267 ++++++++++++++++++ .../import/SUMO/checkLaneFoes/net.netconvert | 267 ++++++++++++++++++ .../SUMO/checkLaneFoes/options.netconvert | 1 + .../SUMO/checkLaneFoes/output.netconvert | 1 + .../import/SUMO/testsuite.netconvert | 4 + .../checkLaneFoes/errors.netconvert | 0 .../checkLaneFoes/input_plain.edg.xml | 37 +++ .../checkLaneFoes/input_plain.nod.xml | 36 +++ .../checkLaneFoes/net.netconvert | 267 ++++++++++++++++++ .../checkLaneFoes/options.netconvert | 2 + .../checkLaneFoes/output.netconvert | 1 + .../XML/junctionLogic/testsuite.netconvert | 3 + 13 files changed, 886 insertions(+) create mode 100644 tests/netconvert/import/SUMO/checkLaneFoes/errors.netconvert create mode 100644 tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml create mode 100644 tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert create mode 100644 tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert create mode 100644 tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/errors.netconvert create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert create mode 100644 tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/errors.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/errors.netconvert new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml b/tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml new file mode 100644 index 00000000000..77840477a8b --- /dev/null +++ b/tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert new file mode 100644 index 00000000000..77840477a8b --- /dev/null +++ b/tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert new file mode 100644 index 00000000000..c69e47e4fea --- /dev/null +++ b/tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert @@ -0,0 +1 @@ + --sumo-net-file input_net.net.xml --output=net.net.xml diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert new file mode 100644 index 00000000000..a9d787cc55c --- /dev/null +++ b/tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/SUMO/testsuite.netconvert b/tests/netconvert/import/SUMO/testsuite.netconvert index f77733843e5..a11e0b08d53 100644 --- a/tests/netconvert/import/SUMO/testsuite.netconvert +++ b/tests/netconvert/import/SUMO/testsuite.netconvert @@ -92,3 +92,7 @@ limit-turn-speed # re-import limited speed on junctions based on radius and overwrite with a new limit argument limit-turn-speed_overwrite + +# import check-lane-foes options from .net.xml +# +checkLaneFoes diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/errors.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/errors.netconvert new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml new file mode 100644 index 00000000000..52d7316a78f --- /dev/null +++ b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml new file mode 100644 index 00000000000..351f3dc213d --- /dev/null +++ b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert new file mode 100644 index 00000000000..77840477a8b --- /dev/null +++ b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert new file mode 100644 index 00000000000..9e990421410 --- /dev/null +++ b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert @@ -0,0 +1,2 @@ + --edge-files=input_plain.edg.xml --node-files=input_plain.nod.xml --output=net.net.xml + --check-lane-foes.all diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert new file mode 100644 index 00000000000..a9d787cc55c --- /dev/null +++ b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert @@ -0,0 +1 @@ +Success. diff --git a/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert b/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert index f86b8f05c98..d56f4244444 100644 --- a/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert +++ b/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert @@ -6,3 +6,6 @@ parallel_bike_path # as above but with fewer edges parallel_bike_path2 + +# do not declare foes when the target lanes are conflict-free even though the edgse are in conflict +checkLaneFoes