From 97f04eae91ab3a8b568022617a79e57d032a0775 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Mon, 1 Oct 2012 16:11:15 +0200 Subject: [PATCH] rewrite tests for access=destination --- features/bicycle/destination.feature | 41 +++++++++++++++----------- features/car/destination.feature | 43 ++++++++++++++++------------ 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/features/bicycle/destination.feature b/features/bicycle/destination.feature index af3f67af0..aaeb0e8db 100644 --- a/features/bicycle/destination.feature +++ b/features/bicycle/destination.feature @@ -6,54 +6,60 @@ Feature: Bike - Destination only, no passing through Scenario: Bike - Destination only street Given the node map - | a | | | | | + | a | | | | e | | | b | c | d | | - | | | | | e | + | | | | | | + | x | | | | y | And the ways | nodes | access | | ab | | | bcd | destination | | de | | + | axye | | When I route I should get | from | to | route | | a | b | ab | | a | c | ab,bcd | | a | d | ab,bcd | - | a | e | ab,bcd,de | + | a | e | axye | | e | d | de | | e | c | de,bcd | | e | b | de,bcd | - | e | a | de,bcd,ab | - | b | c | bcd | - | b | d | bcd | - | d | c | bcd | - | d | b | bcd | + | e | a | axye | - Scenario: Bike - Series of destination only streets + Scenario: Bike - Destination only street Given the node map - | a | | c | | e | - | | b | | d | | + | a | | | | e | + | | b | c | d | | + | | | | | | + | x | | | | y | And the ways | nodes | access | | ab | | | bc | destination | | cd | destination | - | de | destination | + | de | | + | axye | | When I route I should get - | from | to | route | - | a | b | ab | - | a | c | ab | - | a | d | ab | - | a | e | ab | + | from | to | route | + | a | b | ab | + | a | c | ab,bc | + | a | d | ab,bc,cd | + | a | e | axye | + | e | d | de | + | e | c | de,dc | + | e | b | de,dc,bc | + | e | a | axye | Scenario: Bike - Routing inside a destination only area Given the node map | a | | c | | e | | | b | | d | | + | x | | | | y | And the ways | nodes | access | @@ -61,6 +67,7 @@ Feature: Bike - Destination only, no passing through | bc | destination | | cd | destination | | de | destination | + | axye | | When I route I should get | from | to | route | diff --git a/features/car/destination.feature b/features/car/destination.feature index 961bbc176..d840bf830 100644 --- a/features/car/destination.feature +++ b/features/car/destination.feature @@ -1,4 +1,4 @@ -@routing @car @destination +@routing @bicycle @destination Feature: Car - Destination only, no passing through Background: @@ -6,54 +6,60 @@ Feature: Car - Destination only, no passing through Scenario: Car - Destination only street Given the node map - | a | | | | | + | a | | | | e | | | b | c | d | | - | | | | | e | + | | | | | | + | x | | | | y | And the ways | nodes | access | | ab | | | bcd | destination | | de | | + | axye | | When I route I should get | from | to | route | | a | b | ab | | a | c | ab,bcd | | a | d | ab,bcd | - | a | e | ab,bcd,de | + | a | e | axye | | e | d | de | | e | c | de,bcd | | e | b | de,bcd | - | e | a | de,bcd,ab | - | b | c | bcd | - | b | d | bcd | - | d | c | bcd | - | d | b | bcd | + | e | a | axye | - Scenario: Car - Series of destination only streets + Scenario: Car - Destination only street Given the node map - | a | | c | | e | - | | b | | d | | + | a | | | | e | + | | b | c | d | | + | | | | | | + | x | | | | y | And the ways | nodes | access | | ab | | | bc | destination | | cd | destination | - | de | destination | + | de | | + | axye | | When I route I should get - | from | to | route | - | a | b | ab | - | a | c | ab | - | a | d | ab | - | a | e | ab | + | from | to | route | + | a | b | ab | + | a | c | ab,bc | + | a | d | ab,bc,cd | + | a | e | axye | + | e | d | de | + | e | c | de,dc | + | e | b | de,dc,bc | + | e | a | axye | Scenario: Car - Routing inside a destination only area Given the node map | a | | c | | e | | | b | | d | | + | x | | | | y | And the ways | nodes | access | @@ -61,6 +67,7 @@ Feature: Car - Destination only, no passing through | bc | destination | | cd | destination | | de | destination | + | axye | | When I route I should get | from | to | route |