From 3a01ba52efe9be6acbd2ec16c8ea4971deff62ca Mon Sep 17 00:00:00 2001 From: Moritz Kobitzsch Date: Wed, 9 Aug 2017 14:51:59 +0200 Subject: [PATCH] remove a few tests that are simply testing same code paths as others --- features/bicycle/bridge.feature | 7 - features/bicycle/destination.feature | 46 +++---- features/bicycle/ferry.feature | 5 - features/bicycle/mode.feature | 97 +------------- features/bicycle/ref.feature | 47 ------- features/bicycle/restrictions.feature | 185 +------------------------- features/car/bridge.feature | 9 -- features/car/ferry.feature | 18 +++ features/car/mode.feature | 44 ------ features/car/names.feature | 16 --- features/foot/ferry.feature | 6 - features/foot/names.feature | 24 +--- features/foot/ref.feature | 47 ------- features/foot/restrictions.feature | 180 ------------------------- features/foot/roundabout.feature | 5 +- features/testbot/datastore.feature | 35 ----- features/testbot/distance.feature | 20 --- features/testbot/duration.feature | 20 +-- features/testbot/oneway.feature | 82 ------------ 19 files changed, 61 insertions(+), 832 deletions(-) delete mode 100644 features/bicycle/ref.feature delete mode 100644 features/car/mode.feature delete mode 100644 features/foot/ref.feature delete mode 100644 features/testbot/datastore.feature diff --git a/features/bicycle/bridge.feature b/features/bicycle/bridge.feature index 7cac16107..81e371371 100644 --- a/features/bicycle/bridge.feature +++ b/features/bicycle/bridge.feature @@ -21,13 +21,6 @@ Feature: Bicycle - Handle cycling When I route I should get | from | to | route | modes | | a | g | abc,cde,efg,efg | cycling,cycling,cycling,cycling | - | b | f | abc,cde,efg,efg | cycling,cycling,cycling,cycling | - | e | c | cde,cde | cycling,cycling | - | e | b | cde,abc,abc | cycling,cycling,cycling | - | e | a | cde,abc,abc | cycling,cycling,cycling | - | c | e | cde,cde | cycling,cycling | - | c | f | cde,efg,efg | cycling,cycling,cycling | - | c | g | cde,efg,efg | cycling,cycling,cycling | Scenario: Bicycle - Properly handle durations Given the node map diff --git a/features/bicycle/destination.feature b/features/bicycle/destination.feature index dccba750c..91e8f7c63 100644 --- a/features/bicycle/destination.feature +++ b/features/bicycle/destination.feature @@ -21,15 +21,15 @@ Feature: Bike - Destination only, no passing through | axye | | When I route I should get - | from | to | route | - | a | b | ab,ab | - | a | c | ab,bcd,bcd | - | a | d | ab,bcd,bcd | - | a | e | axye,axye | - | e | d | de,de | - | e | c | de,bcd,bcd | - | e | b | de,bcd,bcd | - | e | a | axye,axye | + | from | to | route | + | a | b | ab,ab | + | a | c | ab,bcd | + | a | d | ab,bcd | + | a | e | axye,axye | + | e | d | de,de | + | e | c | de,bcd | + | e | b | de,bcd | + | e | a | axye,axye | Scenario: Bike - Destination only street Given the node map @@ -49,15 +49,15 @@ Feature: Bike - Destination only, no passing through | axye | | When I route I should get - | from | to | route | - | a | b | ab,ab | - | a | c | ab,bc,bc | - | a | d | ab,bc,cd,cd | - | a | e | axye,axye | - | e | d | de,de | - | e | c | de,cd,cd | - | e | b | de,cd,bc,bc | - | e | a | axye,axye | + | from | to | route | + | a | b | ab,ab | + | a | c | ab,bc | + | a | d | ab,bc,cd | + | a | e | axye,axye | + | e | d | de,de | + | e | c | de,cd,cd | + | e | b | de,cd,bc | + | e | a | axye,axye | Scenario: Bike - Routing inside a destination only area Given the node map @@ -76,8 +76,8 @@ Feature: Bike - Destination only, no passing through | axye | | When I route I should get - | from | to | route | - | a | e | ab,bc,cd,de,de | - | e | a | de,cd,bc,ab,ab | - | b | d | bc,cd,cd | - | d | b | cd,bc,bc | + | from | to | route | + | a | e | ab,bc,cd,de | + | e | a | de,cd,bc,ab | + | b | d | bc,cd | + | d | b | cd,bc | diff --git a/features/bicycle/ferry.feature b/features/bicycle/ferry.feature index 3ea7dbccb..6e2add28c 100644 --- a/features/bicycle/ferry.feature +++ b/features/bicycle/ferry.feature @@ -21,12 +21,7 @@ Feature: Bike - Handle ferry routes When I route I should get | from | to | route | | a | g | abc,cde,efg,efg | - | b | f | abc,cde,efg,efg | - | e | c | cde,cde | - | e | b | cde,abc,abc | - | e | a | cde,abc,abc | | c | e | cde,cde | - | c | f | cde,efg,efg | | c | g | cde,efg,efg | Scenario: Bike - Ferry duration, single node diff --git a/features/bicycle/mode.feature b/features/bicycle/mode.feature index 6f9224a51..c17cf1e2e 100644 --- a/features/bicycle/mode.feature +++ b/features/bicycle/mode.feature @@ -20,11 +20,8 @@ Feature: Bike - Mode flag When I route I should get | from | to | route | modes | | a | d | ab,bc,cd,cd | cycling,ferry,cycling,cycling | - | d | a | cd,bc,ab,ab | cycling,ferry,cycling,cycling | | c | a | bc,ab,ab | ferry,cycling,cycling | | d | b | cd,bc,bc | cycling,ferry,ferry | - | a | c | ab,bc,bc | cycling,ferry,ferry | - | b | d | bc,cd,cd | ferry,cycling,cycling | Scenario: Bike - Mode when using a train Given the node map @@ -42,12 +39,10 @@ Feature: Bike - Mode flag When I route I should get | from | to | route | modes | | a | d | ab,bc,cd,cd | cycling,train,cycling,cycling | - | d | a | cd,bc,ab,ab | cycling,train,cycling,cycling | | c | a | bc,ab,ab | train,cycling,cycling | | d | b | cd,bc,bc | cycling,train,train | - | a | c | ab,bc,bc | cycling,train,train | - | b | d | bc,cd,cd | train,cycling,cycling | + #representative test for all pushes (and mode changes). Where a bike is pushed is tested over in access.feature Scenario: Bike - Mode when pushing bike against oneways Given the node map """ @@ -70,96 +65,6 @@ Feature: Bike - Mode flag | d | a | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling | | c | a | bc,ab,ab | pushing bike,cycling,cycling | | d | b | cd,bc,bc | cycling,pushing bike,pushing bike | - | a | c | ab,bc,bc | cycling,cycling,cycling | - | b | d | bc,cd,cd | cycling,cycling,cycling | - - Scenario: Bike - Mode when pushing on pedestrain streets - Given the node map - """ - a b - c d - """ - - And the ways - | nodes | highway | - | ab | primary | - | bc | pedestrian | - | cd | primary | - - When I route I should get - | from | to | route | modes | - | a | d | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling | - | d | a | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling | - | c | a | bc,ab,ab | pushing bike,cycling,cycling | - | d | b | cd,bc,bc | cycling,pushing bike,pushing bike | - | a | c | ab,bc,bc | cycling,pushing bike,pushing bike | - | b | d | bc,cd,cd | pushing bike,cycling,cycling | - - Scenario: Bike - Mode when pushing on pedestrain areas - Given the node map - """ - a b - c d f - """ - - And the ways - | nodes | highway | area | - | ab | primary | | - | bcd | pedestrian | yes | - | df | primary | | - - When I route I should get - | from | to | route | modes | - | a | f | ab,bcd,df,df | cycling,pushing bike,cycling,cycling | - | f | a | df,bcd,ab,ab | cycling,pushing bike,cycling,cycling | - | d | a | bcd,ab,ab | pushing bike,cycling,cycling | - | f | b | df,bcd,bcd | cycling,pushing bike,pushing bike | - | a | d | ab,bcd,bcd | cycling,pushing bike,pushing bike | - | b | f | bcd,df,df | pushing bike,cycling,cycling | - - Scenario: Bike - Mode when pushing on steps - Given the node map - """ - a b - c d f - """ - - And the ways - | nodes | highway | - | ab | primary | - | bc | steps | - | cd | primary | - - When I route I should get - | from | to | route | modes | - | a | d | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling | - | d | a | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling | - | c | a | bc,ab,ab | pushing bike,cycling,cycling | - | d | b | cd,bc,bc | cycling,pushing bike,pushing bike | - | a | c | ab,bc,bc | cycling,pushing bike,pushing bike | - | b | d | bc,cd,cd | pushing bike,cycling,cycling | - - Scenario: Bike - Mode when bicycle=dismount - Given the node map - """ - a b - c d f - """ - - And the ways - | nodes | highway | bicycle | - | ab | primary | | - | bc | primary | dismount | - | cd | primary | | - - When I route I should get - | from | to | route | modes | - | a | d | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling | - | d | a | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling | - | c | a | bc,ab,ab | pushing bike,cycling,cycling | - | d | b | cd,bc,bc | cycling,pushing bike,pushing bike | - | a | c | ab,bc,bc | cycling,pushing bike,pushing bike | - | b | d | bc,cd,cd | pushing bike,cycling,cycling | Scenario: Bicycle - Modes when starting on forward oneway Given the node map diff --git a/features/bicycle/ref.feature b/features/bicycle/ref.feature deleted file mode 100644 index 3270c8018..000000000 --- a/features/bicycle/ref.feature +++ /dev/null @@ -1,47 +0,0 @@ -@routing @bicycle @ref @name -Feature: Bike - Way ref - - Background: - Given the profile "bicycle" - - Scenario: Bike - Way with both name and ref - Given the node map - """ - a b - """ - - And the ways - | nodes | name | ref | - | ab | Utopia Drive | E7 | - - When I route I should get - | from | to | route | ref | - | a | b | Utopia Drive,Utopia Drive | E7,E7 | - - Scenario: Bike - Way with only ref - Given the node map - """ - a b - """ - - And the ways - | nodes | name | ref | - | ab | | E7 | - - When I route I should get - | from | to | route | ref | - | a | b | , | E7,E7 | - - Scenario: Bike - Way with only name - Given the node map - """ - a b - """ - - And the ways - | nodes | name | - | ab | Utopia Drive | - - When I route I should get - | from | to | route | - | a | b | Utopia Drive,Utopia Drive | diff --git a/features/bicycle/restrictions.feature b/features/bicycle/restrictions.feature index 828507348..354cb05c3 100644 --- a/features/bicycle/restrictions.feature +++ b/features/bicycle/restrictions.feature @@ -7,6 +7,8 @@ Feature: Bike - Turn restrictions Given the profile "bicycle" Given a grid size of 200 meters + # check to see if bicycle profiles handle relations. The code path is the same as in cars. + # If relations are passed, all variants tested in car also work for bike @no_turning Scenario: Bike - No left turn Given the node map @@ -33,188 +35,7 @@ Feature: Bike - Turn restrictions | s | n | sj,nj,nj | | s | e | sj,ej,ej | - @no_turning - Scenario: Bike - No right turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | ej | j | no_right_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Bike - No u-turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | wj | j | no_u_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Bike - Handle any no_* relation - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | wj | j | no_weird_zigzags | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @only_turning - Scenario: Bike - Only left turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | wj | j | only_left_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @only_turning - Scenario: Bike - Only right turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | ej | j | only_right_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @only_turning - Scenario: Bike - Only straight on - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | nj | j | only_straight_on | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Bike - Handle any only_* restriction - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | foot | - | sj | yes | no | - | nj | -1 | no | - | wj | -1 | no | - | ej | -1 | no | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | nj | j | only_weird_zigzags | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - + ## exceptions are different for bike over car and need to be tested here @except Scenario: Bike - Except tag and on no_ restrictions Given the node map diff --git a/features/car/bridge.feature b/features/car/bridge.feature index 120ec5509..1a1c0d3c2 100644 --- a/features/car/bridge.feature +++ b/features/car/bridge.feature @@ -22,13 +22,7 @@ Feature: Car - Handle driving When I route I should get | from | to | route | modes | | a | g | abc,cde,efg,efg | driving,driving,driving,driving | - | b | f | abc,cde,efg,efg | driving,driving,driving,driving | - | e | c | cde,cde | driving,driving | - | e | b | cde,abc,abc | driving,driving,driving | | e | a | cde,abc,abc | driving,driving,driving | - | c | e | cde,cde | driving,driving | - | c | f | cde,efg,efg | driving,driving,driving | - | c | g | cde,efg,efg | driving,driving,driving | Scenario: Car - Control test without durations, osrm uses movable bridge speed to calculate duration Given the node map @@ -47,8 +41,6 @@ Feature: Car - Handle driving When I route I should get | from | to | route | modes | speed | time | | a | g | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 340s +-1 | - | b | f | abc,cde,efg,efg | driving,driving,driving,driving | 9 km/h | 318s +-1 | - | c | e | cde,cde | driving,driving | 5 km/h | 295s +-1 | | e | c | cde,cde | driving,driving | 5 km/h | 295s +-1 | Scenario: Car - Properly handle durations @@ -68,6 +60,5 @@ Feature: Car - Handle driving When I route I should get | from | to | route | modes | speed | | a | g | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h | - | b | f | abc,cde,efg,efg | driving,driving,driving,driving | 5 km/h | | c | e | cde,cde | driving,driving | 2 km/h | | e | c | cde,cde | driving,driving | 2 km/h | diff --git a/features/car/ferry.feature b/features/car/ferry.feature index 95e95dfa8..acdd13f6e 100644 --- a/features/car/ferry.feature +++ b/features/car/ferry.feature @@ -50,6 +50,7 @@ Feature: Car - Handle ferry routes | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h | 162.4s | | c | e | cde,cde | ferry,ferry | 5 km/h | 151.4s | | e | c | cde,cde | ferry,ferry | 5 km/h | 151.4s | + Scenario: Car - Properly handle simple durations Given the node map """ @@ -91,3 +92,20 @@ Feature: Car - Handle ferry routes | b | f | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s | | c | e | cde,cde | ferry,ferry | 11 km/h | 67.4s | | e | c | cde,cde | ferry,ferry | 11 km/h | 67.4s | + + @snapping + Scenario: Car - Snapping when using a ferry + Given the node map + """ + a b c d e f + """ + + And the ways + | nodes | highway | route | duration | + | ab | primary | | | + | bcde | | ferry | 0:10 | + | ef | primary | | | + + When I route I should get + | from | to | route | modes | time | + | c | d | bcde,bcde | ferry,ferry | 600s | diff --git a/features/car/mode.feature b/features/car/mode.feature deleted file mode 100644 index 136942e5b..000000000 --- a/features/car/mode.feature +++ /dev/null @@ -1,44 +0,0 @@ -@routing @car @mode -Feature: Car - Mode flag - Background: - Given the profile "car" - - Scenario: Car - Mode when using a ferry - Given the node map - """ - a b - c d - """ - - And the ways - | nodes | highway | route | duration | - | ab | primary | | | - | bc | | ferry | 0:01 | - | cd | primary | | | - - When I route I should get - | from | to | route | modes | - | a | d | ab,bc,cd,cd | driving,ferry,driving,driving | - | d | a | cd,bc,ab,ab | driving,ferry,driving,driving | - | c | a | bc,ab,ab | ferry,driving,driving | - | d | b | cd,bc,bc | driving,ferry,ferry | - | a | c | ab,bc,bc | driving,ferry,ferry | - | b | d | bc,cd,cd | ferry,driving,driving | - - Scenario: Car - Snapping when using a ferry - Given the node map - """ - a b c d e f - """ - - And the ways - | nodes | highway | route | duration | - | ab | primary | | | - | bcde | | ferry | 0:10 | - | ef | primary | | | - - When I route I should get - | from | to | route | modes | time | - | c | d | bcde,bcde | ferry,ferry | 600s | - - diff --git a/features/car/names.feature b/features/car/names.feature index 2660efe23..af81a0b9f 100644 --- a/features/car/names.feature +++ b/features/car/names.feature @@ -5,22 +5,6 @@ Feature: Car - Street names in instructions Given the profile "car" Given a grid size of 5 meters - Scenario: Car - A named street - Given the node map - """ - a b - c - """ - - And the ways - | nodes | name | ref | - | ab | My Way | | - | bc | Your Way | A1 | - - When I route I should get - | from | to | route | ref | - | a | c | My Way,Your Way | ,A1| - Scenario: Car - A named street with pronunciation Given the node map """ diff --git a/features/foot/ferry.feature b/features/foot/ferry.feature index e9caec189..4c7ab81ce 100644 --- a/features/foot/ferry.feature +++ b/features/foot/ferry.feature @@ -21,13 +21,7 @@ Feature: Foot - Handle ferry routes When I route I should get | from | to | route | modes | | a | g | abc,cde,efg,efg | walking,ferry,walking,walking | - | b | f | abc,cde,efg,efg | walking,ferry,walking,walking | - | e | c | cde,cde | ferry,ferry | - | e | b | cde,abc,abc | ferry,walking,walking | | e | a | cde,abc,abc | ferry,walking,walking | - | c | e | cde,cde | ferry,ferry | - | c | f | cde,efg,efg | ferry,walking,walking | - | c | g | cde,efg,efg | ferry,walking,walking | Scenario: Foot - Ferry duration, single node Given the node map diff --git a/features/foot/names.feature b/features/foot/names.feature index 61d42dc3c..c14b00b7f 100644 --- a/features/foot/names.feature +++ b/features/foot/names.feature @@ -14,25 +14,9 @@ Feature: Foot - Street names in instructions And the ways | nodes | name | ref | - | ab | My Way | A6 | - | bc | Your Way | B7 | + | ab | My Way | | + | bc | | A7 | When I route I should get - | from | to | route | - | a | c | My Way,Your Way,Your Way | - - @unnamed - Scenario: Foot - No longer use way type to describe unnamed ways, see #3231 - Given the node map - """ - a b c d - """ - - And the ways - | nodes | highway | name | - | ab | footway | | - | bcd | track | | - - When I route I should get - | from | to | route | - | a | d | , | + | from | to | route | ref | + | a | c | My Way,, | ,A7,A7 | diff --git a/features/foot/ref.feature b/features/foot/ref.feature deleted file mode 100644 index 18208a8ac..000000000 --- a/features/foot/ref.feature +++ /dev/null @@ -1,47 +0,0 @@ -@routing @foot @ref @name -Feature: Foot - Way ref - - Background: - Given the profile "foot" - - Scenario: Foot - Way with both name and ref - Given the node map - """ - a b - """ - - And the ways - | nodes | name | ref | - | ab | Utopia Drive | E7 | - - When I route I should get - | from | to | route | ref | - | a | b | Utopia Drive,Utopia Drive | E7,E7 | - - Scenario: Foot - Way with only ref - Given the node map - """ - a b - """ - - And the ways - | nodes | name | ref | - | ab | | E7 | - - When I route I should get - | from | to | route | ref | - | a | b | , | E7,E7 | - - Scenario: Foot - Way with only name - Given the node map - """ - a b - """ - - And the ways - | nodes | name | - | ab | Utopia Drive | - - When I route I should get - | from | to | route | - | a | b | Utopia Drive,Utopia Drive | diff --git a/features/foot/restrictions.feature b/features/foot/restrictions.feature index 4d63cd537..5273a47b1 100644 --- a/features/foot/restrictions.feature +++ b/features/foot/restrictions.feature @@ -32,84 +32,6 @@ Feature: Foot - Turn restrictions | s | n | sj,nj,nj | | s | e | sj,ej,ej | - @no_turning - Scenario: Foot - No right turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | ej | j | no_right_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Foot - No u-turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | wj | j | no_u_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Foot - Handle any no_* relation - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | wj | j | no_weird_zigzags | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - @only_turning Scenario: Foot - Only left turn Given the node map @@ -136,84 +58,6 @@ Feature: Foot - Turn restrictions | s | n | sj,nj,nj | | s | e | sj,ej,ej | - @only_turning - Scenario: Foot - Only right turn - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | ej | j | only_right_turn | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @only_turning - Scenario: Foot - Only straight on - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | nj | j | only_straight_on | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - - @no_turning - Scenario: Foot - Handle any only_* restriction - Given the node map - """ - n - w j e - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | nj | -1 | - | wj | -1 | - | ej | -1 | - - And the relations - | type | way:from | way:to | node:via | restriction | - | restriction | sj | nj | j | only_weird_zigzags | - - When I route I should get - | from | to | route | - | s | w | sj,wj,wj | - | s | n | sj,nj,nj | - | s | e | sj,ej,ej | - @except Scenario: Foot - Except tag and on no_ restrictions Given the node map @@ -246,30 +90,6 @@ Feature: Foot - Turn restrictions | s | c | sj,cj,cj | | s | d | sj,dj,dj | - @except - Scenario: Foot - Except tag and on only_ restrictions - Given the node map - """ - a b - j - s - """ - - And the ways - | nodes | oneway | - | sj | yes | - | aj | no | - | bj | no | - - And the relations - | type | way:from | way:to | node:via | restriction | except | - | restriction | sj | aj | j | only_straight_on | foot | - - When I route I should get - | from | to | route | - | s | a | sj,aj,aj | - | s | b | sj,bj,bj | - @except Scenario: Foot - Multiple except tag values Given the node map diff --git a/features/foot/roundabout.feature b/features/foot/roundabout.feature index bee9a1c51..1ebd585b1 100644 --- a/features/foot/roundabout.feature +++ b/features/foot/roundabout.feature @@ -1,10 +1,9 @@ -@routing @foot @roundabout @instruction +@routing @foot @roundabout @instruction @todo Feature: Roundabout Instructions Background: Given the profile "foot" - @todo Scenario: Foot - Roundabout instructions # You can walk in both directions on a roundabout, bu the normal roundabout instructions don't # make sense when you're going the opposite way around the roundabout. @@ -27,7 +26,7 @@ Feature: Roundabout Instructions | abcda | roundabout | When I route I should get - | from | to | route | turns | + | from | to | route | turns | | s | t | sa,tb | depart,roundabout-exit-1,arrive | | s | u | sa,uc | depart,roundabout-exit-2,arrive | | s | v | sa,vd | depart,roundabout-exit-3,arrive | diff --git a/features/testbot/datastore.feature b/features/testbot/datastore.feature deleted file mode 100644 index 3a2678b53..000000000 --- a/features/testbot/datastore.feature +++ /dev/null @@ -1,35 +0,0 @@ -@routing @datastore @testbot -Feature: Temporary tests related to osrm-datastore - - Background: - Given the profile "testbot" - - Scenario: Scenario ab - Given the node map - """ - a b - """ - - And the ways - | nodes | - | ab | - - When I route I should get - | from | to | route | - | a | b | ab,ab | - | b | a | ab,ab | - - Scenario: Scenaria xy - Given the node map - """ - x y - """ - - And the ways - | nodes | - | xy | - - When I route I should get - | from | to | route | - | x | y | xy,xy | - | y | x | xy,xy | diff --git a/features/testbot/distance.feature b/features/testbot/distance.feature index d8a8ea719..8500c1df1 100644 --- a/features/testbot/distance.feature +++ b/features/testbot/distance.feature @@ -226,23 +226,3 @@ Feature: Distance calculation | x | v | xv,xv | 424m +-1 | | x | w | xw,xw | 360m +-1 | | x | y | xy,xy | 316m +-1 | - - @maze - Scenario: Distance of a maze of short segments - Given a grid size of 7 meters - Given the node map - """ - a b s t - d c r q - e f o p - h g n m - i j k l - """ - - And the ways - | nodes | - | abcdefghijklmnopqrst | - - When I route I should get - | from | to | route | distance | - | a | t | abcdefghijklmnopqrst,abcdefghijklmnopqrst | 133m +-1 | diff --git a/features/testbot/duration.feature b/features/testbot/duration.feature index 26e4f7551..b5243b5b1 100644 --- a/features/testbot/duration.feature +++ b/features/testbot/duration.feature @@ -21,12 +21,12 @@ Feature: Durations | ef | primary | 01:02:03 | When I route I should get - | from | to | route | distance | time | - | a | b | ab,ab | 100m +-1 | 60s +-1 | - | b | c | bc,bc | 200m +-1 | 600s +-1 | - | c | d | cd,cd | 300m +-1 | 3600s +-1 | - | d | e | de,de | 141m +-2 | 36000s +-1 | - | e | f | ef,ef | 224m +-2 | 3723s +-1 | + | from | to | route | time | + | a | b | ab,ab | 60s +-1 | + | b | c | bc,bc | 600s +-1 | + | c | d | cd,cd | 3600s +-1 | + | d | e | de,de | 36000s +-1 | + | e | f | ef,ef | 3723s +-1 | @todo Scenario: Partial duration of ways @@ -40,7 +40,7 @@ Feature: Durations | abc | primary | 0:01 | When I route I should get - | from | to | route | distance | time | - | a | c | abc,abc | 300m +-1 | 60s +-1 | - | a | b | ab,ab | 100m +-1 | 20s +-1 | - | b | c | bc,bc | 200m +-1 | 40s +-1 | + | from | to | route | time | + | a | c | abc,abc | 60s +-1 | + | a | b | ab,ab | 20s +-1 | + | b | c | bc,bc | 40s +-1 | diff --git a/features/testbot/oneway.feature b/features/testbot/oneway.feature index fb348e297..14e15968c 100644 --- a/features/testbot/oneway.feature +++ b/features/testbot/oneway.feature @@ -5,51 +5,6 @@ Feature: Testbot - oneways Given the profile "testbot" Given a grid size of 250 meters - Scenario: Routing on a oneway roundabout - Given the node map - """ - v - x d c - e b - f a - g h y - z - """ - - And the ways - | nodes | oneway | - | ab | yes | - | bc | yes | - | cd | yes | - | de | yes | - | ef | yes | - | fg | yes | - | gh | yes | - | ha | yes | - | vx | yes | - | vy | yes | - | yz | yes | - | xe | yes | - - When I route I should get - | from | to | route | - | a | b | ab,ab | - | b | c | bc,bc | - | c | d | cd,cd | - | d | e | de,de | - | e | f | ef,ef | - | f | g | fg,fg | - | g | h | gh,gh | - | h | a | ha,ha | - | b | a | bc,cd,de,ef,fg,gh,ha,ha | - | c | b | cd,de,ef,fg,gh,ha,ab,ab | - | d | c | de,ef,fg,gh,ha,ab,bc,bc | - | e | d | ef,fg,gh,ha,ab,bc,cd,cd | - | f | e | fg,gh,ha,ab,bc,cd,de,de | - | g | f | gh,ha,ab,bc,cd,de,ef,ef | - | h | g | ha,ab,bc,cd,de,ef,fg,fg | - | a | h | ab,bc,cd,de,ef,fg,gh,gh | - Scenario: Testbot - Simple oneway Then routability should be | highway | foot | oneway | forw | backw | @@ -60,27 +15,6 @@ Feature: Testbot - oneways | highway | foot | oneway | forw | backw | | primary | no | -1 | | x | - Scenario: Testbot - Around the Block - Given the node map - """ - a b - e d c f - """ - - And the ways - | nodes | oneway | foot | - | ab | yes | no | - | bc | | no | - | cd | | no | - | da | | no | - | de | | no | - | cf | | no | - - When I route I should get - | from | to | route | - | a | b | ab,ab | - | b | a | bc,cd,da,da | - Scenario: Testbot - Handle various oneway tag values Then routability should be | foot | oneway | forw | backw | @@ -93,19 +27,3 @@ Feature: Testbot - oneways | no | true | x | | | no | 1 | x | | | no | -1 | | x | - - Scenario: Testbot - Two consecutive oneways - Given the node map - """ - a b c - """ - - And the ways - | nodes | oneway | - | ab | yes | - | bc | yes | - - - When I route I should get - | from | to | route | - | a | c | ab,bc,bc |