X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..568ce75c9ad0e19a14afb97d9d0832364232bee8:/test/functional/api_controller_test.rb?ds=inline diff --git a/test/functional/api_controller_test.rb b/test/functional/api_controller_test.rb index 6a0c2e2ac..e1543726f 100644 --- a/test/functional/api_controller_test.rb +++ b/test/functional/api_controller_test.rb @@ -18,10 +18,6 @@ class ApiControllerTest < ActionController::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,7 +41,7 @@ class ApiControllerTest < ActionController::TestCase 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 @@ -63,11 +59,11 @@ class ApiControllerTest < ActionController::TestCase end def test_tracepoints - point = gpx_files(:first_trace_file) - minlon = point.longitude-0.1 - minlat = point.latitude-0.1 - maxlon = point.longitude+0.1 - maxlat = point.latitude+0.1 + 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 #print @response.body @@ -79,6 +75,53 @@ class ApiControllerTest < ActionController::TestCase 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 + #print @response.body + assert_response :success + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :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 + #print @response.body + assert_response :success + assert_select "gpx[version=1.0][creator=OpenStreetMap.org][xmlns=http://www.topografix.com/GPX/1/0/]:root", :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 @@ -151,21 +194,23 @@ class ApiControllerTest < ActionController::TestCase # end #end - # MySQL requires that the C based functions are installed for this test to - # work. More information is available from: - # http://wiki.openstreetmap.org/index.php/Rails#Installing_the_quadtile_functions + # 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 recently - now = Time.now + # changes at the time we have frozen at + now = Time.now.getutc hourago = now - 1.hour - # Note that this may fail on a very slow machine, so isn't a great test assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']:root", :count => 1 do assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 end + Timecop.return end def test_changes_zoom_invalid @@ -181,11 +226,10 @@ class ApiControllerTest < ActionController::TestCase 1.upto(16) do |zoom| get :changes, :zoom => zoom assert_response :success - now = Time.now - hourago = now - 1.hour - # Note that this may fail on a very slow machine, so isn't a great test + # 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}']:root", :count => 1 do - assert_select "changes[starttime='#{hourago.xmlschema}'][endtime='#{now.xmlschema}']", :count => 1 + assert_select "changes", :count => 1 end end end @@ -222,6 +266,7 @@ class ApiControllerTest < ActionController::TestCase 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 "changesets[maximum_elements=#{Changeset::MAX_ELEMENTS}]", :count => 1 end end end