cucumber cleanup, removed unused code

Project-OSRM · Dec 16, 2012 · ec56478 · ec56478
1 parent 7e9614b
commit ec56478
Show file tree

Hide file tree

Showing 51 changed files with 187 additions and 349 deletions.
diff --git a/features/bicycle/access.feature b/features/bicycle/access.feature
@@ -3,7 +3,7 @@ Feature: Bike - Restricted access
 Reference: http://wiki.openstreetmap.org/wiki/Key:access
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Access tag hierachy on ways
 		Then routability should be

diff --git a/features/bicycle/area.feature b/features/bicycle/area.feature
@@ -2,7 +2,7 @@
 Feature: Bike - Squares and other areas
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	@square	
 	Scenario: Bike - Route along edge of a squares

diff --git a/features/bicycle/barrier.feature b/features/bicycle/barrier.feature
@@ -2,7 +2,7 @@
 Feature: Barriers
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Barriers 
 		Then routability should be

diff --git a/features/bicycle/cycleway.feature b/features/bicycle/cycleway.feature
@@ -3,7 +3,7 @@ Feature: Bike - Cycle tracks/lanes
 Reference: http://wiki.openstreetmap.org/wiki/Key:cycleway
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Cycle tracks/lanes should enable biking		
 	 	Then routability should be

diff --git a/features/bicycle/destination.feature b/features/bicycle/destination.feature
@@ -2,7 +2,7 @@
 Feature: Bike - Destination only, no passing through
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Destination only street
 		Given the node map

diff --git a/features/bicycle/ferry.feature b/features/bicycle/ferry.feature
@@ -2,7 +2,7 @@
 Feature: Bike - Handle ferry routes
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Ferry route
 		Given the node map

diff --git a/features/bicycle/maxspeed.feature b/features/bicycle/maxspeed.feature
@@ -2,7 +2,7 @@
 Feature: Bike - Max speed restrictions
 
 	Background: Use specific speeds
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Respect maxspeeds when lower that way type speed
 		Given the node map

diff --git a/features/bicycle/names.feature b/features/bicycle/names.feature
@@ -2,7 +2,7 @@
 Feature: Bike - Street names in instructions
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - A named street
 		Given the node map

diff --git a/features/bicycle/oneway.feature b/features/bicycle/oneway.feature
@@ -3,7 +3,7 @@ Feature: Bike - Oneway streets
 Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Simple oneway
 		Then routability should be

diff --git a/features/bicycle/restrictions.feature b/features/bicycle/restrictions.feature
@@ -4,7 +4,7 @@ Feature: Bike - Turn restrictions
 	Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
 
 	Background: Use car routing
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	@no_turning
 	Scenario: Bike - No left turn

diff --git a/features/bicycle/stop_area.feature b/features/bicycle/stop_area.feature
@@ -4,7 +4,7 @@ Platforms and railway/bus lines are connected using a relation rather that a way
 http://wiki.openstreetmap.org/wiki/Tag:public_transport%3Dstop_area
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Platforms tagged using public_transport
 	 	Then routability should be

diff --git a/features/bicycle/train.feature b/features/bicycle/train.feature
@@ -3,7 +3,7 @@ Feature: Bike - Handle ferry routes
 Bringing bikes on trains and subways
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Bringing bikes on trains
 	 	Then routability should be

diff --git a/features/bicycle/way.feature b/features/bicycle/way.feature
@@ -2,11 +2,11 @@
 Feature: Bike - Accessability of different way types
 
 	Background:
-		Given the speedprofile "bicycle"
+		Given the profile "bicycle"
 
 	Scenario: Bike - Basic access
 	Bikes are allowed on footways etc because you can pull your bike at a lower speed.
-	 	Given the speedprofile "bicycle"
+	 	Given the profile "bicycle"
 	 	Then routability should be
 		 | highway        | forw |
 		 | (nil)          |      |

diff --git a/features/car/access.feature b/features/car/access.feature
@@ -3,7 +3,7 @@ Feature: Car - Restricted access
 Reference: http://wiki.openstreetmap.org/wiki/Key:access
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Access tag hierachy	on ways	
 		Then routability should be

diff --git a/features/car/barrier.feature b/features/car/barrier.feature
@@ -2,7 +2,7 @@
 Feature: Car - Barriers
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Barriers 
 		Then routability should be

diff --git a/features/car/destination.feature b/features/car/destination.feature
@@ -2,7 +2,7 @@
 Feature: Car - Destination only, no passing through
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Destination only street
 		Given the node map

diff --git a/features/car/ferry.feature b/features/car/ferry.feature
@@ -2,7 +2,7 @@
 Feature: Car - Handle ferry routes
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Use a ferry route
 		Given the node map

diff --git a/features/car/maxspeed.feature b/features/car/maxspeed.feature
@@ -2,7 +2,7 @@
 Feature: Car - Max speed restrictions
 
 	Background: Use specific speeds
-		Given the speedprofile "car"
+		Given the profile "car"
 		Given a grid size of 1000 meters
 
 	Scenario: Car - Respect maxspeeds when lower that way type speed

diff --git a/features/car/names.feature b/features/car/names.feature
@@ -2,7 +2,7 @@
 Feature: Car - Street names in instructions
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - A named street
 		Given the node map

