X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f81de2065c1d3fabb0048ec380c9fae0f48a32a..5b33f3f8e31c62bc3e5db1d5b120533c3afdde68:/test/controllers/api_controller_test.rb diff --git a/test/controllers/api_controller_test.rb b/test/controllers/api_controller_test.rb index ba8bdbae6..61763d128 100644 --- a/test/controllers/api_controller_test.rb +++ b/test/controllers/api_controller_test.rb @@ -1,19 +1,17 @@ -require 'test_helper' -require 'api_controller' +require "test_helper" +require "api_controller" class ApiControllerTest < ActionController::TestCase - api_fixtures - def setup super - @badbigbbox = %w{ -0.1,-0.1,1.1,1.1 10,10,11,11 } - @badmalformedbbox = %w{ -0.1 hello - 10N2W10.1N2.1W } - @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 S0.1,W0.1,N0.1,E0.1} + @badbigbbox = %w[-0.1,-0.1,1.1,1.1 10,10,11,11] + @badmalformedbbox = %w[-0.1 hello + 10N2W10.1N2.1W] + @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 S0.1,W0.1,N0.1,E0.1] # That last item in the goodbbox really shouldn't be there, as the API should # reall reject it, however this is to test to see if the api changes. end @@ -26,7 +24,7 @@ class ApiControllerTest < ActionController::TestCase { :controller => "api", :action => "capabilities" } ) assert_recognizes( - { :controller => "api", :action => "capabilities" }, + { :controller => "api", :action => "capabilities" }, { :path => "/api/0.6/capabilities", :method => :get } ) assert_routing( @@ -52,13 +50,18 @@ class ApiControllerTest < ActionController::TestCase # ------------------------------------- def test_map - node = current_nodes(:used_node_1) + node = create(:node, :lat => 7, :lon => 7) + tag = create(:node_tag, :node => node) + way1 = create(:way_node, :node => node).way + way2 = create(:way_node, :node => node).way + relation = create(:relation_member, :member => node).relation + # Need to split the min/max lat/lon out into their own variables here # so that we can test they are returned later. - minlon = node.lon-0.1 - minlat = node.lat-0.1 - maxlon = node.lon+0.1 - maxlat = node.lat+0.1 + minlon = node.lon - 0.1 + minlat = node.lat - 0.1 + maxlon = node.lon + 0.1 + maxlat = node.lat + 0.1 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :map, :bbox => bbox if $VERBOSE @@ -68,37 +71,91 @@ class ApiControllerTest < ActionController::TestCase assert_response :success, "Expected scucess with the map call" assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "bounds[minlon='#{minlon}'][minlat='#{minlat}'][maxlon='#{maxlon}'][maxlat='#{maxlat}']", :count => 1 - assert_select "node[id='#{node.id}'][lat='#{node.lat}'][lon='#{node.lon}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do + assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do # This should really be more generic - assert_select "tag[k='test'][v='yes']" + assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" end - # Should also test for the ways and relation + assert_select "way", :count => 2 + assert_select "way[id='#{way1.id}']", :count => 1 + assert_select "way[id='#{way2.id}']", :count => 1 + assert_select "relation", :count => 1 + assert_select "relation[id='#{relation.id}']", :count => 1 end end - + # This differs from the above test in that we are making the bbox exactly # the same as the node we are looking at def test_map_inclusive - node = current_nodes(:used_node_1) + node = create(:node, :lat => 7, :lon => 7) + tag = create(:node_tag, :node => node) + way1 = create(:way_node, :node => node).way + way2 = create(:way_node, :node => node).way + relation = create(:relation_member, :member => node).relation + bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}" get :map, :bbox => bbox assert_response :success, "The map call should have succeeded" assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1 - assert_select "node[id='#{node.id}'][lat='#{node.lat}'][lon='#{node.lon}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do + assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do # This should really be more generic - assert_select "tag[k='test'][v='yes']" + assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" end - # Should also test for the ways and relation + assert_select "way", :count => 2 + assert_select "way[id='#{way1.id}']", :count => 1 + assert_select "way[id='#{way2.id}']", :count => 1 + assert_select "relation", :count => 1 + assert_select "relation[id='#{relation.id}']", :count => 1 + end + end + + def test_map_complete_way + node = create(:node, :lat => 7, :lon => 7) + # create a couple of nodes well outside of the bbox + node2 = create(:node, :lat => 45, :lon => 45) + node3 = create(:node, :lat => 10, :lon => 10) + way1 = create(:way_node, :node => node).way + create(:way_node, :way => way1, :node => node2, :sequence_id => 2) + way2 = create(:way_node, :node => node).way + create(:way_node, :way => way2, :node => node3, :sequence_id => 2) + relation = create(:relation_member, :member => way1).relation + + bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}" + get :map, :bbox => bbox + assert_response :success, "The map call should have succeeded" + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1 + assert_select "node", :count => 3 + assert_select "node[id='#{node.id}']", :count => 1 + assert_select "node[id='#{node2.id}']", :count => 1 + assert_select "node[id='#{node3.id}']", :count => 1 + assert_select "way", :count => 2 + assert_select "way[id='#{way1.id}']", :count => 1 + assert_select "way[id='#{way2.id}']", :count => 1 + assert_select "relation", :count => 1 + assert_select "relation[id='#{relation.id}']", :count => 1 end end - + + def test_map_empty + get :map, :bbox => "179.998,89.998,179.999.1,89.999" + assert_response :success, "The map call should have succeeded" + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "bounds[minlon='179.998'][minlat='89.998'][maxlon='179.999'][maxlat='89.999']", :count => 1 + assert_select "node", :count => 0 + assert_select "way", :count => 0 + assert_select "relation", :count => 0 + end + end + def test_tracepoints - point = gpx_files(:public_trace_file) - minlon = point.longitude-0.001 - minlat = point.latitude-0.001 - maxlon = point.longitude+0.001 - maxlat = point.latitude+0.001 + point = create(:trace, :visibility => "public", :latitude => 1, :longitude => 1) do |trace| + create(:tracepoint, :trace => trace, :latitude => 1 * GeoRecord::SCALE, :longitude => 1 * GeoRecord::SCALE) + end + minlon = point.longitude - 0.001 + minlat = point.latitude - 0.001 + maxlon = point.longitude + 0.001 + maxlat = point.latitude + 0.001 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success @@ -108,13 +165,16 @@ class ApiControllerTest < ActionController::TestCase end end end - + def test_tracepoints_trackable - point = gpx_files(:trackable_trace_file) - minlon = point.longitude-0.002 - minlat = point.latitude-0.002 - maxlon = point.longitude+0.002 - maxlat = point.latitude+0.002 + point = create(:trace, :visibility => "trackable", :latitude => 51.51, :longitude => -0.14) do |trace| + create(:tracepoint, :trace => trace, :trackid => 1, :latitude => (51.510 * GeoRecord::SCALE).to_i, :longitude => (-0.140 * GeoRecord::SCALE).to_i) + create(:tracepoint, :trace => trace, :trackid => 2, :latitude => (51.511 * GeoRecord::SCALE).to_i, :longitude => (-0.141 * GeoRecord::SCALE).to_i) + end + minlon = point.longitude - 0.002 + minlat = point.latitude - 0.002 + maxlon = point.longitude + 0.002 + maxlat = point.latitude + 0.002 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success @@ -130,13 +190,15 @@ class ApiControllerTest < ActionController::TestCase end end end - + def test_tracepoints_identifiable - point = gpx_files(:identifiable_trace_file) - minlon = point.longitude-0.002 - minlat = point.latitude-0.002 - maxlon = point.longitude+0.002 - maxlat = point.latitude+0.002 + point = create(:trace, :visibility => "identifiable", :latitude => 51.512, :longitude => 0.142) do |trace| + create(:tracepoint, :trace => trace, :latitude => (51.512 * GeoRecord::SCALE).to_i, :longitude => (0.142 * GeoRecord::SCALE).to_i) + end + minlon = point.longitude - 0.002 + minlat = point.latitude - 0.002 + maxlon = point.longitude + 0.002 + maxlat = point.latitude + 0.002 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" get :trackpoints, :bbox => bbox assert_response :success @@ -153,15 +215,15 @@ class ApiControllerTest < ActionController::TestCase end end end - + def test_map_without_bbox - ["trackpoints", "map"].each do |tq| + %w[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, "A bbox param was expected" end end - + def test_traces_page_less_than_0 -10.upto(-1) do |i| get :trackpoints, :page => i, :bbox => "-0.1,-0.1,0.1,0.1" @@ -173,49 +235,49 @@ class ApiControllerTest < ActionController::TestCase assert_response :success, "The page number was #{i} and should have been accepted" end end - + def test_bbox_too_big @badbigbbox.each do |bbox| - [ "trackpoints", "map" ].each do |tq| + %w[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 #{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 - + def test_bbox_malformed @badmalformedbbox.each do |bbox| - [ "trackpoints", "map" ].each do |tq| + %w[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, "bbox: #{bbox}" end end end - + def test_bbox_lon_mixedup @badlonmixedbbox.each do |bbox| - [ "trackpoints", "map" ].each do |tq| + %w[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, "bbox: #{bbox}" end end end - + def test_bbox_lat_mixedup @badlatmixedbbox.each do |bbox| - ["trackpoints", "map"].each do |tq| + %w[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, "bbox: #{bbox}" end end end - + # We can't actually get an out of bounds error, as the bbox is sanitised. - #def test_latlon_outofbounds + # def test_latlon_outofbounds # @badlatlonoutboundsbbox.each do |bbox| # [ "trackpoints", "map" ].each do |tq| # get tq, :bbox => bbox @@ -224,36 +286,61 @@ class ApiControllerTest < ActionController::TestCase # assert_equal "The latitudes must be between -90 an 90, and longitudes between -180 and 180", @response.body, "bbox: #{bbox}" # end # end - #end - - # MySQL and Postgres require that the C based functions are installed for + # end + + # MySQL and Postgres require that the C based functions are installed for # this test to work. More information is available from: # http://wiki.openstreetmap.org/wiki/Rails#Installing_the_quadtile_functions # or by looking at the readme in db/README def test_changes_simple - Timecop.freeze(Time.parse('2010-04-03 10:55:00')) + # create a selection of nodes + (1..5).each do |n| + create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => n, :lon => n) + end + # deleted nodes should also be counted + create(:node, :deleted, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6) + # nodes in the same tile won't change the total + create(:node, :timestamp => Time.utc(2007, 1, 1, 0, 0, 0), :lat => 6, :lon => 6) + # nodes with a different timestamp should be ignored + create(:node, :timestamp => Time.utc(2008, 1, 1, 0, 0, 0), :lat => 7, :lon => 7) + + Timecop.freeze(Time.utc(2010, 4, 3, 10, 55, 0)) + get :changes + assert_response :success + now = Time.now.getutc + hourago = now - 1.hour + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do + assert_select "tile", :count => 0 + end + end + Timecop.return + + Timecop.freeze(Time.utc(2007, 1, 1, 0, 30, 0)) get :changes assert_response :success - #print @response.body - # As we have loaded the fixtures, we can assume that there are no + # print @response.body + # As we have loaded the fixtures, we can assume that there are some # changes at the time we have frozen at now = Time.now.getutc hourago = now - 1.hour assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do - assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 + assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 do + assert_select "tile", :count => 6 + end end Timecop.return end - + def test_changes_zoom_invalid - zoom_to_test = %w{ p -1 0 17 one two } + zoom_to_test = %w[p -1 0 17 one two] zoom_to_test.each do |zoom| get :changes, :zoom => zoom assert_response :bad_request assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours" end end - + def test_changes_zoom_valid 1.upto(16) do |zoom| get :changes, :zoom => zoom @@ -265,23 +352,34 @@ class ApiControllerTest < ActionController::TestCase end end end - - def test_hours_invalid - invalid = %w{ -21 335 -1 0 25 26 100 one two three ping pong : } + + def test_changes_hours_invalid + invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :] invalid.each do |hour| get :changes, :hours => hour assert_response :bad_request, "Problem with the hour: #{hour}" assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", "Problem with the hour: #{hour}." end end - - def test_hours_valid + + def test_changes_hours_valid 1.upto(24) do |hour| get :changes, :hours => hour assert_response :success end end - + + def test_changes_start_end_invalid + get :changes, :start => "2010-04-03 10:55:00", :end => "2010-04-03 09:55:00" + assert_response :bad_request + assert_equal @response.body, "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours" + end + + def test_changes_start_end_valid + get :changes, :start => "2010-04-03 09:55:00", :end => "2010-04-03 10:55:00" + assert_response :success + end + def test_capabilities get :capabilities assert_response :success @@ -289,6 +387,7 @@ class ApiControllerTest < ActionController::TestCase assert_select "api", :count => 1 do assert_select "version[minimum='#{API_VERSION}'][maximum='#{API_VERSION}']", :count => 1 assert_select "area[maximum='#{MAX_REQUEST_AREA}']", :count => 1 + assert_select "note_area[maximum='#{MAX_NOTE_REQUEST_AREA}']", :count => 1 assert_select "tracepoints[per_page='#{TRACEPOINTS_PER_PAGE}']", :count => 1 assert_select "changesets[maximum_elements='#{Changeset::MAX_ELEMENTS}']", :count => 1 assert_select "status[database='online']", :count => 1 @@ -307,7 +406,7 @@ class ApiControllerTest < ActionController::TestCase end def test_permissions_basic_auth - basic_authorization(users(:normal_user).email, "test") + basic_authorization(create(:user).email, "test") get :permissions assert_response :success assert_select "osm > permissions", :count => 1 do @@ -319,7 +418,7 @@ class ApiControllerTest < ActionController::TestCase end def test_permissions_oauth - @request.env["oauth.token"] = AccessToken.new do |token| + @request.env["oauth.token"] = AccessToken.new do |token| # Just to test a few token.allow_read_prefs = true token.allow_write_api = true