diff --git a/features/testbot/penalty.feature b/features/testbot/penalty.feature index e4f3cb632..8d86a17ca 100644 --- a/features/testbot/penalty.feature +++ b/features/testbot/penalty.feature @@ -20,9 +20,9 @@ Feature: Penalties | def | When I route I should get - | from | to | route | time | distance | - | a | c | abc | 20s +-1 | 200m +-1 | - | d | f | def | 27s +-1 | 200m +-1 | + | from | to | route | time | distance | + | a | c | abc,abc | 20s +-1 | 200m +-1 | + | d | f | def,def | 27s +-1 | 200m +-1 | Scenario: Signal penalty should not depend on way type Given the node map @@ -43,10 +43,10 @@ Feature: Penalties | ghi | tertiary | When I route I should get - | from | to | route | time | - | a | c | abc | 27s +-1 | - | d | f | def | 47s +-1 | - | g | i | ghi | 67s +-1 | + | from | to | route | time | + | a | c | abc,abc | 27s +-1 | + | d | f | def,def | 47s +-1 | + | g | i | ghi,ghi | 67s +-1 | Scenario: Passing multiple traffic signals should incur a accumulated delay Given the node map @@ -63,8 +63,8 @@ Feature: Penalties | abcde | When I route I should get - | from | to | route | time | - | a | e | abcde | 61s +-1 | + | from | to | route | time | + | a | e | abcde,abcde | 61s +-1 | @todo Scenario: Signal penalty should not depend on way type @@ -86,13 +86,13 @@ Feature: Penalties | ghi | tertiary | When I route I should get - | from | to | route | time | - | a | b | abc | 10s +-1 | - | a | c | abc | 27s +-1 | - | d | e | def | 20s +-1 | - | d | f | def | 47s +-1 | - | g | h | ghi | 30s +-1 | - | g | i | ghi | 67s +-1 | + | from | to | route | time | + | a | b | abc,abc | 10s +-1 | + | a | c | abc,abc | 27s +-1 | + | d | e | def,def | 20s +-1 | + | d | f | def,def | 47s +-1 | + | g | h | ghi,ghi | 30s +-1 | + | g | i | ghi,ghi | 67s +-1 | Scenario: Passing multiple traffic signals should incur a accumulated delay Given the node map @@ -109,8 +109,8 @@ Feature: Penalties | abcde | When I route I should get - | from | to | route | time | - | a | e | abcde | 61s +-1 | + | from | to | route | time | + | a | e | abcde,abcde | 61s +-1 | @todo Scenario: Starting or ending at a traffic signal should not incur a delay @@ -144,9 +144,9 @@ Feature: Penalties | abcd | primary | When I route I should get - | from | to | route | time | - | b | c | abcd | 10s +-1 | - | c | b | abcd | 10s +-1 | + | from | to | route | time | + | b | c | abcd,abcd | 10s +-1 | + | c | b | abcd,abcd | 10s +-1 | Scenario: Prefer faster route without traffic signals Given a grid size of 50 meters @@ -164,5 +164,5 @@ Feature: Penalties | adc | primary | When I route I should get - | from | to | route | - | a | c | adc | + | from | to | route | + | a | c | adc,adc |