X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4826032d183932312d635193c9d3acef6107f280..491da055847c0b0184016606c93a65eeae38ce80:/test/functional/amf_controller_test.rb?ds=sidebyside diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb index 9193cb4d2..757acf6ac 100644 --- a/test/functional/amf_controller_test.rb +++ b/test/functional/amf_controller_test.rb @@ -5,6 +5,19 @@ include Potlatch class AmfControllerTest < ActionController::TestCase api_fixtures + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/amf/read", :method => :post }, + { :controller => "amf", :action => "amf_read" } + ) + assert_routing( + { :path => "/api/0.6/amf/write", :method => :post }, + { :controller => "amf", :action => "amf_write" } + ) + end + def test_getway # check a visible way id = current_ways(:visible_way).id @@ -28,7 +41,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal way[0], -4 assert_equal way[1], "way" assert_equal way[2], id - assert way[3].empty? and way[4].empty? + assert way[3].nil? and way[4].nil? end def test_getway_nonexistent @@ -41,7 +54,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal way[0], -4 assert_equal way[1], "way" assert_equal way[2], 0 - assert way[3].empty? and way[4].empty? + assert way[3].nil? and way[4].nil? end def test_whichways @@ -185,7 +198,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal rel[0], -4 assert_equal rel[1], "relation" assert_equal rel[2], id - assert rel[3].empty? and rel[4].empty? + assert rel[3].nil? and rel[4].nil? end def test_getrelation_nonexistent @@ -198,7 +211,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal rel[0], -4 assert_equal rel[1], "relation" assert_equal rel[2], id - assert rel[3].empty? and rel[4].empty? + assert rel[3].nil? and rel[4].nil? end def test_getway_old @@ -208,16 +221,16 @@ class AmfControllerTest < ActionController::TestCase # instead of a version number... # try to get version 1 v1 = ways(:way_with_versions_v1) - { latest => '', - v1 => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") - }.each do |way, t| - amf_content "getway_old", "/1", [way.id, t] + { latest.id => '', + v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") + }.each do |id, t| + amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success amf_parse_response returned_way = amf_result("/1") assert_equal 0, returned_way[0] - assert_equal way.id, returned_way[2] + assert_equal id, returned_way[2] # API returns the *latest* version, even for old ways... assert_equal latest.version, returned_way[5] end @@ -240,8 +253,8 @@ class AmfControllerTest < ActionController::TestCase amf_parse_response returned_way = amf_result("/1") assert_equal -1, returned_way[0] - assert returned_way[3].empty? - assert returned_way[4].empty? + assert returned_way[3].nil? + assert returned_way[4].nil? assert returned_way[5].nil? end end @@ -251,18 +264,18 @@ class AmfControllerTest < ActionController::TestCase v1 = ways(:way_with_versions_v1) # try to get last visible version of non-existent way # try to get specific version of non-existent way - [[nil, ''], - [nil, '1 Jan 1970, 00:00:00'], - [v1, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")] - ].each do |way, t| - amf_content "getway_old", "/1", [way.nil? ? 0 : way.id, t] + [[0, ''], + [0, '1 Jan 1970, 00:00:00'], + [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")] + ].each do |id, t| + amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success amf_parse_response returned_way = amf_result("/1") assert_equal -1, returned_way[0] - assert returned_way[3].empty? - assert returned_way[4].empty? + assert returned_way[3].nil? + assert returned_way[4].nil? assert returned_way[5].nil? end end @@ -282,11 +295,10 @@ class AmfControllerTest < ActionController::TestCase assert_equal latest.id, history[1] # We use dates rather than version numbers here, because you might # have moved a node within a way (i.e. way version not incremented). - # The timestamp is +1 (timestamp.succ) because we say "give me the - # revision of 15:33:02", but that might actually include changes at - # 15:33:02.457. - assert_equal latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] - assert_equal oldest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] + # The timestamp is +1 because we say "give me the revision of 15:33:02", + # but that might actually include changes at 15:33:02.457. + assert_equal (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] + assert_equal (oldest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] end def test_getway_history_nonexistent @@ -318,10 +330,10 @@ class AmfControllerTest < ActionController::TestCase assert_equal history[1], latest.id, 'second element should be the input node ID' assert_equal history[2].first[0], - latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), + (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), 'first element in third element (array) should be the latest version' assert_equal history[2].last[0], - nodes(:node_with_versions_v1).timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), + (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), 'last element in third element (array) should be the initial version' end @@ -398,7 +410,7 @@ class AmfControllerTest < ActionController::TestCase # Finally check that the node that was saved has saved the data correctly # in both the current and history tables # First check the current table - current_node = Node.find(result[3]) + current_node = Node.find(result[3].to_i) assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly" assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly" assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node" @@ -437,7 +449,7 @@ class AmfControllerTest < ActionController::TestCase # Finally check that the node that was saved has saved the data correctly # in both the current and history tables # First check the current table - current_node = Node.find(result[3]) + current_node = Node.find(result[3].to_i) assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly" assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly" assert_equal 2, current_node.tags.size, "There seems to be a tag that has been added to the node" @@ -464,7 +476,7 @@ class AmfControllerTest < ActionController::TestCase # normal user has a changeset open changeset = changesets(:public_user_first_change) - mostly_invalid = 32.times.to_a.map {|i| i.chr}.join + mostly_invalid = (0..31).to_a.map {|i| i.chr}.join tags = { "something" => "foo#{mostly_invalid}bar" } amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil] @@ -483,7 +495,7 @@ class AmfControllerTest < ActionController::TestCase # Finally check that the node that was saved has saved the data correctly # in both the current and history tables # First check the current table - current_node = Node.find(result[3]) + current_node = Node.find(result[3].to_i) assert_equal 1, current_node.tags.size, "There seems to be a tag that has been added to the node" assert_equal({ "something" => "foo\t\n\rbar" }, current_node.tags, "tags were not fixed correctly") assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf" @@ -510,7 +522,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal 2, result.size assert_equal -1, result[0], "Expected to get the status FAIL in the amf" - assert_equal "One of the tags is invalid. Please pester Adobe to fix Flash on Linux.", result[1] + assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1] end def test_putpoi_delete_valid @@ -529,6 +541,24 @@ class AmfControllerTest < ActionController::TestCase end + def test_startchangeset_invalid_xmlchar_comment + invalid = "\035\022" + comment = "foo#{invalid}bar" + + amf_content "startchangeset", "/1", ["test@example.com:test", Hash.new, nil, comment, 1] + post :amf_write + assert_response :success + amf_parse_response + result = amf_result("/1") + + assert_equal 3, result.size, result.inspect + assert_equal 0, result[0] + new_cs_id = result[2].to_i + + cs = Changeset.find(new_cs_id) + assert_equal "foobar", cs.tags["comment"] + end + # ************************************************************ # AMF Helper functions @@ -559,13 +589,8 @@ class AmfControllerTest < ActionController::TestCase # The result is a hash of message_ref => data. # The attribute @amf_result is initialised to this hash. def amf_parse_response - if @response.body.class.to_s == 'Proc' - res = StringIO.new() - @response.body.call @response, res - req = StringIO.new(res.string) - else - req = StringIO.new(@response.body) - end + req = StringIO.new(@response.body) + req.read(2) # version # parse through any headers