From e13b35e0cbf6b1c0ec429ed61ee6b9d8c4de176c Mon Sep 17 00:00:00 2001 From: Shaun McDonald Date: Tue, 21 Oct 2008 14:28:52 +0000 Subject: [PATCH 1/1] making it clearer when a test case fails, as to which test case it is that is failing. Adding some more bboxes for testing. --- lib/map_boundary.rb | 1 + test/functional/api_controller_test.rb | 30 +++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/map_boundary.rb b/lib/map_boundary.rb index 9b39c9342..da7e44b32 100644 --- a/lib/map_boundary.rb +++ b/lib/map_boundary.rb @@ -17,6 +17,7 @@ module MapBoundary raise("The minimum latitude must be less than the maximum latitude, but it wasn't") end unless min_lon >= -180 && min_lat >= -90 && max_lon <= 180 && max_lat <= 90 + # Due to sanitize_boundaries, it is highly unlikely we'll actually get here raise("The latitudes must be between -90 and 90, and longitudes between -180 and 180") end diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index 4cd20d3dd..f51bdc7b6 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -11,14 +11,14 @@ class ApiControllerTest < Test::Unit::TestCase @controller = ApiController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @badbigbbox = %w{ -0.1,-0.1,1.1,1.1 10,10,11,11 } + @badbigbbox = %w{ -0.1,-0.1,1.1,1.1 10,10,11,11 } @badmalformedbbox = %w{ -0.1 hello S0.1,W0.1,N0.1,E0.1 10N2W10.1N2.1W } - @badlatmixedbbox = %w{ 0,0.1,0.1,0 } - @badlonmixedbbox = %w{} - @badlatlonoutboundsbbox = %w{ -190.2,-190.2,-190.1,-190.1 -190.1,89.9,-190,90 } - @goodbbox = %w{ -0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0 - -0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N } + @badlatmixedbbox = %w{ 0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33 } + @badlonmixedbbox = %w{ 80,-0.1,70,0.1 54.34,0.24,54.33,0.25 } + @badlatlonoutboundsbbox = %w{ 191,-0.1,193,0.1 -190.1,89.9,-190,90 } + @goodbbox = %w{ -0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0 + -0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N } end def basic_authorization(user, pass) @@ -58,7 +58,7 @@ class ApiControllerTest < Test::Unit::TestCase ["trackpoints", "map"].each do |tq| get tq assert_response :bad_request - assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body + assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected" end end @@ -66,11 +66,11 @@ class ApiControllerTest < Test::Unit::TestCase -10.upto(-1) do |i| get :trackpoints, :page => i, :bbox => "-0.1,-0.1,0.1,0.1" assert_response :bad_request - assert_equal "Page number must be greater than or equal to 0", @response.body + assert_equal "Page number must be greater than or equal to 0", @response.body, "The page number was #{i}" end 0.upto(10) do |i| get :trackpoints, :page => i, :bbox => "-0.1,-0.1,0.1,0.1" - assert_response :success + assert_response :success, "The page number was #{i} and should have been accepted" end end @@ -79,7 +79,7 @@ class ApiControllerTest < Test::Unit::TestCase [ "trackpoints", "map" ].each do |tq| get tq, :bbox => bbox assert_response :bad_request, "The bbox:#{bbox} was expected to be too big" - assert_equal "The maximum bbox size is #{APP_CONFIG['max_request_area']}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body + assert_equal "The maximum bbox size is #{APP_CONFIG['max_request_area']}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}" end end end @@ -89,7 +89,7 @@ class ApiControllerTest < Test::Unit::TestCase [ "trackpoints", "map" ].each do |tq| get tq, :bbox => bbox assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed" - assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body + assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}" end end end @@ -99,7 +99,7 @@ class ApiControllerTest < Test::Unit::TestCase [ "trackpoints", "map" ].each do |tq| get tq, :bbox => bbox assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up" - assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body + assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}" end end end @@ -109,7 +109,7 @@ class ApiControllerTest < Test::Unit::TestCase ["trackpoints", "map"].each do |tq| get tq, :bbox => bbox assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up" - assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body + assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}" end end end @@ -119,8 +119,8 @@ class ApiControllerTest < Test::Unit::TestCase [ "trackpoints", "map" ].each do |tq| get tq, :bbox => bbox #print @request.to_yaml - assert_response :bad_request, "The bbox was expected to be out of range" - assert_equal "The latitudes must be between -90 an 90, and longitudes between -180 and 180", @response.body + assert_response :bad_request, "The bbox #{bbox} was expected to be out of range" + assert_equal "The latitudes must be between -90 an 90, and longitudes between -180 and 180", @response.body, "bbox: #{bbox}" end end end -- 2.43.2