cuke: use new speed tests where relevant

This commit is contained in:
Emil Tin 2014-03-27 20:57:30 +01:00
parent 793e477898
commit 65e020a627
3 changed files with 36 additions and 58 deletions

View File

@ -3,18 +3,19 @@ Feature: Bike - Max speed restrictions
Background: Use specific speeds
Given the profile "bicycle"
And a grid size of 1000 meters
Scenario: Bicycle - Respect maxspeeds when lower that way type speed
Then routability should be
| highway | maxspeed | bothw |
| residential | | 49s ~10% |
| residential | 10 | 72s ~10% |
| residential | | 15 km/h |
| residential | 10 | 10 km/h |
Scenario: Bicycle - Ignore maxspeed when higher than way speed
Then routability should be
| highway | maxspeed | bothw |
| residential | | 49s ~10% |
| residential | 80 | 49s ~10% |
| residential | | 15 km/h |
| residential | 80 | 15 km/h |
@todo
Scenario: Bicycle - Maxspeed formats
@ -47,9 +48,9 @@ Feature: Bike - Max speed restrictions
| bc | residential | 80 |
When I route I should get
| from | to | route | time |
| a | b | ab | 24s ~5% |
| b | c | bc | 24s ~5% |
| from | to | route | speed |
| a | b | ab | 15 km/h |
| b | c | bc | 15 km/h |
Scenario: Bike - Forward/backward maxspeed
Given the shortcuts
@ -61,13 +62,13 @@ Feature: Bike - Max speed restrictions
Then routability should be
| maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
| | | | bike | bike |
| 10 | | | run | run |
| | 10 | | run | bike |
| | | 10 | bike | run |
| 1 | 10 | | run | snail |
| 1 | | 10 | snail | run |
| 1 | 5 | 10 | walk | run |
| | | | 15 km/h | 15 km/h |
| 10 | | | 10 km/h | 10 km/h |
| | 10 | | 10 km/h | 15 km/h |
| | | 10 | 15 km/h | 10 km/h |
| 2 | 10 | | 10 km/h | 2 km/h |
| 2 | | 10 | 2 km/h | 10 km/h |
| 2 | 5 | 10 | 5 km/h | 10 km/h |
Scenario: Bike - Maxspeed should not allow routing on unroutable ways
Then routability should be

View File

@ -5,48 +5,25 @@ Feature: Car - Max speed restrictions
Given the profile "testbot"
Scenario: Testbot - Respect maxspeeds when lower that way type speed
Given the node map
| a | b | c | d |
And the ways
| nodes | maxspeed |
| ab | |
| bc | 24 |
| cd | 18 |
When I route I should get
| from | to | route | time |
| a | b | ab | 10s +-1 |
| b | a | ab | 10s +-1 |
| b | c | bc | 15s +-1 |
| c | b | bc | 15s +-1 |
| c | d | cd | 20s +-1 |
| d | c | cd | 20s +-1 |
Then routability should be
| maxspeed | bothw |
| | 36 km/h |
| 18 | 18 km/h |
Scenario: Testbot - Ignore maxspeed when higher than way speed
Given the node map
| a | b | c |
And the ways
| nodes | maxspeed |
| ab | |
| bc | 200 |
When I route I should get
| from | to | route | time |
| a | b | ab | 10s +-1 |
| b | a | ab | 10s +-1 |
| b | c | bc | 10s +-1 |
| c | b | bc | 10s +-1 |
Then routability should be
| maxspeed | bothw |
| | 36 km/h |
| 100 km/h | 36 km/h |
@opposite
Scenario: Testbot - Forward/backward maxspeed
Then routability should be
| maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
| | | | 20s +-1 | 20s +-1 |
| 18 | | | 40s +-1 | 40s +-1 |
| | 18 | | 40s +-1 | 20s +-1 |
| | | 18 | 20s +-1 | 40s +-1 |
| 9 | 18 | | 40s +-1 | 80s +-1 |
| 9 | | 18 | 80s +-1 | 40s +-1 |
| 9 | 24 | 18 | 30s +-1 | 40s +-1 |
| | | | 36 km/h | 36 km/h |
| 18 | | | 18 km/h | 18 km/h |
| | 18 | | 18 km/h | 36 km/h |
| | | 18 | 36 km/h | 18 km/h |
| 9 | 18 | | 18 km/h | 9 km/h |
| 9 | | 18 | 9 km/h | 18 km/h |
| 9 | 24 | 18 | 24 km/h | 18 km/h |

View File

@ -13,6 +13,6 @@ Feature: Separate settings for forward/backward direction
| abcd | river |
When I route I should get
| from | to | route | distance | time |
| a | d | abcd | 300 +- 1m | 30s |
| d | a | abcd | 300 +- 1m | 67s |
| from | to | route | distance | speed |
| a | d | abcd | 300 +- 1m | 36 km/h |
| d | a | abcd | 300 +- 1m | 16 km/h |