X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b45dd632836632b596cdfae8d73cb8c53a47c20a..3a654c89197b40f4a623c0dd33b87b415623d97d:/test/functional/api_controller_test.rb?ds=sidebyside diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index 0ee49517f..9226e3892 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -1,16 +1,11 @@ require File.dirname(__FILE__) + '/../test_helper' require 'api_controller' -# Re-raise errors caught by the controller. -class ApiController; def rescue_action(e) raise e end; end - -class ApiControllerTest < Test::Unit::TestCase +class ApiControllerTest < ActionController::TestCase api_fixtures def setup - @controller = ApiController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new + super @badbigbbox = %w{ -0.1,-0.1,1.1,1.1 10,10,11,11 } @badmalformedbbox = %w{ -0.1 hello 10N2W10.1N2.1W } @@ -23,10 +18,6 @@ class ApiControllerTest < Test::Unit::TestCase # reall reject it, however this is to test to see if the api changes. end - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") - end - # ------------------------------------- # Test reading a bounding box. # ------------------------------------- @@ -45,17 +36,95 @@ class ApiControllerTest < Test::Unit::TestCase print @request.to_yaml print @response.body end - assert_response :success - assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do + 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 # This should really be more generic - assert_select "tag[k=test][v=1]" + assert_select "tag[k='test'][v='yes']" + end + # Should also test for the ways and relation + 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) + 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 + # This should really be more generic + assert_select "tag[k='test'][v='yes']" end # Should also test for the ways and relation 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 + bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" + get :trackpoints, :bbox => bbox + assert_response :success + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do + assert_select "trk" do + assert_select "trkseg" + 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 + bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" + get :trackpoints, :bbox => bbox + assert_response :success + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do + assert_select "trk", :count => 1 do + assert_select "trk > trkseg", :count => 2 do |trksegs| + trksegs.each do |trkseg| + assert_select trkseg, "trkpt", :count => 1 do |trkpt| + assert_select trkpt[0], "time", :count => 1 + end + end + end + 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 + bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" + get :trackpoints, :bbox => bbox + assert_response :success + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0]", :count => 1 do + assert_select "trk", :count => 1 do + assert_select "trk>name", :count => 1 + assert_select "trk>desc", :count => 1 + assert_select "trk>url", :count => 1 + assert_select "trkseg", :count => 1 do + assert_select "trkpt", :count => 1 do + assert_select "time", :count => 1 + end + end + end + end + end + def test_map_without_bbox ["trackpoints", "map"].each do |tq| get tq @@ -81,7 +150,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, "bbox: #{bbox}" + 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 @@ -128,14 +197,79 @@ class ApiControllerTest < Test::Unit::TestCase # end #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')) + get :changes + assert_response :success + #print @response.body + # As we have loaded the fixtures, we can assume that there are no + # 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 + end + Timecop.return + end + + def test_changes_zoom_invalid + 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 + assert_response :success + # NOTE: there was a test here for the timing, but it was too sensitive to be a good test + # and it was annoying. + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "changes", :count => 1 + end + end + end + + def test_start_end_time_invalid + + end + + def test_start_end_time_invalid + + end + + def test_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 + 1.upto(24) do |hour| + get :changes, :hours => hour + assert_response :success + end + end + def test_capabilities get :capabilities assert_response :success - assert_select "osm:root[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do + assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do assert_select "api", :count => 1 do assert_select "version[minimum=#{API_VERSION}][maximum=#{API_VERSION}]", :count => 1 - assert_select "area[maximum=#{APP_CONFIG['max_request_area']}]", :count => 1 - assert_select "tracepoints[per_page=#{APP_CONFIG['tracepoints_per_page']}]", :count => 1 + assert_select "area[maximum=#{MAX_REQUEST_AREA}]", :count => 1 + assert_select "tracepoints[per_page=#{TRACEPOINTS_PER_PAGE}]", :count => 1 + assert_select "changesets[maximum_elements=#{Changeset::MAX_ELEMENTS}]", :count => 1 end end end