more reorganizing of tests

This commit is contained in:
Emil Tin
2012-10-01 13:27:08 +02:00
parent 57d6af5486
commit 1ad274ed2e
32 changed files with 197 additions and 136 deletions
+5 -5
View File
@@ -1,10 +1,10 @@
@routing @bicycle @access
Feature: Restricted access
Feature: Bike - Restricted access
Background:
Given the speedprofile "bicycle"
Scenario: Access tags on ways
Scenario: Bike - Access tags on ways
Then routability should be
| access | bothw |
| yes | x |
@@ -20,7 +20,7 @@ Feature: Restricted access
| designated | |
| some_tag | x |
Scenario: Access tags for other modes should have no effect
Scenario: Bike - Access tags for other modes should have no effect
Then routability should be
| access | bothw |
| ufo:yes | x |
@@ -36,7 +36,7 @@ Feature: Restricted access
| ufo:designated | x |
| ufo:some_tag | x |
Scenario: Access tags on nodes
Scenario: Bike - Access tags on nodes
Then routability should be
| node:access | bothw |
| yes | x |
@@ -52,7 +52,7 @@ Feature: Restricted access
| designated | |
| some_tag | x |
Scenario: Access tags on both nodes and way
Scenario: Bike - Access tags on both nodes and way
Then routability should be
| access | node:access | bothw |
| yes | yes | x |
+2 -2
View File
@@ -4,7 +4,7 @@ Feature: Barriers
Background:
Given the speedprofile "bicycle"
Scenario: Barriers
Scenario: Bike - Barriers
Then routability should be
| highway | node/barrier | node/access | bothw |
| primary | | | x |
@@ -16,7 +16,7 @@ Feature: Barriers
| primary | bollard | | x |
| primary | some_tag | | |
Scenario: Access tag trumphs barriers
Scenario: Bike - Access tag trumphs barriers
Then routability should be
| highway | node/barrier | node/access | bothw |
| primary | bollard | yes | x |
+4 -4
View File
@@ -1,10 +1,10 @@
@routing @bicycle @destination
Feature: Destination only, no passing through
Feature: Bike - Destination only, no passing through
Background:
Given the speedprofile "bicycle"
Scenario: Destination only street
Scenario: Bike - Destination only street
Given the node map
| a | | | | |
| | b | c | d | |
@@ -31,7 +31,7 @@ Feature: Destination only, no passing through
| d | c | bcd |
| d | b | bcd |
Scenario: Series of destination only streets
Scenario: Bike - Series of destination only streets
Given the node map
| a | | c | | e |
| | b | | d | |
@@ -50,7 +50,7 @@ Feature: Destination only, no passing through
| a | d | ab |
| a | e | ab |
Scenario: Routing inside a destination only area
Scenario: Bike - Routing inside a destination only area
Given the node map
| a | | c | | e |
| | b | | d | |
+2 -2
View File
@@ -1,10 +1,10 @@
@routing @bicycle @ferry
Feature: Handle ferry routes
Feature: Bike - Handle ferry routes
Background:
Given the speedprofile "bicycle"
Scenario: Use a ferry route
Scenario: Bike - Use a ferry route
Given the node map
| a | b | c | | |
| | | d | | |
+4 -4
View File
@@ -1,10 +1,10 @@
@routing @bicycle @names
Feature: Street names in instructions
Feature: Bike - Street names in instructions
Background:
Given the speedprofile "bicycle"
Scenario: A named street
Scenario: Bike - A named street
Given the node map
| a | b |
| | c |
@@ -18,7 +18,7 @@ Feature: Street names in instructions
| from | to | route |
| a | c | My Way,Your Way |
Scenario: Use way type to describe unnamed ways
Scenario: Bike - Use way type to describe unnamed ways
Given the node map
| a | b | c |
@@ -31,7 +31,7 @@ Feature: Street names in instructions
| from | to | route |
| a | c | cycleway,track |
Scenario: Don't create instructions for every node of unnamed ways
Scenario: Bike - Don't create instructions for every node of unnamed ways
Given the node map
| a | b | c | d |
+9 -11
View File
@@ -1,11 +1,11 @@
@routing @bicycle @oneway
Feature: Oneway streets
Feature: Bike - Oneway streets
Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
Background:
Given the speedprofile "bicycle"
Scenario: Simple oneway
Scenario: Bike - Simple oneway
Then routability should be
| highway | oneway | forw | backw |
| primary | yes | x | |
@@ -15,7 +15,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| highway | oneway | forw | backw |
| primary | -1 | | x |
Scenario: Around the Block
Scenario: Bike - Around the Block
Given the node map
| a | b |
| d | c |
@@ -32,7 +32,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| a | b | ab |
| b | a | bc,cd,da |
Scenario: Handle various oneway tag values
Scenario: Bike - Handle various oneway tag values
Then routability should be
| oneway | forw | backw |
| | x | x |
@@ -45,7 +45,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| 1 | x | |
| -1 | | x |
Scenario: Implied oneways
Scenario: Bike - Implied oneways
Then routability should be
| junction | forw | backw |
| | x | x |
@@ -60,7 +60,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| roundabout | x | |
| roundabout | x | |
Scenario: Overriding implied oneways
Scenario: Bike - Overriding implied oneways
Then routability should be
| highway | junction | oneway | forw | backw |
| primary | roundabout | no | x | x |
@@ -69,8 +69,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| trunk_link | | -1 | | |
| primary | roundabout | -1 | | x |
@bicycle
Scenario: Oneway:bicycle should override normal oneways tags
Scenario: Bike - Oneway:bicycle should override normal oneways tags
Then routability should be
| oneway:bicycle | oneway | junction | forw | backw |
| yes | | | x | |
@@ -89,8 +88,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| -1 | -1 | | | x |
| -1 | | roundabout | | x |
@bicycle
Scenario: Bicycles and contra flow
Scenario: Bike - Contra flow
Then routability should be
| oneway | cycleway | forw | backw |
| yes | opposite | x | x |
@@ -103,7 +101,7 @@ Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tag
| no | opposite_track | x | x |
| no | opposite_lane | x | x |
Scenario: Bikes should not be affected by car tags
Scenario: Bike - Should not be affected by car tags
Then routability should be
| junction | oneway | oneway:car | forw | backw |
| | yes | yes | x | |
+9 -9
View File
@@ -1,5 +1,5 @@
@routing @bicycle @restrictions
Feature: Turn restrictions
Feature: Bike - Turn restrictions
Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction
Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
@@ -7,7 +7,7 @@ Feature: Turn restrictions
Given the speedprofile "bicycle"
@no_turning
Scenario: No left turn
Scenario: Bike - No left turn
Given the node map
| | n | |
| w | j | e |
@@ -31,7 +31,7 @@ Feature: Turn restrictions
| s | e | sj,ej |
@no_turning
Scenario: No right turn
Scenario: Bike - No right turn
Given the node map
| | n | |
| w | j | e |
@@ -55,7 +55,7 @@ Feature: Turn restrictions
| s | e | |
@no_turning
Scenario: No u-turn
Scenario: Bike - No u-turn
Given the node map
| | n | |
| w | j | e |
@@ -79,7 +79,7 @@ Feature: Turn restrictions
| s | e | sj,ej |
@no_turning
Scenario: Handle any no_* relation
Scenario: Bike - Handle any no_* relation
Given the node map
| | n | |
| w | j | e |
@@ -103,7 +103,7 @@ Feature: Turn restrictions
| s | e | sj,ej |
@only_turning
Scenario: Only left turn
Scenario: Bike - Only left turn
Given the node map
| | n | |
| w | j | e |
@@ -127,7 +127,7 @@ Feature: Turn restrictions
| s | e | |
@only_turning
Scenario: Only right turn
Scenario: Bike - Only right turn
Given the node map
| | n | |
| w | j | e |
@@ -151,7 +151,7 @@ Feature: Turn restrictions
| s | e | sj,ej |
@only_turning
Scenario: Only straight on
Scenario: Bike - Only straight on
Given the node map
| | n | |
| w | j | e |
@@ -175,7 +175,7 @@ Feature: Turn restrictions
| s | e | |
@no_turning
Scenario: Handle any only_* restriction
Scenario: Bike - Handle any only_* restriction
Given the node map
| | n | |
| w | j | e |
+2 -2
View File
@@ -1,10 +1,10 @@
@routing @bicycle @way
Feature: Accessability of different way types
Feature: Bike - Accessability of different way types
Background:
Given the speedprofile "bicycle"
Scenario: Basic access for bicycles
Scenario: Bike - Basic access
Bikes are allowed on footways etc because you can pull your bike at a lower speed.
Given the speedprofile "bicycle"
Then routability should be