diff --git a/features/car/oneway.feature b/features/car/oneway.feature
@@ -3,7 +3,7 @@ Feature: Car - Oneway streets
 Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Simple oneway
 		Then routability should be

diff --git a/features/car/restrictions.feature b/features/car/restrictions.feature
@@ -4,7 +4,7 @@ Feature: Car - Turn restrictions
 	Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
 
 	Background: Use car routing
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	@no_turning
 	Scenario: Car - No left turn

diff --git a/features/car/way.feature b/features/car/way.feature
@@ -2,7 +2,7 @@
 Feature: Car - Accessability of different way types
 
 	Background:
-		Given the speedprofile "car"
+		Given the profile "car"
 
 	Scenario: Car - Basic access
 	 	Then routability should be

diff --git a/features/foot/oneway.feature b/features/foot/oneway.feature
@@ -3,7 +3,7 @@ Feature: Foot - Oneway streets
 Handle oneways streets, as defined at http://wiki.openstreetmap.org/wiki/OSM_tags_for_routing
 
 	Background:
-		Given the speedprofile "foot"
+		Given the profile "foot"
 
 	Scenario: Foot - Walking should not be affected by oneways
 	 	Then routability should be

diff --git a/features/foot/way.feature b/features/foot/way.feature
@@ -2,7 +2,7 @@
 Feature: Foot - Accessability of different way types
 
 	Background:
-		Given the speedprofile "foot"
+		Given the profile "foot"
 
 	Scenario: Foot - Basic access
 	 	Then routability should be

diff --git a/features/investigate/weird.feature b/features/investigate/weird.feature
@@ -2,7 +2,7 @@
 Feature: Weird routings discovered
 
 	Background:
-		Given the speedprofile "testbot"
+		Given the profile "testbot"
 
 	Scenario: Routing on a oneway roundabout
 		Given the node map

diff --git a/features/step_definitions/data.rb b/features/step_definitions/data.rb
@@ -1,5 +1,5 @@
-Given /^the speedprofile "([^"]*)"$/ do |profile|
+Given /^the profile "([^"]*)"$/ do |profile|
-  read_speedprofile profile
+  set_profile profile
 end
 
 Given /^a grid size of (\d+) meters$/ do |meters|

diff --git a/features/step_definitions/errors.rb b/features/step_definitions/errors.rb
diff --git a/features/step_definitions/processing.rb b/features/step_definitions/processing.rb
diff --git a/features/step_definitions/requests.rb b/features/step_definitions/requests.rb
@@ -21,3 +21,25 @@
   @json['transactionId'].class.should == String
 end
 
+Then /^response should be a well-formed route$/ do
+  step "response should be well-formed"
+  @json['status_message'].class.should == String
+  @json['route_summary'].class.should == Hash
+  @json['route_geometry'].class.should == String
+  @json['route_instructions'].class.should == Array
+  @json['via_points'].class.should == Array
+end
+
+When /^I preprocess data$/ do
+  begin
+    reprocess
+  rescue OSRMError => e
+    @process_error = e
+  end
+end
+
+Then /^preparing should return code (\d+)$/ do |code|
+  @process_error.class.should == OSRMError
+  @process_error.process.should == 'osrm-prepare'
+  @process_error.code.to_i.should == code.to_i
+end
diff --git a/features/step_definitions/routability.rb b/features/step_definitions/routability.rb
@@ -0,0 +1,40 @@
+Then /^routability should be$/ do |table|
+  build_ways_from_table table
+  reprocess
+  actual = []
+  if table.headers&["forw","backw","bothw"] == []
+    raise "*** routability tabel must contain either 'forw', 'backw' or 'bothw' column"
+  end
+  OSRMLauncher.new do
+    table.hashes.each_with_index do |row,i|
+      got = row.dup
+      attempts = []
+      ['forw','backw','bothw'].each do |direction|
+        if table.headers.include? direction
+          if direction == 'forw' || direction == 'bothw'
+            response = request_route("#{ORIGIN[1]},#{ORIGIN[0]+(1+WAY_SPACING*i)*@zoom}","#{ORIGIN[1]},#{ORIGIN[0]+(3+WAY_SPACING*i)*@zoom}")
+          elsif direction == 'backw' || direction == 'bothw'
+            response = request_route("#{ORIGIN[1]},#{ORIGIN[0]+(3+WAY_SPACING*i)*@zoom}","#{ORIGIN[1]},#{ORIGIN[0]+(1+WAY_SPACING*i)*@zoom}")
+          end
+          got[direction] = route_status response
+          json = JSON.parse(response.body)
+          if got[direction].empty? == false
+            route = way_list json['route_instructions']
+            if route != "w#{i}"
+              got[direction] = "testing w#{i}, but got #{route}!?"
+            elsif row[direction] =~ /\d+s/
+              time = json['route_summary']['total_time']
+              got[direction] = "#{time}s"
+            end
+          end
+          if got[direction] != row[direction]
+            attempts << { :attempt => direction, :query => @query, :response => response }
+          end
+        end
+      end
+      log_fail row,got,attempts if got != row
+      actual << got
+    end
+  end
+  table.routing_diff! actual
+end