diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.add.xml b/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.add.xml
new file mode 100644
index 00000000000..91efb2f2344
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.add.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.netedit b/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.netedit
index 92bedc8201e..b629cd96118 100644
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.netedit
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/errors.neteditcheckoutput b/tests/netedit/demandelements/route/create_consecutive/repeat/errors.neteditcheckoutput
index cd51bda8287..e69de29bb2d 100644
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: Disconnected route 'r_0' when repeating. Last edge 'Edge2' is not connected to first edge 'Edge0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/exitcode.neteditcheckoutput b/tests/netedit/demandelements/route/create_consecutive/repeat/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.con.xml b/tests/netedit/demandelements/route/create_consecutive/repeat/net.con.xml
new file mode 100644
index 00000000000..94f22ecaab2
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.con.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.edg.xml b/tests/netedit/demandelements/route/create_consecutive/repeat/net.edg.xml
new file mode 100644
index 00000000000..9f8b7e4d69f
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.edg.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.net.xml b/tests/netedit/demandelements/route/create_consecutive/repeat/net.net.xml
new file mode 100644
index 00000000000..cd79c628509
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.net.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.netccfg b/tests/netedit/demandelements/route/create_consecutive/repeat/net.netccfg
new file mode 100644
index 00000000000..c5477f11156
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.netccfg
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.netedit b/tests/netedit/demandelements/route/create_consecutive/repeat/net.netedit
index 53391ccb67f..807613cb046 100644
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/net.netedit
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.netedit
@@ -1,17 +1,17 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/net.tll.xml b/tests/netedit/demandelements/route/create_consecutive/repeat/net.tll.xml
new file mode 100644
index 00000000000..d1d5d8b6beb
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/net.tll.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/output.netedit b/tests/netedit/demandelements/route/create_consecutive/repeat/output.netedit
index 1889006d4dd..5b268146bc5 100644
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/output.netedit
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/output.netedit
@@ -5,6 +5,7 @@ dummyrepeat
TestFunctions: Clicked over position 754 - 608
TestFunctions: Clicked over position 1189 - 393
TestFunctions: Clicked over position 679 - 201
+TestFunctions: Clicked over position 414 - 418
15.6
13
TestFunctions: Clicked over position 304 - 168
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/routes.netedit b/tests/netedit/demandelements/route/create_consecutive/repeat/routes.netedit
index 797c9c9af27..1551f58bea6 100644
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/routes.netedit
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/routes.netedit
@@ -1,9 +1,9 @@
-
-
+
diff --git a/tests/netedit/demandelements/route/create_consecutive/repeat/test.py b/tests/netedit/demandelements/route/create_consecutive/repeat/test.py
index 1f2cf186acf..f285f8ec5e5 100755
--- a/tests/netedit/demandelements/route/create_consecutive/repeat/test.py
+++ b/tests/netedit/demandelements/route/create_consecutive/repeat/test.py
@@ -41,6 +41,7 @@
netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat0.x, netedit.positions.demandElements.edgeRepeat0.y)
# press enter to try to create route
netedit.typeEnter()
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.add.xml b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.add.xml
new file mode 100644
index 00000000000..91efb2f2344
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.add.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.netedit b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.netedit
index fdd2e621b95..b629cd96118 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.netedit
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/errors.neteditcheckoutput b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/errors.neteditcheckoutput
index cd51bda8287..e69de29bb2d 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: Disconnected route 'r_0' when repeating. Last edge 'Edge2' is not connected to first edge 'Edge0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/exitcode.neteditcheckoutput b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.con.xml b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.con.xml
new file mode 100644
index 00000000000..94f22ecaab2
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.con.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.edg.xml b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.edg.xml
new file mode 100644
index 00000000000..9f8b7e4d69f
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.edg.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.net.xml b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.net.xml
new file mode 100644
index 00000000000..cd79c628509
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.net.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netccfg b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netccfg
new file mode 100644
index 00000000000..c5477f11156
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netccfg
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netedit b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netedit
index 988230df4ef..807613cb046 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netedit
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.netedit
@@ -1,17 +1,17 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.tll.xml b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.tll.xml
new file mode 100644
index 00000000000..d1d5d8b6beb
--- /dev/null
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/net.tll.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/output.netedit b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/output.netedit
index ac4978184c4..ef0289dea13 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/output.netedit
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/output.netedit
@@ -1,10 +1,9 @@
TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
-non consecutive edges
dummyrepeat
TestFunctions: Clicked over position 754 - 608
-TestFunctions: Clicked over position 679 - 201
+TestFunctions: Clicked over position 414 - 418
15.6
13
TestFunctions: Clicked over position 304 - 168
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/routes.netedit b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/routes.netedit
index ec94863ac92..1551f58bea6 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/routes.netedit
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/routes.netedit
@@ -1,9 +1,9 @@
-
-
+
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/test.py b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/test.py
index 773a4825803..1b4056ec91b 100755
--- a/tests/netedit/demandelements/route/create_nonconsecutive/repeat/test.py
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/repeat/test.py
@@ -34,15 +34,12 @@
# go to route mode
netedit.routeMode()
-# change to non consecutive mode
-netedit.changeRouteMode("non consecutive edges")
-
-# set invalid color
+# set invalid repeat
netedit.changeDefaultValue(netedit.attrs.route.create.repeat, "dummyrepeat")
# try to create route using three edges
netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat0.x, netedit.positions.demandElements.edgeRepeat0.y)
# press enter to try to create route
netedit.typeEnter()
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.netedit b/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.netedit
index 1891652faeb..16b18a97292 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.netedit
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.netedit
@@ -20,4 +20,6 @@ color
repeat
+repeat_samestartend
+
cycletime
\ No newline at end of file
diff --git a/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.neteditcheckoutput b/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.neteditcheckoutput
index 1891652faeb..16b18a97292 100644
--- a/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/create_nonconsecutive/testsuite.neteditcheckoutput
@@ -20,4 +20,6 @@ color
repeat
+repeat_samestartend
+
cycletime
\ No newline at end of file
diff --git a/tests/netedit/demandelements/route/inspect/repeat/additionals.add.xml b/tests/netedit/demandelements/route/inspect/repeat/additionals.add.xml
new file mode 100644
index 00000000000..91efb2f2344
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/additionals.add.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/additionals.netedit b/tests/netedit/demandelements/route/inspect/repeat/additionals.netedit
index 0d9aebf59a0..70fb8d1246e 100644
--- a/tests/netedit/demandelements/route/inspect/repeat/additionals.netedit
+++ b/tests/netedit/demandelements/route/inspect/repeat/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/inspect/repeat/errors.neteditcheckoutput b/tests/netedit/demandelements/route/inspect/repeat/errors.neteditcheckoutput
index 4eec5c4db30..e69de29bb2d 100644
--- a/tests/netedit/demandelements/route/inspect/repeat/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/inspect/repeat/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: Disconnected route 'r_0' when repeating. Last edge 'Edge1' is not connected to first edge 'Edge0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/route/inspect/repeat/exitcode.neteditcheckoutput b/tests/netedit/demandelements/route/inspect/repeat/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/tests/netedit/demandelements/route/inspect/repeat/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.con.xml b/tests/netedit/demandelements/route/inspect/repeat/net.con.xml
new file mode 100644
index 00000000000..94f22ecaab2
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.con.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.edg.xml b/tests/netedit/demandelements/route/inspect/repeat/net.edg.xml
new file mode 100644
index 00000000000..9f8b7e4d69f
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.edg.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.net.xml b/tests/netedit/demandelements/route/inspect/repeat/net.net.xml
new file mode 100644
index 00000000000..cd79c628509
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.net.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.netccfg b/tests/netedit/demandelements/route/inspect/repeat/net.netccfg
new file mode 100644
index 00000000000..c5477f11156
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.netccfg
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.netedit b/tests/netedit/demandelements/route/inspect/repeat/net.netedit
index 3d9c97e8491..807613cb046 100644
--- a/tests/netedit/demandelements/route/inspect/repeat/net.netedit
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.netedit
@@ -1,17 +1,17 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/net.tll.xml b/tests/netedit/demandelements/route/inspect/repeat/net.tll.xml
new file mode 100644
index 00000000000..d1d5d8b6beb
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect/repeat/net.tll.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/output.netedit b/tests/netedit/demandelements/route/inspect/repeat/output.netedit
index ab15e8385eb..d2475dc1162 100644
--- a/tests/netedit/demandelements/route/inspect/repeat/output.netedit
+++ b/tests/netedit/demandelements/route/inspect/repeat/output.netedit
@@ -2,7 +2,7 @@ TestFunctions: Netedit opened successfully
Finding reference
TestFunctions: 'reference.png' found. Position: 304 - 168
TestFunctions: Clicked over position 754 - 608
-TestFunctions: Clicked over position 1189 - 393
+TestFunctions: Clicked over position 414 - 418
TestFunctions: Clicked over position 774 - 608
dummyRepeat
diff --git a/tests/netedit/demandelements/route/inspect/repeat/routes.netedit b/tests/netedit/demandelements/route/inspect/repeat/routes.netedit
index 6967b98df44..b0e6d067c5c 100644
--- a/tests/netedit/demandelements/route/inspect/repeat/routes.netedit
+++ b/tests/netedit/demandelements/route/inspect/repeat/routes.netedit
@@ -1,9 +1,9 @@
-
-
+
diff --git a/tests/netedit/demandelements/route/inspect/repeat/test.py b/tests/netedit/demandelements/route/inspect/repeat/test.py
index 430162efa71..dcca5f961e2 100755
--- a/tests/netedit/demandelements/route/inspect/repeat/test.py
+++ b/tests/netedit/demandelements/route/inspect/repeat/test.py
@@ -36,7 +36,7 @@
# create route using three edges
netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat0.x, netedit.positions.demandElements.edgeRepeat0.y)
# press enter to create route
netedit.typeEnter()
diff --git a/tests/netedit/demandelements/route/inspect_selection/additionals.add.xml b/tests/netedit/demandelements/route/inspect_selection/additionals.add.xml
new file mode 100644
index 00000000000..91efb2f2344
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/additionals.add.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/color/additionals.netedit b/tests/netedit/demandelements/route/inspect_selection/color/additionals.netedit
index 9d9bc34c19e..8790cf38837 100644
--- a/tests/netedit/demandelements/route/inspect_selection/color/additionals.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/color/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/inspect_selection/color/net.netedit b/tests/netedit/demandelements/route/inspect_selection/color/net.netedit
index 7dfe9a5a5bb..34fa0bd5a67 100644
--- a/tests/netedit/demandelements/route/inspect_selection/color/net.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/color/net.netedit
@@ -1,17 +1,17 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/color/test.py b/tests/netedit/demandelements/route/inspect_selection/color/test.py
index 8241282a682..ef216504a7d 100755
--- a/tests/netedit/demandelements/route/inspect_selection/color/test.py
+++ b/tests/netedit/demandelements/route/inspect_selection/color/test.py
@@ -31,34 +31,18 @@
# go to demand mode
netedit.supermodeDemand()
-# go to route mode
-netedit.routeMode()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
-
-# press enter to create route
-netedit.typeEnter()
-
-# create route using a single edge edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
-
-# press enter to create route
-netedit.typeEnter()
-
# go to select mode
netedit.selectMode()
# select both routes
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat1.x, netedit.positions.demandElements.edgeRepeat1.y)
# go to inspect mode
netedit.inspectMode()
# inspect route
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
# change color using dialog
netedit.modifyColorAttribute(netedit.attrs.route.inspectSelection.colorButton, 5, False)
diff --git a/tests/netedit/demandelements/route/inspect_selection/cycletime/additionals.netedit b/tests/netedit/demandelements/route/inspect_selection/cycletime/additionals.netedit
index 4fa4bee87d8..b023526c641 100644
--- a/tests/netedit/demandelements/route/inspect_selection/cycletime/additionals.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/cycletime/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/inspect_selection/cycletime/net.netedit b/tests/netedit/demandelements/route/inspect_selection/cycletime/net.netedit
index 54789bede42..eaec514f5a3 100644
--- a/tests/netedit/demandelements/route/inspect_selection/cycletime/net.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/cycletime/net.netedit
@@ -1,17 +1,17 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/cycletime/test.py b/tests/netedit/demandelements/route/inspect_selection/cycletime/test.py
index ed8643870c1..d2e1b3a5c7b 100755
--- a/tests/netedit/demandelements/route/inspect_selection/cycletime/test.py
+++ b/tests/netedit/demandelements/route/inspect_selection/cycletime/test.py
@@ -31,34 +31,18 @@
# go to demand mode
netedit.supermodeDemand()
-# go to route mode
-netedit.routeMode()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
-
-# press enter to create route
-netedit.typeEnter()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
-
-# press enter to create route
-netedit.typeEnter()
-
# go to select mode
netedit.selectMode()
# select both routes
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat1.x, netedit.positions.demandElements.edgeRepeat1.y)
# go to inspect mode
netedit.inspectMode()
# inspect route
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
# Change parameter color with a non valid value (empty)
netedit.modifyAttribute(netedit.attrs.route.inspectSelection.cycletime, "", False)
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.con.xml b/tests/netedit/demandelements/route/inspect_selection/net.con.xml
new file mode 100644
index 00000000000..94f22ecaab2
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.con.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.edg.xml b/tests/netedit/demandelements/route/inspect_selection/net.edg.xml
new file mode 100644
index 00000000000..9f8b7e4d69f
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.edg.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.net.xml b/tests/netedit/demandelements/route/inspect_selection/net.net.xml
new file mode 100644
index 00000000000..cd79c628509
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.net.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.netccfg b/tests/netedit/demandelements/route/inspect_selection/net.netccfg
new file mode 100644
index 00000000000..c5477f11156
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.netccfg
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.nod.xml b/tests/netedit/demandelements/route/inspect_selection/net.nod.xml
new file mode 100644
index 00000000000..caaade1a2dd
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.nod.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/net.tll.xml b/tests/netedit/demandelements/route/inspect_selection/net.tll.xml
new file mode 100644
index 00000000000..d1d5d8b6beb
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/net.tll.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/parameters/additionals.netedit b/tests/netedit/demandelements/route/inspect_selection/parameters/additionals.netedit
index 5775e39279c..1cc7f9b33b7 100644
--- a/tests/netedit/demandelements/route/inspect_selection/parameters/additionals.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/parameters/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/inspect_selection/parameters/net.netedit b/tests/netedit/demandelements/route/inspect_selection/parameters/net.netedit
index 237b54de5fc..16680461235 100644
--- a/tests/netedit/demandelements/route/inspect_selection/parameters/net.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/parameters/net.netedit
@@ -1,17 +1,17 @@
-
-
+
-
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/parameters/test.py b/tests/netedit/demandelements/route/inspect_selection/parameters/test.py
index 103bfa9a284..0235cf88869 100755
--- a/tests/netedit/demandelements/route/inspect_selection/parameters/test.py
+++ b/tests/netedit/demandelements/route/inspect_selection/parameters/test.py
@@ -30,35 +30,18 @@
# go to demand mode
netedit.supermodeDemand()
-
-# go to route mode
-netedit.routeMode()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
-
-# press enter to create route
-netedit.typeEnter()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
-
-# press enter to create route
-netedit.typeEnter()
-
# go to select mode
netedit.selectMode()
# select both routes
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat1.x, netedit.positions.demandElements.edgeRepeat1.y)
# go to inspect mode
netedit.inspectMode()
# inspect route
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
# check parameters
netedit.checkParameters(referencePosition, netedit.attrs.route.inspectSelection.parameters, False)
diff --git a/tests/netedit/demandelements/route/inspect_selection/repeat/additionals.netedit b/tests/netedit/demandelements/route/inspect_selection/repeat/additionals.netedit
index 30369e46b87..ee7910c45d9 100644
--- a/tests/netedit/demandelements/route/inspect_selection/repeat/additionals.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/repeat/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/inspect_selection/repeat/errors.neteditcheckoutput b/tests/netedit/demandelements/route/inspect_selection/repeat/errors.neteditcheckoutput
index 4eec5c4db30..e69de29bb2d 100644
--- a/tests/netedit/demandelements/route/inspect_selection/repeat/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/inspect_selection/repeat/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: Disconnected route 'r_0' when repeating. Last edge 'Edge1' is not connected to first edge 'Edge0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/route/inspect_selection/repeat/exitcode.neteditcheckoutput b/tests/netedit/demandelements/route/inspect_selection/repeat/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/tests/netedit/demandelements/route/inspect_selection/repeat/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/route/inspect_selection/repeat/net.netedit b/tests/netedit/demandelements/route/inspect_selection/repeat/net.netedit
index 1678710b41b..fdcafafd81d 100644
--- a/tests/netedit/demandelements/route/inspect_selection/repeat/net.netedit
+++ b/tests/netedit/demandelements/route/inspect_selection/repeat/net.netedit
@@ -1,17 +1,17 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/inspect_selection/repeat/test.py b/tests/netedit/demandelements/route/inspect_selection/repeat/test.py
index edf4a4e75b0..a4d5945d72c 100755
--- a/tests/netedit/demandelements/route/inspect_selection/repeat/test.py
+++ b/tests/netedit/demandelements/route/inspect_selection/repeat/test.py
@@ -31,34 +31,18 @@
# go to demand mode
netedit.supermodeDemand()
-# go to route mode
-netedit.routeMode()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge1.x, netedit.positions.demandElements.edge1.y)
-
-# press enter to create route
-netedit.typeEnter()
-
-# create route using three edges
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
-
-# press enter to create route
-netedit.typeEnter()
-
# go to select mode
netedit.selectMode()
# select both routes
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
-netedit.leftClick(referencePosition, netedit.positions.demandElements.edge2.x, netedit.positions.demandElements.edge2.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edgeRepeat1.x, netedit.positions.demandElements.edgeRepeat1.y)
# go to inspect mode
netedit.inspectMode()
# inspect route
-netedit.leftClick(referencePosition, netedit.positions.demandElements.route.x, netedit.positions.demandElements.route.y)
+netedit.leftClick(referencePosition, netedit.positions.demandElements.edge0.x, netedit.positions.demandElements.edge0.y)
# Change parameter repeat with a non valid value (empty)
netedit.modifyAttribute(netedit.attrs.route.inspectSelection.repeat, "", False)
diff --git a/tests/netedit/demandelements/route/inspect_selection/routes.rou.xml b/tests/netedit/demandelements/route/inspect_selection/routes.rou.xml
new file mode 100644
index 00000000000..dd8e57002bd
--- /dev/null
+++ b/tests/netedit/demandelements/route/inspect_selection/routes.rou.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/additionals.add.xml b/tests/netedit/demandelements/route/load/repeat/additionals.add.xml
new file mode 100644
index 00000000000..91efb2f2344
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/additionals.add.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/additionals.netedit b/tests/netedit/demandelements/route/load/repeat/additionals.netedit
index 1c43ec5cbbf..00daeaaa94f 100644
--- a/tests/netedit/demandelements/route/load/repeat/additionals.netedit
+++ b/tests/netedit/demandelements/route/load/repeat/additionals.netedit
@@ -1,20 +1,15 @@
-
-
-
-
-
-
diff --git a/tests/netedit/demandelements/route/load/repeat/errors.neteditcheckoutput b/tests/netedit/demandelements/route/load/repeat/errors.neteditcheckoutput
index 6799eb59c9b..e69de29bb2d 100644
--- a/tests/netedit/demandelements/route/load/repeat/errors.neteditcheckoutput
+++ b/tests/netedit/demandelements/route/load/repeat/errors.neteditcheckoutput
@@ -1,2 +0,0 @@
-Error: Disconnected route 'route_3' when repeating. Last edge 'Edge2' is not connected to first edge 'Edge0'.
-Quitting (on error).
diff --git a/tests/netedit/demandelements/route/load/repeat/exitcode.neteditcheckoutput b/tests/netedit/demandelements/route/load/repeat/exitcode.neteditcheckoutput
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/tests/netedit/demandelements/route/load/repeat/exitcode.neteditcheckoutput
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/netedit/demandelements/route/load/repeat/net.con.xml b/tests/netedit/demandelements/route/load/repeat/net.con.xml
new file mode 100644
index 00000000000..94f22ecaab2
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/net.con.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/net.edg.xml b/tests/netedit/demandelements/route/load/repeat/net.edg.xml
new file mode 100644
index 00000000000..9f8b7e4d69f
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/net.edg.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/net.net.xml b/tests/netedit/demandelements/route/load/repeat/net.net.xml
new file mode 100644
index 00000000000..cd79c628509
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/net.net.xml
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/net.netccfg b/tests/netedit/demandelements/route/load/repeat/net.netccfg
new file mode 100644
index 00000000000..c5477f11156
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/net.netccfg
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/net.netedit b/tests/netedit/demandelements/route/load/repeat/net.netedit
index 7b50869ea41..61a2ad55390 100644
--- a/tests/netedit/demandelements/route/load/repeat/net.netedit
+++ b/tests/netedit/demandelements/route/load/repeat/net.netedit
@@ -1,17 +1,17 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/net.tll.xml b/tests/netedit/demandelements/route/load/repeat/net.tll.xml
new file mode 100644
index 00000000000..d1d5d8b6beb
--- /dev/null
+++ b/tests/netedit/demandelements/route/load/repeat/net.tll.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/demandelements/route/load/repeat/routes.netedit b/tests/netedit/demandelements/route/load/repeat/routes.netedit
index 09b5821799a..a10ffc76e7f 100644
--- a/tests/netedit/demandelements/route/load/repeat/routes.netedit
+++ b/tests/netedit/demandelements/route/load/repeat/routes.netedit
@@ -1,9 +1,9 @@
-
-
+
diff --git a/tests/netedit/demandelements/route/load/repeat/routes.rou.xml b/tests/netedit/demandelements/route/load/repeat/routes.rou.xml
index 2996c6823de..e89f8194e99 100644
--- a/tests/netedit/demandelements/route/load/repeat/routes.rou.xml
+++ b/tests/netedit/demandelements/route/load/repeat/routes.rou.xml
@@ -38,15 +38,15 @@
-
+
-
+
-
+
-
+
diff --git a/tests/netedit/testPositions.py b/tests/netedit/testPositions.py
index 7c322f5fe4c..d32f64df7e8 100644
--- a/tests/netedit/testPositions.py
+++ b/tests/netedit/testPositions.py
@@ -45,9 +45,17 @@ class edge5:
x = 450
y = 390
+ class edgeRepeat0:
+ x = 110
+ y = 250
+
+ class edgeRepeat1:
+ x = 150
+ y = 250
+
class edgeBus1:
- x = 115
- y = 150
+ x = 150
+ y = 220
class edgeBus2:
x = 150