diff --git a/features/testbot/distance.feature b/features/testbot/distance.feature index 55b5f6416..b8e571fef 100644 --- a/features/testbot/distance.feature +++ b/features/testbot/distance.feature @@ -15,7 +15,7 @@ Feature: Distance calculation When I route I should get | from | to | route | distance | - | a | b | ab | 100m +- 2 | + | a | b | ab,ab | 100m +- 2 | Scenario: Distance should equal sum of segments, leftwinded Given the node map @@ -28,8 +28,8 @@ Feature: Distance calculation | abcde | When I route I should get - | from | to | route | distance | - | a | d | abcde | 300m +-2 | + | from | to | route | distance | + | a | d | abcde,abcde | 300m +-2 | Scenario: Distance should equal sum of segments, rightwinded Given the node map @@ -42,8 +42,8 @@ Feature: Distance calculation | abcde | When I route I should get - | from | to | route | distance | - | a | d | abcde | 300m +-2 | + | from | to | route | distance | + | a | d | abcde,abcde | 300m +-2 | Scenario: 10m distances Given a grid size of 10 meters @@ -56,13 +56,13 @@ Feature: Distance calculation | abc | When I route I should get - | from | to | route | distance | - | a | b | abc | 10m +-2 | - | b | a | abc | 10m +-2 | - | b | c | abc | 10m +-2 | - | c | b | abc | 10m +-2 | - | a | c | abc | 20m +-4 | - | c | a | abc | 20m +-4 | + | from | to | route | distance | + | a | b | abc,abc | 10m +-2 | + | b | a | abc,abc | 10m +-2 | + | b | c | abc,abc | 10m +-2 | + | c | b | abc,abc | 10m +-2 | + | a | c | abc,abc | 20m +-4 | + | c | a | abc,abc | 20m +-4 | Scenario: 100m distances Given a grid size of 100 meters @@ -75,13 +75,13 @@ Feature: Distance calculation | abc | When I route I should get - | from | to | route | distance | - | a | b | abc | 100m +-2 | - | b | a | abc | 100m +-2 | - | b | c | abc | 100m +-2 | - | c | b | abc | 100m +-2 | - | a | c | abc | 200m +-4 | - | c | a | abc | 200m +-4 | + | from | to | route | distance | + | a | b | abc,abc | 100m +-2 | + | b | a | abc,abc | 100m +-2 | + | b | c | abc,abc | 100m +-2 | + | c | b | abc,abc | 100m +-2 | + | a | c | abc,abc | 200m +-4 | + | c | a | abc,abc | 200m +-4 | Scenario: 1km distance Given a grid size of 1000 meters @@ -94,13 +94,13 @@ Feature: Distance calculation | abc | When I route I should get - | from | to | route | distance | - | a | b | abc | 1000m +-2 | - | b | a | abc | 1000m +-2 | - | b | c | abc | 1000m +-2 | - | c | b | abc | 1000m +-2 | - | a | c | abc | 2000m +-4 | - | c | a | abc | 2000m +-4 | + | from | to | route | distance | + | a | b | abc,abc | 1000m +-2 | + | b | a | abc,abc | 1000m +-2 | + | b | c | abc,abc | 1000m +-2 | + | c | b | abc,abc | 1000m +-2 | + | a | c | abc,abc | 2000m +-4 | + | c | a | abc,abc | 2000m +-4 | Scenario: Distance of a winding south-north path Given a grid size of 10 meters @@ -115,14 +115,14 @@ Feature: Distance calculation | abcdefgh | When I route I should get - | from | to | route | distance | - | a | b | abcdefgh | 10m +-2 | - | a | c | abcdefgh | 20m +-4 | - | a | d | abcdefgh | 30m +-6 | - | a | e | abcdefgh | 40m +-8 | - | a | f | abcdefgh | 50m +-10 | - | a | g | abcdefgh | 60m +-12 | - | a | h | abcdefgh | 70m +-14 | + | from | to | route | distance | + | a | b | abcdefgh,abcdefgh | 10m +-2 | + | a | c | abcdefgh,abcdefgh | 20m +-4 | + | a | d | abcdefgh,abcdefgh | 30m +-6 | + | a | e | abcdefgh,abcdefgh | 40m +-8 | + | a | f | abcdefgh,abcdefgh | 50m +-10 | + | a | g | abcdefgh,abcdefgh | 60m +-12 | + | a | h | abcdefgh,abcdefgh | 70m +-14 | Scenario: Distance of a winding east-west path Given a grid size of 10 meters @@ -135,14 +135,14 @@ Feature: Distance calculation | abcdefgh | When I route I should get - | from | to | route | distance | - | a | b | abcdefgh | 10m +-2 | - | a | c | abcdefgh | 20m +-4 | - | a | d | abcdefgh | 30m +-6 | - | a | e | abcdefgh | 40m +-8 | - | a | f | abcdefgh | 50m +-10 | - | a | g | abcdefgh | 60m +-12 | - | a | h | abcdefgh | 70m +-14 | + | from | to | route | distance | + | a | b | abcdefgh,abcdefgh | 10m +-2 | + | a | c | abcdefgh,abcdefgh | 20m +-4 | + | a | d | abcdefgh,abcdefgh | 30m +-6 | + | a | e | abcdefgh,abcdefgh | 40m +-8 | + | a | f | abcdefgh,abcdefgh | 50m +-10 | + | a | g | abcdefgh,abcdefgh | 60m +-12 | + | a | h | abcdefgh,abcdefgh | 70m +-14 | Scenario: Geometric distances Given a grid size of 100 meters @@ -184,30 +184,30 @@ Feature: Distance calculation When I route I should get | from | to | route | distance | - | x | a | xa | 300m +-2 | - | x | b | xb | 316m +-2 | - | x | c | xc | 360m +-2 | - | x | d | xd | 424m +-2 | - | x | e | xe | 360m +-2 | - | x | f | xf | 316m +-2 | - | x | g | xg | 300m +-2 | - | x | h | xh | 316m +-2 | - | x | i | xi | 360m +-2 | - | x | j | xj | 424m +-2 | - | x | k | xk | 360m +-2 | - | x | l | xl | 316m +-2 | - | x | m | xm | 300m +-2 | - | x | n | xn | 316m +-2 | - | x | o | xo | 360m +-2 | - | x | p | xp | 424m +-2 | - | x | q | xq | 360m +-2 | - | x | r | xr | 316m +-2 | - | x | s | xs | 300m +-2 | - | x | t | xt | 316m +-2 | - | x | u | xu | 360m +-2 | - | x | v | xv | 424m +-2 | - | x | w | xw | 360m +-2 | - | x | y | xy | 316m +-2 | + | x | a | xa,xa | 300m +-2 | + | x | b | xb,xb | 316m +-2 | + | x | c | xc,xc | 360m +-2 | + | x | d | xd,xd | 424m +-2 | + | x | e | xe,xe | 360m +-2 | + | x | f | xf,xf | 316m +-2 | + | x | g | xg,xg | 300m +-2 | + | x | h | xh,xh | 316m +-2 | + | x | i | xi,xi | 360m +-2 | + | x | j | xj,xj | 424m +-2 | + | x | k | xk,xk | 360m +-2 | + | x | l | xl,xl | 316m +-2 | + | x | m | xm,xm | 300m +-2 | + | x | n | xn,xn | 316m +-2 | + | x | o | xo,xo | 360m +-2 | + | x | p | xp,xp | 424m +-2 | + | x | q | xq,xq | 360m +-2 | + | x | r | xr,xr | 316m +-2 | + | x | s | xs,xs | 300m +-2 | + | x | t | xt,xt | 316m +-2 | + | x | u | xu,xu | 360m +-2 | + | x | v | xv,xv | 424m +-2 | + | x | w | xw,xw | 360m +-2 | + | x | y | xy,xy | 316m +-2 | @maze Scenario: Distance of a maze of short segments @@ -224,5 +224,5 @@ Feature: Distance calculation | abcdefghijklmnopqrst | When I route I should get - | from | to | route | distance | - | a | t | abcdefghijklmnopqrst | 133m +-2 | + | from | to | route | distance | + | a | t | abcdefghijklmnopqrst,abcdefghijklmnopqrst | 133m +-2 |