X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df496b44cd5d52f96bd090815f4f23b4e0f4452f..d84d5c68dea2b39fc6f39c0f37847ae3822d157a:/test/functional/way_controller_test.rb diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb index 8a057c293..0e6b3ea6a 100644 --- a/test/functional/way_controller_test.rb +++ b/test/functional/way_controller_test.rb @@ -1,26 +1,9 @@ require File.dirname(__FILE__) + '/../test_helper' require 'way_controller' -# Re-raise errors caught by the controller. -class WayController; def rescue_action(e) raise e end; end - -class WayControllerTest < Test::Unit::TestCase +class WayControllerTest < ActionController::TestCase api_fixtures - def setup - @controller = WayController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end - - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") - end - - def content(c) - @request.env["RAW_POST_DATA"] = c.to_s - end - # ------------------------------------- # Test reading ways. # ------------------------------------- @@ -37,34 +20,35 @@ class WayControllerTest < Test::Unit::TestCase # check chat a non-existent way is not returned get :read, :id => 0 assert_response :not_found + end - # check the "ways for node" mode - get :ways_for_node, :id => current_nodes(:used_node_1).id - assert_response :success - # FIXME check whether this contains the stuff we want! - #print @response.body - # Needs to be updated when changing fixtures - # The generator should probably be defined in the environment.rb file - # in the same place as the api version - assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1 - assert_select "osm way", 3 - assert_select "osm way nd", 3 - assert_select "osm way tag", 3 - - # check the "full" mode - get :full, :id => current_ways(:visible_way).id - assert_response :success - # FIXME check whether this contains the stuff we want! - #print @response.body - # Check the way is correctly returned - way = current_ways(:visible_way) - assert_select "osm way[id=#{way.id}][version=#{way.version}][visible=#{way.visible}]", 1 - assert_select "osm way nd[ref=#{way.way_nodes[0].node_id}]", 1 - # Check that the node is correctly returned - nd = current_ways(:visible_way).nodes - assert_equal 1, nd.count - nda = nd[0] - assert_select "osm node[id=#{nda.id}][version=#{nda.version}][lat=#{nda.lat}][lon=#{nda.lon}]", 1 + ## + # check the "full" mode + def test_full + Way.find(:all).each do |way| + get :full, :id => way.id + + # full call should say "gone" for non-visible ways... + unless way.visible + assert_response :gone + next + end + + # otherwise it should say success + assert_response :success + + # Check the way is correctly returned + assert_select "osm way[id=#{way.id}][version=#{way.version}][visible=#{way.visible}]", 1 + + # check that each node in the way appears once in the output as a + # reference and as the node element. note the slightly dodgy assumption + # that nodes appear only once. this is currently the case with the + # fixtures, but it doesn't have to be. + way.nodes.each do |n| + assert_select "osm way nd[ref=#{n.id}]", 1 + assert_select "osm node[id=#{n.id}][version=#{n.version}][lat=#{n.lat}][lon=#{n.lon}]", 1 + end + end end # ------------------------------------- @@ -227,6 +211,7 @@ class WayControllerTest < Test::Unit::TestCase put :update, :id => current_ways(:visible_way).id assert_response :bad_request, "adding a duplicate tag to a way should fail with 'bad request'" + assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}.", @response.body end ## @@ -251,6 +236,7 @@ class WayControllerTest < Test::Unit::TestCase put :update, :id => current_ways(:visible_way).id assert_response :bad_request, "adding new duplicate tags to a way should fail with 'bad request'" + assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate.", @response.body end ## @@ -263,28 +249,43 @@ class WayControllerTest < Test::Unit::TestCase # add the tag into the existing xml way_str = "" - - # all of these keys have the same unicode decoding, but are binary - # not equal. libxml should make these identical as it decodes the - # XML document... - [ "addr:housenumber", - "addr\xc0\xbahousenumber", - "addr\xe0\x80\xbahousenumber", - "addr\xf0\x80\x80\xbahousenumber" ].each do |key| - tag_xml = XML::Node.new("tag") - tag_xml['k'] = key - tag_xml['v'] = "1" - - # add all new tags to the way - way_str << "" - end + way_str << "" + way_str << "" way_str << ""; # try and upload it content way_str put :create assert_response :bad_request, - "adding new duplicate tags to a way should fail with 'bad request'" + "adding new duplicate tags to a way should fail with 'bad request'" + assert_equal "Element way/ has duplicate tags with key addr:housenumber.", @response.body + end + + ## + # test that a call to ways_for_node returns all ways that contain the node + # and none that don't. + def test_ways_for_node + # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4 + # *used* to use it but doesn't. + get :ways_for_node, :id => current_nodes(:used_node_1).id + assert_response :success + ways_xml = XML::Parser.string(@response.body).parse + assert_not_nil ways_xml, "failed to parse ways_for_node response" + + # check that the set of IDs match expectations + expected_way_ids = [ current_ways(:visible_way).id, + current_ways(:used_way).id + ] + found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i } + assert_equal expected_way_ids, found_way_ids, + "expected ways for node #{current_nodes(:used_node_1).id} did not match found" + + # check the full ways to ensure we're not missing anything + expected_way_ids.each do |id| + way_xml = ways_xml.find("//osm/way[@id=#{id}]").first + assert_ways_are_equal(Way.find(id), + Way.from_xml_node(way_xml)) + end end ##