From 5f7065848eec72ecbb1b6ca87219ac37641bafef Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Thu, 27 Mar 2014 21:46:53 +0100 Subject: [PATCH] clean cucumber comments, fixes 'file to long' problem with latest version of cucumber --- features/bicycle/access.feature | 2 +- features/bicycle/access_node.feature | 2 +- features/bicycle/cycleway.feature | 2 +- features/bicycle/oneway.feature | 4 ++-- features/bicycle/restrictions.feature | 4 ++-- features/bicycle/stop_area.feature | 4 ++-- features/bicycle/train.feature | 2 +- features/bicycle/way.feature | 4 ++-- features/car/access.feature | 2 +- features/car/oneway.feature | 2 +- features/car/restrictions.feature | 4 ++-- features/foot/access.feature | 2 +- features/foot/access_node.feature | 2 +- features/foot/oneway.feature | 2 +- features/foot/restrictions.feature | 2 +- features/foot/roundabout.feature | 4 ++-- features/options/files.feature | 12 ++++++------ features/testbot/bad.feature | 4 ++-- features/testbot/bearing.feature | 8 ++++---- features/testbot/example.feature | 1 - features/testbot/impedance.feature | 11 +++++------ features/testbot/penalty.feature | 2 +- features/testbot/projection.feature | 12 ++++++------ features/testbot/routes.feature | 2 +- features/testbot/time.feature | 8 ++++---- features/testbot/turns.feature | 2 +- 26 files changed, 52 insertions(+), 54 deletions(-) diff --git a/features/bicycle/access.feature b/features/bicycle/access.feature index 319d137d0..2087327ca 100644 --- a/features/bicycle/access.feature +++ b/features/bicycle/access.feature @@ -1,6 +1,6 @@ @routing @bicycle @access Feature: Bike - Access tags on ways -Reference: http://wiki.openstreetmap.org/wiki/Key:access +# Reference: http://wiki.openstreetmap.org/wiki/Key:access Background: Given the profile "bicycle" diff --git a/features/bicycle/access_node.feature b/features/bicycle/access_node.feature index a926896e9..5a6f2b5f9 100644 --- a/features/bicycle/access_node.feature +++ b/features/bicycle/access_node.feature @@ -1,6 +1,6 @@ @routing @bicycle @access Feature: Bike - Access tags on nodes -Reference: http://wiki.openstreetmap.org/wiki/Key:access +# Reference: http://wiki.openstreetmap.org/wiki/Key:access Background: Given the profile "bicycle" diff --git a/features/bicycle/cycleway.feature b/features/bicycle/cycleway.feature index 5da976e1d..643fdcea2 100644 --- a/features/bicycle/cycleway.feature +++ b/features/bicycle/cycleway.feature @@ -1,6 +1,6 @@ @routing @bicycle @cycleway Feature: Bike - Cycle tracks/lanes -Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway +# Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway Background: Given the profile "bicycle" diff --git a/features/bicycle/oneway.feature b/features/bicycle/oneway.feature index e2d609a31..4dd9e1fa7 100644 --- a/features/bicycle/oneway.feature +++ b/features/bicycle/oneway.feature @@ -1,7 +1,7 @@ @routing @bicycle @oneway Feature: Bike - Oneway streets -Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing -Usually we can push bikes against oneways, but we use foot=no to prevent this in these tests +# Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing +# Usually we can push bikes against oneways, but we use foot=no to prevent this in these tests Background: Given the profile "bicycle" diff --git a/features/bicycle/restrictions.feature b/features/bicycle/restrictions.feature index 081d72eac..6218d812b 100644 --- a/features/bicycle/restrictions.feature +++ b/features/bicycle/restrictions.feature @@ -1,7 +1,7 @@ @routing @bicycle @restrictions Feature: Bike - Turn restrictions - Ignore turn restrictions on bicycle, since you always become a temporary pedestrian. - Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. +# Ignore turn restrictions on bicycle, since you always become a temporary pedestrian. +# Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. Background: Given the profile "bicycle" diff --git a/features/bicycle/stop_area.feature b/features/bicycle/stop_area.feature index a51b951a1..5f6c3bc26 100644 --- a/features/bicycle/stop_area.feature +++ b/features/bicycle/stop_area.feature @@ -1,7 +1,7 @@ @routing @bicycle @stop_area @todo Feature: Bike - Stop areas for public transport -Platforms and railway/bus lines are connected using a relation rather that a way, as specified in: -http://wiki.openstreetmap.org/wiki/Tag:public_transport%3Dstop_area +# Platforms and railway/bus lines are connected using a relation rather that a way, as specified in: +# http://wiki.openstreetmap.org/wiki/Tag:public_transport%3Dstop_area Background: Given the profile "bicycle" diff --git a/features/bicycle/train.feature b/features/bicycle/train.feature index d9b43a3bf..aafa2030b 100644 --- a/features/bicycle/train.feature +++ b/features/bicycle/train.feature @@ -1,6 +1,6 @@ @routing @bicycle @train Feature: Bike - Handle ferry routes -Bringing bikes on trains and subways +# Bringing bikes on trains and subways Background: Given the profile "bicycle" diff --git a/features/bicycle/way.feature b/features/bicycle/way.feature index 07eea546b..b9beb5f0f 100644 --- a/features/bicycle/way.feature +++ b/features/bicycle/way.feature @@ -5,8 +5,8 @@ Feature: Bike - Accessability of different way types Given the profile "bicycle" Scenario: Bike - Routability of way types - Bikes are allowed on footways etc because you can pull your bike at a lower speed. - Pier is not allowed, since it's tagged using man_made=pier. + # Bikes are allowed on footways etc because you can pull your bike at a lower speed. + # Pier is not allowed, since it's tagged using man_made=pier. Then routability should be | highway | bothw | diff --git a/features/car/access.feature b/features/car/access.feature index 758e7939d..37dfed4c6 100644 --- a/features/car/access.feature +++ b/features/car/access.feature @@ -1,6 +1,6 @@ @routing @car @access Feature: Car - Restricted access -Reference: http://wiki.openstreetmap.org/wiki/Key:access +# Reference: http://wiki.openstreetmap.org/wiki/Key:access Background: Given the profile "car" diff --git a/features/car/oneway.feature b/features/car/oneway.feature index 9d209fd20..b47c3c6fd 100644 --- a/features/car/oneway.feature +++ b/features/car/oneway.feature @@ -1,6 +1,6 @@ @routing @car @oneway Feature: Car - Oneway streets -Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing +# Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing Background: Given the profile "car" diff --git a/features/car/restrictions.feature b/features/car/restrictions.feature index b3170093b..f808c5d91 100644 --- a/features/car/restrictions.feature +++ b/features/car/restrictions.feature @@ -1,7 +1,7 @@ @routing @car @restrictions Feature: Car - Turn restrictions - Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction - Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. +# Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction +# Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes. Background: Use car routing Given the profile "car" diff --git a/features/foot/access.feature b/features/foot/access.feature index b870ae392..4d81d0e45 100644 --- a/features/foot/access.feature +++ b/features/foot/access.feature @@ -1,6 +1,6 @@ @routing @foot @access Feature: Foot - Access tags on ways -Reference: http://wiki.openstreetmap.org/wiki/Key:access +# Reference: http://wiki.openstreetmap.org/wiki/Key:access Background: Given the profile "foot" diff --git a/features/foot/access_node.feature b/features/foot/access_node.feature index 477f8b4a8..5a4a1314e 100644 --- a/features/foot/access_node.feature +++ b/features/foot/access_node.feature @@ -1,6 +1,6 @@ @routing @foot @access Feature: Foot - Access tags on nodes -Reference: http://wiki.openstreetmap.org/wiki/Key:access +# Reference: http://wiki.openstreetmap.org/wiki/Key:access Background: Given the profile "foot" diff --git a/features/foot/oneway.feature b/features/foot/oneway.feature index 0a9498a4e..77562e5e2 100644 --- a/features/foot/oneway.feature +++ b/features/foot/oneway.feature @@ -1,6 +1,6 @@ @routing @foot @oneway Feature: Foot - Oneway streets -Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing +# Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing Background: Given the profile "foot" diff --git a/features/foot/restrictions.feature b/features/foot/restrictions.feature index d16965b05..8d6a0297f 100644 --- a/features/foot/restrictions.feature +++ b/features/foot/restrictions.feature @@ -1,6 +1,6 @@ @routing @foot @restrictions Feature: Foot - Turn restrictions - Ignore turn restrictions on foot. +# Ignore turn restrictions on foot. Background: Given the profile "foot" diff --git a/features/foot/roundabout.feature b/features/foot/roundabout.feature index cfe65d476..5aa9860fb 100644 --- a/features/foot/roundabout.feature +++ b/features/foot/roundabout.feature @@ -6,8 +6,8 @@ Feature: Roundabout Instructions @todo Scenario: Foot - Roundabout instructions - You can walk in both directions on a roundabout, bu the normal roundabout instructions don't - make sense when you're going the opposite way around the roundabout. + # You can walk in both directions on a roundabout, bu the normal roundabout instructions don't + # make sense when you're going the opposite way around the roundabout. Given the node map | | | v | | | diff --git a/features/options/files.feature b/features/options/files.feature index da55366b3..41252238e 100644 --- a/features/options/files.feature +++ b/features/options/files.feature @@ -1,11 +1,11 @@ @routing @options @files Feature: Command line options: files - Normally when launching osrm-routed, it will keep running as a server until it's shut down. - For testing program options, the --trial option is used, which causes osrm-routed to quit - immediately after initialization. This makes testing easier and faster. - - The {base} part of the options to osrm-routed will be expanded to the actual base path of - the preprocessed file. +# Normally when launching osrm-routed, it will keep running as a server until it's shut down. +# For testing program options, the --trial option is used, which causes osrm-routed to quit +# immediately after initialization. This makes testing easier and faster. +# +# The {base} part of the options to osrm-routed will be expanded to the actual base path of +# the preprocessed file. Background: Given the profile "testbot" diff --git a/features/testbot/bad.feature b/features/testbot/bad.feature index e3a2ded9f..98f5dbef2 100644 --- a/features/testbot/bad.feature +++ b/features/testbot/bad.feature @@ -45,8 +45,8 @@ Feature: Handle bad data in a graceful manner @poles Scenario: Routing close to the north/south pole - Mercator is undefined close to the poles. - All nodes and request with latitude to close to either of the poles should therefore be ignored. + # Mercator is undefined close to the poles. + # All nodes and request with latitude to close to either of the poles should therefore be ignored. Given the node locations | node | lat | lon | diff --git a/features/testbot/bearing.feature b/features/testbot/bearing.feature index bd282e7bd..c306af92d 100644 --- a/features/testbot/bearing.feature +++ b/features/testbot/bearing.feature @@ -141,8 +141,8 @@ Feature: Compass bearing | f | e | abcdef | W | 270 | Scenario: Bearings at high latitudes - The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, - to form square with sides of 1 km. + # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, + # to form square with sides of 1 km. Given the node locations | node | lat | lon | @@ -176,8 +176,8 @@ Feature: Compass bearing | d | b | bd | NW | 315 | Scenario: Bearings at high negative latitudes - The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, - to form square with sides of 1 km. + # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html, + # to form square with sides of 1 km. Given the node locations | node | lat | lon | diff --git a/features/testbot/example.feature b/features/testbot/example.feature index d0c44ac32..c2aa1e926 100644 --- a/features/testbot/example.feature +++ b/features/testbot/example.feature @@ -1,6 +1,5 @@ @routing @testbot @example Feature: Testbot - Walkthrough - # A complete walk-through of how this data is processed can be found at: # https://github.com/DennisOSRM/Project-OSRM/wiki/Processing-Flow diff --git a/features/testbot/impedance.feature b/features/testbot/impedance.feature index 72a814c2c..cab9ec3da 100644 --- a/features/testbot/impedance.feature +++ b/features/testbot/impedance.feature @@ -1,9 +1,8 @@ @routing @testbot @impedance @todo Feature: Setting impedance and speed separately -These tests assume that the speed is not factored into the impedance by OSRM internally. -Instead the speed can optionally be factored into the weiht in the lua profile. - -Note: With the default grid size of 100m, the diagonals has a length if 141.42m +# These tests assume that the speed is not factored into the impedance by OSRM internally. +# Instead the speed can optionally be factored into the weiht in the lua profile. +# Note: With the default grid size of 100m, the diagonals has a length if 141.42m Background: Given the profile "testbot" @@ -55,8 +54,8 @@ Note: With the default grid size of 100m, the diagonals has a length if 141.42m | c | b | btc | Scenario: Use both impedance and speed (multiplied) when picking route - OSRM should not factor speed into impedance internally. However, the profile can choose to do so, - and this test expect the testbot profile to do it. + # OSRM should not factor speed into impedance internally. However, the profile can choose to do so, + # and this test expect the testbot profile to do it. Given the node map | | s | | t | | | a | | b | | c | diff --git a/features/testbot/penalty.feature b/features/testbot/penalty.feature index dcf280430..85f43c7ed 100644 --- a/features/testbot/penalty.feature +++ b/features/testbot/penalty.feature @@ -1,6 +1,6 @@ @routing @penalty @signal Feature: Penalties -Testbot uses a signal penalty of 7s. +# Testbot uses a signal penalty of 7s. Background: Given the profile "testbot" diff --git a/features/testbot/projection.feature b/features/testbot/projection.feature index 20898f17f..5b35f47bf 100644 --- a/features/testbot/projection.feature +++ b/features/testbot/projection.feature @@ -1,13 +1,13 @@ @routing @projection Feature: Projection to nearest point on road -Waypoints are projected perpendiculary onto the closest road +# Waypoints are projected perpendiculary onto the closest road Background: - The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html - The nodes are placed as follows, with ab, bc and bd all being 1 km in length each: - | | | c | - | | b | | (this is sketch only, real data is in the table below) - | a | | d | + # The coordinas below was calculated using http://www.movable-type.co.uk/scripts/latlong.html + # The nodes are placed as follows, with ab, bc and bd all being 1 km in length each: + # | | | c | + # | | b | | (this is sketch only, real data is in the table below) + # | a | | d | Given the profile "testbot" Given the node locations diff --git a/features/testbot/routes.feature b/features/testbot/routes.feature index 9d3e5e9f9..bc1d75eb4 100644 --- a/features/testbot/routes.feature +++ b/features/testbot/routes.feature @@ -5,7 +5,7 @@ Feature: OSM Route Relation Given the profile "testbot" Scenario: Prioritize ways that are part of route relations - This scenario assumes that the testbot uses an impedance of 0.5 for ways that are part of 'testbot' routes. + # This scenario assumes that the testbot uses an impedance of 0.5 for ways that are part of 'testbot' routes. Given the node map | s | | | t | | | | diff --git a/features/testbot/time.feature b/features/testbot/time.feature index 7d05607c9..53901ba0d 100644 --- a/features/testbot/time.feature +++ b/features/testbot/time.feature @@ -1,9 +1,9 @@ @routing @time Feature: Estimation of travel time -Testbot speeds: -Primary road: 36km/h = 36000m/3600s = 100m/10s -Secondary road: 18km/h = 18000m/3600s = 100m/20s -Tertiary road: 12km/h = 12000m/3600s = 100m/30s +# Testbot speeds: +# Primary road: 36km/h = 36000m/3600s = 100m/10s +# Secondary road: 18km/h = 18000m/3600s = 100m/20s +# Tertiary road: 12km/h = 12000m/3600s = 100m/30s Background: Use specific speeds Given the profile "testbot" diff --git a/features/testbot/turns.feature b/features/testbot/turns.feature index 6f922a615..87bf21f55 100644 --- a/features/testbot/turns.feature +++ b/features/testbot/turns.feature @@ -98,7 +98,7 @@ Feature: Turn directions/codes | g | e | xg,xe | head,sharp_right,destination | Scenario: Turn instructions at high latitude - https://github.com/DennisOSRM/Project-OSRM/issues/532 + # https://github.com/DennisOSRM/Project-OSRM/issues/532 Given the node locations | node | lat | lon | | a | 55.68740 | 12.52430 |