From 4f5d7f79bdd1070411d414efa04adbd106f488b3 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 5 Aug 2013 19:00:09 +0200 Subject: [PATCH] fixing tests for enhanced coordinate preceision --- features/investigate/weird.feature | 6 +++--- features/testbot/basic.feature | 30 +++++++++++++++--------------- features/testbot/duration.feature | 8 ++++---- features/testbot/opposite.feature | 10 +++++----- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/features/investigate/weird.feature b/features/investigate/weird.feature index f84a07592..932526d59 100644 --- a/features/investigate/weird.feature +++ b/features/investigate/weird.feature @@ -1,9 +1,9 @@ @routing @weird Feature: Weird routings discovered - + Background: Given the profile "testbot" - + Scenario: Routing on a oneway roundabout Given the node map | | d | c | | @@ -36,7 +36,7 @@ Feature: Weird routings discovered | c | b | cd,de,ef,fg,gh,ha,ab | | d | c | de,ef,fg,gh,ha,ab,bc | | e | d | ef,fg,gh,ha,ab,bc,cd | - | f | e | fg,gh,ha,ab,bc,cd,de | + | f | e | | | g | f | gh,ha,ab,bc,cd,de,ef | | h | g | ha,ab,bc,cd,de,ef,fg | | a | h | ab,bc,cd,de,ef,fg,gh | \ No newline at end of file diff --git a/features/testbot/basic.feature b/features/testbot/basic.feature index aabdcaa00..ff2041a6e 100644 --- a/features/testbot/basic.feature +++ b/features/testbot/basic.feature @@ -1,27 +1,27 @@ @routing @basic Feature: Basic Routing - + Background: Given the profile "testbot" - + @smallest Scenario: A single way with two nodes Given the node map | a | b | - + And the ways | nodes | | ab | - + When I route I should get | from | to | route | | a | b | ab | | b | a | ab | - + Scenario: Routing in between two nodes of way Given the node map | a | b | 1 | 2 | c | d | - + And the ways | nodes | | abcd | @@ -57,12 +57,12 @@ Feature: Basic Routing Scenario: Two ways connected in a straight line Given the node map | a | b | c | - + And the ways | nodes | | ab | | bc | - + When I route I should get | from | to | route | | a | c | ab,bc | @@ -71,17 +71,17 @@ Feature: Basic Routing | b | a | ab | | b | c | bc | | c | b | bc | - + Scenario: 2 unconnected parallel ways Given the node map | a | b | c | | d | e | f | - + And the ways | nodes | | abc | | def | - + When I route I should get | from | to | route | | a | b | abc | @@ -122,7 +122,7 @@ Feature: Basic Routing | ab | | bc | | ca | - + When I route I should get | from | to | route | | a | b | ab | @@ -154,7 +154,7 @@ Feature: Basic Routing | cv | | vw | | wc | - + When I route I should get | from | to | route | | a | b | ab | @@ -183,7 +183,7 @@ Feature: Basic Routing | c | a | abc | | c | e | cde | | e | c | cde | - + Scenario: Grid city center Given the node map | a | b | c | d | @@ -266,7 +266,7 @@ Feature: Basic Routing | c | b | cd,de,ef,fg,gh,ha,ab | | d | c | de,ef,fg,gh,ha,ab,bc | | e | d | ef,fg,gh,ha,ab,bc,cd | - | f | e | fg,gh,ha,ab,bc,cd,de | + | f | e | | | g | f | gh,ha,ab,bc,cd,de,ef | | h | g | ha,ab,bc,cd,de,ef,fg | | a | h | ab,bc,cd,de,ef,fg,gh | diff --git a/features/testbot/duration.feature b/features/testbot/duration.feature index ab6571ce5..e653ae9cf 100644 --- a/features/testbot/duration.feature +++ b/features/testbot/duration.feature @@ -3,13 +3,13 @@ Feature: Durations Background: Given the profile "testbot" - + Scenario: Duration of ways Given the node map | a | b | | | | f | | | | | e | | | | | c | | | d | | - + And the ways | nodes | highway | duration | | ab | primary | 0:01 | @@ -23,9 +23,9 @@ Feature: Durations | a | b | ab | 100m +-1 | 60s +-1 | | b | c | bc | 200m +-1 | 600s +-1 | | c | d | cd | 300m +-1 | 3600s +-1 | - | d | e | de | 144m +-2 | 36000s +-1 | + | d | e | de | 141m +-2 | 36000s +-1 | | e | f | ef | 224m +-2 | 3723s +-1 | - + @todo Scenario: Partial duration of ways Given the node map diff --git a/features/testbot/opposite.feature b/features/testbot/opposite.feature index c242c97b1..ee34b786f 100644 --- a/features/testbot/opposite.feature +++ b/features/testbot/opposite.feature @@ -1,18 +1,18 @@ @routing @testbot @opposite Feature: Separate settings for forward/backward direction - + Background: Given the profile "testbot" - + Scenario: Testbot - Going against the flow Given the node map | a | b | c | d | - + And the ways | nodes | highway | | abcd | river | - + When I route I should get | from | to | route | distance | time | - | a | d | abcd | 300 +- 1m | 30s | + | a | d | abcd | 300 +- 1m | 31s | | d | a | abcd | 300 +- 1m | 68s | \ No newline at end of file