X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/33157534e1f2fc538a478c955fe1fd86dbbbec52..3344e6084697337ef789333410bead2589d26241:/test/functional/amf_controller_test.rb diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb index 0e9cda06f..3bb1d273e 100644 --- a/test/functional/amf_controller_test.rb +++ b/test/functional/amf_controller_test.rb @@ -28,7 +28,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 +41,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 +185,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 +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_getway_old @@ -240,8 +240,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 @@ -261,8 +261,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 @@ -280,10 +280,13 @@ class AmfControllerTest < ActionController::TestCase # ['way',wayid,history] assert_equal 'way', history[0] assert_equal latest.id, history[1] - # for some reason undocumented, the potlatch API now prefers dates - # over version numbers. presumably no-one edits concurrently any more? - assert_equal latest.timestamp.strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] - assert_equal oldest.timestamp.strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] + # 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] end def test_getway_history_nonexistent @@ -308,21 +311,18 @@ class AmfControllerTest < ActionController::TestCase history = amf_result("/1") # ['node',nodeid,history] + # note that (as per getway_history) we actually round up + # to the next second assert_equal history[0], 'node', 'first element should be "node"' assert_equal history[1], latest.id, 'second element should be the input node ID' - # NOTE: changed this test to match what amf_controller actually - # outputs - which may or may not be what potlatch is expecting. - # someone who knows potlatch (i.e: richard f) should review this. - # NOTE2: wow - this is the second time this has changed in the - # API and the tests are being patched up. assert_equal history[2].first[0], - latest.timestamp.strftime("%d %b %Y, %H:%M:%S"), - 'first part of third element should be the latest version' + latest.timestamp.succ.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.strftime("%d %b %Y, %H:%M:%S"), - 'second part of third element should be the initial version' + nodes(:node_with_versions_v1).timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), + 'last element in third element (array) should be the initial version' end def test_getnode_history_nonexistent @@ -454,6 +454,65 @@ class AmfControllerTest < ActionController::TestCase assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf" end + # try creating a POI with rubbish in the tags + def test_putpoi_create_with_control_chars + # This node has no tags + nd = Node.new + # create a node with random lat/lon + lat = rand(100)-50 + rand + lon = rand(100)-50 + rand + # normal user has a changeset open + changeset = changesets(:public_user_first_change) + + 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] + post :amf_write + assert_response :success + amf_parse_response + result = amf_result("/1") + + # check the array returned by the amf + assert_equal 5, result.size + assert_equal 0, result[0], "Expected to get the status ok in the amf" + assert_equal 0, result[2], "The old id should be 0" + assert result[3] > 0, "The new id should be greater than 0" + assert_equal 1, result[4], "The new version should be 1" + + # 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]) + 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" + end + + # try creating a POI with rubbish in the tags + def test_putpoi_create_with_invalid_utf8 + # This node has no tags + nd = Node.new + # create a node with random lat/lon + lat = rand(100)-50 + rand + lon = rand(100)-50 + rand + # normal user has a changeset open + changeset = changesets(:public_user_first_change) + + invalid = "\xc0\xc0" + tags = { "something" => "foo#{invalid}bar" } + + amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil] + post :amf_write + assert_response :success + amf_parse_response + result = amf_result("/1") + + 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. Linux users may need to upgrade to Flash Player 10.1.", result[1] + end + def test_putpoi_delete_valid end @@ -552,14 +611,14 @@ class AmfControllerTest < ActionController::TestCase # this should be what AMF controller returns when the bbox of a # whichways request is invalid or too large. def assert_boundary_error(map, msg=nil, error_hint=nil) - expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}", [], [], []] + expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"] assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})" end # this should be what AMF controller returns when the bbox of a # whichways_deleted request is invalid or too large. def assert_deleted_boundary_error(map, msg=nil, error_hint=nil) - expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}", []] + expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"] assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})" end end