fix cucumber tests and issues
This commit is contained in:
Moritz Kobitzsch
committed by
Patrick Niklaus
Patrick Niklaus
parent
e60ebee3f2
commit
ef1fb08723
@@ -42,9 +42,9 @@ Feature: Via points
|
||||
| bd |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route |
|
||||
| a,d,c | abc,bd,bd,bd,bd,abc,abc |
|
||||
| c,d,a | abc,bd,bd,bd,bd,abc,abc |
|
||||
| waypoints | route |
|
||||
| a,d,c | abc,bd,bd,bd,abc,abc |
|
||||
| c,d,a | abc,bd,bd,bd,abc,abc |
|
||||
|
||||
@mokob
|
||||
Scenario: Multiple via points
|
||||
@@ -63,9 +63,9 @@ Feature: Via points
|
||||
| dh |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route |
|
||||
| a,c,f | ab,bcd,bcd,bcd,de,efg,efg|
|
||||
| a,c,f,h | ab,bcd,bcd,bcd,de,efg,efg,efg,gh,gh|
|
||||
| waypoints | route |
|
||||
| a,c,f | ab,bcd,bcd,bcd,de,efg,efg |
|
||||
| a,c,f,h | ab,bcd,bcd,bcd,de,efg,efg,efg,gh,gh |
|
||||
|
||||
|
||||
Scenario: Duplicate via point
|
||||
@@ -80,8 +80,8 @@ Feature: Via points
|
||||
| ab |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route | turns |
|
||||
| 1,1,4 | ab,ab | depart,via,arrive |
|
||||
| waypoints | route |
|
||||
| 1,1,4 | ab,ab,ab,ab |
|
||||
|
||||
Scenario: Via points on ring of oneways
|
||||
# xa it to avoid only having a single ring, which cna trigger edge cases
|
||||
@@ -101,12 +101,12 @@ Feature: Via points
|
||||
| fa | yes |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route | distance | turns |
|
||||
| 1,3 | ab,bc,cd | 400m +-1 | depart,straight,straight,arrive |
|
||||
| 3,1 | cd,de,ef,fa,ab | 1000m +-1 | depart,straight,straight,straight,right,arrive |
|
||||
| 1,2,3 | ab,bc,bc,cd | 400m +-1 | depart,straight,via,straight,arrive |
|
||||
| 1,3,2 | ab,bc,cd,cd,de,ef,fa,ab,bc | 1600m +-1 | depart,straight,straight,via,straight,straight,straight,right,straight,arrive |
|
||||
| 3,2,1 | cd,de,ef,fa,ab,bc,bc,cd,de,ef,fa,ab | 2400m +-1 | depart,straight,straight,straight,right,straight,via,straight,straight,straight,straight,right,arrive |
|
||||
| waypoints | route | distance |
|
||||
| 1,3 | ab,bc,cd,cd | 400m +-1 |
|
||||
| 3,1 | cd,de,ef,fa,ab,ab | 1000m +-1 |
|
||||
| 1,2,3 | ab,bc,bc,bc,cd,cd | 400m +-1 |
|
||||
| 1,3,2 | ab,bc,cd,cd,cd,de,ef,fa,ab,bc,bc | 1600m +-1 |
|
||||
| 3,2,1 | cd,de,ef,fa,ab,bc,bc,bc,cd,de,ef,fa,ab,ab | 2400m +-1 |
|
||||
|
||||
Scenario: Via points on ring on the same oneway
|
||||
# xa it to avoid only having a single ring, which cna trigger edge cases
|
||||
@@ -124,12 +124,12 @@ Feature: Via points
|
||||
| da | yes |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route | distance | turns |
|
||||
| 1,3 | ab | 200m +-1 | depart,arrive |
|
||||
| 3,1 | ab,bc,cd,da,ab | 800m +-1 | depart,straight,straight,straight,right,arrive |
|
||||
| 1,2,3 | ab,ab | 200m +-1 | depart,via,arrive |
|
||||
| 1,3,2 | ab,ab,bc,cd,da,ab | 1100m +-1 | depart,via,straight,straight,straight,right,arrive |
|
||||
| 3,2,1 | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 1800m | depart,straight,straight,straight,right,via,straight,straight,straight,right,arrive |
|
||||
| waypoints | route | distance |
|
||||
| 1,3 | ab,ab | 200m +-1 |
|
||||
| 3,1 | ab,bc,cd,da,ab,ab | 800m +-1 |
|
||||
| 1,2,3 | ab,ab,ab,ab | 200m +-1 |
|
||||
| 1,3,2 | ab,ab,ab,bc,cd,da,ab,ab | 1100m +-1 |
|
||||
| 3,2,1 | ab,bc,cd,da,ab,ab,ab,bc,cd,da,ab,ab | 1800m +-1 |
|
||||
|
||||
# See issue #1896
|
||||
Scenario: Via point at a dead end with oneway
|
||||
@@ -145,9 +145,9 @@ Feature: Via points
|
||||
| de | yes |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route |
|
||||
| a,d,c | abc,bd,bd,bd,abc |
|
||||
| c,d,a | abc,bd,bd,bd,abc |
|
||||
| waypoints | route |
|
||||
| a,d,c | abc,bd,bd,bd,abc,abc |
|
||||
| c,d,a | abc,bd,bd,bd,abc,abc |
|
||||
|
||||
# See issue #1896
|
||||
Scenario: Via point at a dead end with barrier
|
||||
@@ -171,9 +171,9 @@ Feature: Via points
|
||||
| afed |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route |
|
||||
| a,1,c | abc,bd,bd,bd,abc |
|
||||
| c,1,a | abc,bd,bd,bd,abc |
|
||||
| waypoints | route |
|
||||
| a,1,c | abc,bd,bd,bd,bd,abc,abc |
|
||||
| c,1,a | abc,bd,bd,bd,bd,abc,abc |
|
||||
|
||||
Scenario: Via points on ring on the same oneway, forces one of the vertices to be top node
|
||||
Given the node map
|
||||
@@ -190,11 +190,11 @@ Feature: Via points
|
||||
| da | yes |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route | distance | turns |
|
||||
| 2,1 | ab,bc,cd,da,ab | 1100m +-1 | depart,straight,straight,straight,straight,arrive |
|
||||
| 4,3 | bc,cd,da,ab,bc | 1100m +-1 | depart,straight,straight,straight,straight,arrive |
|
||||
| 6,5 | cd,da,ab,bc,cd | 1100m +-1 | depart,straight,straight,straight,straight,arrive |
|
||||
| 8,7 | da,ab,bc,cd,da | 1100m +-1 | depart,straight,straight,straight,straight,arrive |
|
||||
| waypoints | route | distance |
|
||||
| 2,1 | ab,bc,cd,da,ab,ab | 1100m +-1 |
|
||||
| 4,3 | bc,cd,da,ab,bc,bc | 1100m +-1 |
|
||||
| 6,5 | cd,da,ab,bc,cd,cd | 1100m +-1 |
|
||||
| 8,7 | da,ab,bc,cd,da,da | 1100m +-1 |
|
||||
|
||||
Scenario: Multiple Via points on ring on the same oneway, forces one of the vertices to be top node
|
||||
Given the node map
|
||||
@@ -212,7 +212,7 @@ Feature: Via points
|
||||
| da | yes |
|
||||
|
||||
When I route I should get
|
||||
| waypoints | route | distance | turns |
|
||||
| 3,2,1 | ab,bc,cd,da,ab,ab,bc,cd,da,ab | 3000m +-1 | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive |
|
||||
| 6,5,4 | bc,cd,da,ab,bc,bc,cd,da,ab,bc | 3000m +-1 | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive |
|
||||
| 9,8,7 | cd,da,ab,bc,cd,cd,da,ab,bc,cd | 3000m +-1 | depart,straight,straight,straight,straight,via,straight,straight,straight,straight,arrive |
|
||||
| waypoints | route | distance |
|
||||
| 3,2,1 | ab,bc,cd,da,ab,ab,ab,bc,cd,da,ab,ab | 3000m +-1 |
|
||||
| 6,5,4 | bc,cd,da,ab,bc,bc,bc,cd,da,ab,bc,bc | 3000m +-1 |
|
||||
| 9,8,7 | cd,da,ab,bc,cd,cd,cd,da,ab,bc,cd,cd | 3000m +-1 |
|
||||
|
||||
Reference in New Issue
Block a user