X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c6d1bd63da547ea316f1d7e223aa49532b1b6f3a..b4d90ec7f4de168a332959f52965d632bedb96aa:/test/controllers/amf_controller_test.rb diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb index a57da557d..ec11b38e8 100644 --- a/test/controllers/amf_controller_test.rb +++ b/test/controllers/amf_controller_test.rb @@ -1,9 +1,8 @@ require "test_helper" require "stringio" -include Potlatch class AmfControllerTest < ActionController::TestCase - api_fixtures + include Potlatch ## # test all routes which lead to this controller @@ -19,8 +18,8 @@ class AmfControllerTest < ActionController::TestCase end def test_getpresets - user_en_de = create(:user, :languages => %w(en de)) - user_de = create(:user, :languages => %w(de)) + user_en_de = create(:user, :languages => %w[en de]) + user_de = create(:user, :languages => %w[de]) [user_en_de, user_de].each do |user| amf_content "getpresets", "/1", ["#{user.email}:test", ""] post :amf_read @@ -74,7 +73,7 @@ class AmfControllerTest < ActionController::TestCase assert_response :success amf_parse_response result = amf_result("/1") - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "way", result[1] assert_equal id, result[2] assert(result[3].nil? && result[4].nil? && result[5].nil? && result[6].nil?) @@ -155,7 +154,7 @@ class AmfControllerTest < ActionController::TestCase assert_response :success amf_parse_response way = amf_result("/1") - assert_equal -4, way[0] + assert_equal(-4, way[0]) assert_equal "way", way[1] assert_equal 0, way[2] assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil? @@ -216,8 +215,8 @@ class AmfControllerTest < ActionController::TestCase ways = map[2].collect { |x| x[0] } assert ways.include?(way.id), "map should include used way" - assert !ways.include?(deleted_way.id), - "map should not include deleted way" + assert_not ways.include?(deleted_way.id), + "map should not include deleted way" end ## @@ -253,12 +252,15 @@ class AmfControllerTest < ActionController::TestCase end def test_whichways_deleted - node = create(:node, :lat => 3.0, :lon => 3.0) - way = create(:way) - deleted_way = create(:way, :deleted) + node = create(:node, :with_history, :lat => 24.0, :lon => 24.0) + way = create(:way, :with_history) + way_v1 = way.old_ways.find_by(:version => 1) + deleted_way = create(:way, :with_history, :deleted) + deleted_way_v1 = deleted_way.old_ways.find_by(:version => 1) create(:way_node, :way => way, :node => node) create(:way_node, :way => deleted_way, :node => node) - create(:way_tag, :way => way) + create(:old_way_node, :old_way => way_v1, :node => node) + create(:old_way_node, :old_way => deleted_way_v1, :node => node) minlon = node.lon - 0.1 minlat = node.lat - 0.1 @@ -276,9 +278,9 @@ class AmfControllerTest < ActionController::TestCase assert_equal Array, map[2].class, "third map element should be an array" # TODO: looks like amf_controller changed since this test was written # so someone who knows what they're doing should check this! - assert !map[2].include?(current_ways(:used_way).id), - "map should not include used way" - assert map[2].include?(current_ways(:invisible_way).id), + assert_not map[2].include?(way.id), + "map should not include visible way" + assert map[2].include?(deleted_way.id), "map should include deleted way" end @@ -331,14 +333,16 @@ class AmfControllerTest < ActionController::TestCase end def test_getway_old + latest = create(:way, :version => 2) + v1 = create(:old_way, :current_way => latest, :version => 1, :timestamp => Time.now.utc - 2.minutes) + _v2 = create(:old_way, :current_way => latest, :version => 2, :timestamp => Time.now.utc - 1.minute) + # try to get the last visible version (specified by <0) (should be current version) - latest = current_ways(:way_with_versions) # NOTE: looks from the API changes that this now expects a timestamp # instead of a version number... # try to get version 1 - v1 = ways(:way_with_versions_v2) { latest.id => "", - v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") }.each do |id, t| + v1.way_id => (v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S") }.each do |id, t| amf_content "getway_old", "/1", [id, t] post :amf_read assert_response :success @@ -355,7 +359,7 @@ class AmfControllerTest < ActionController::TestCase # test that the server doesn't fall over when rubbish is passed # into the method args. def test_getway_old_invalid - way_id = current_ways(:way_with_versions).id + way_id = create(:way, :with_history, :version => 2).id { "foo" => "bar", way_id => "not a date", way_id => "2009-03-25 00:00:00", # <- wrong format @@ -366,7 +370,7 @@ class AmfControllerTest < ActionController::TestCase assert_response :success amf_parse_response returned_way = amf_result("/1") - assert_equal -1, returned_way[0] + assert_equal(-1, returned_way[0]) assert returned_way[3].nil? assert returned_way[4].nil? assert returned_way[5].nil? @@ -375,7 +379,8 @@ class AmfControllerTest < ActionController::TestCase def test_getway_old_nonexistent # try to get the last version-10 (shoudn't exist) - v1 = ways(:way_with_versions_v1) + way = create(:way, :with_history, :version => 2) + v1 = way.old_ways.find_by(:version => 1) # try to get last visible version of non-existent way # try to get specific version of non-existent way [[0, ""], @@ -386,7 +391,7 @@ class AmfControllerTest < ActionController::TestCase assert_response :success amf_parse_response returned_way = amf_result("/1") - assert_equal -1, returned_way[0] + assert_equal(-1, returned_way[0]) assert returned_way[3].nil? assert returned_way[4].nil? assert returned_way[5].nil? @@ -394,7 +399,8 @@ class AmfControllerTest < ActionController::TestCase end def test_getway_old_invisible - v1 = ways(:invisible_way) + way = create(:way, :deleted, :with_history, :version => 1) + v1 = way.old_ways.find_by(:version => 1) # try to get deleted version [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t| amf_content "getway_old", "/1", [id, t] @@ -402,7 +408,7 @@ class AmfControllerTest < ActionController::TestCase assert_response :success amf_parse_response returned_way = amf_result("/1") - assert_equal -1, returned_way[0] + assert_equal(-1, returned_way[0]) assert returned_way[3].nil? assert returned_way[4].nil? assert returned_way[5].nil? @@ -410,8 +416,9 @@ class AmfControllerTest < ActionController::TestCase end def test_getway_history - latest = current_ways(:way_with_versions) - oldest = ways(:way_with_versions_v1) + latest = create(:way, :version => 2) + oldest = create(:old_way, :current_way => latest, :version => 1, :timestamp => latest.timestamp - 2.minutes) + create(:old_way, :current_way => latest, :version => 2, :timestamp => latest.timestamp) amf_content "getway_history", "/1", [latest.id] post :amf_read @@ -491,8 +498,8 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 2, result.length - assert_equal -1, result[0] - assert_match /must be logged in/, result[1] + assert_equal(-1, result[0]) + assert_match(/must be logged in/, result[1]) blocked_user = create(:user) create(:user_block, :user => blocked_user) @@ -503,8 +510,8 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 2, result.length - assert_equal -1, result[0] - assert_match /access to the API has been blocked/, result[1] + assert_equal(-1, result[0]) + assert_match(/access to the API has been blocked/, result[1]) end def test_findgpx_by_id @@ -529,7 +536,9 @@ class AmfControllerTest < ActionController::TestCase end def test_findgpx_by_name - amf_content "findgpx", "/1", ["Trace", "test@example.com:test"] + user = create(:user) + + amf_content "findgpx", "/1", ["Trace", "#{user.email}:test"] post :amf_read assert_response :success amf_parse_response @@ -537,7 +546,7 @@ class AmfControllerTest < ActionController::TestCase # find by name fails as it uses mysql text search syntax... assert_equal 2, result.length - assert_equal -2, result[0] + assert_equal(-2, result[0]) end def test_findrelations_by_id @@ -627,7 +636,7 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 3, result.length - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "node", result[1] assert_equal 999999, result[2] end @@ -662,7 +671,7 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 3, result.length - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "node", result[1] assert_equal node.node_id, result[2] @@ -673,7 +682,7 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 3, result.length - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "node", result[1] assert_equal 999999, result[2] end @@ -722,8 +731,8 @@ class AmfControllerTest < ActionController::TestCase # This node has no tags # create a node with random lat/lon - lat = rand(100) - 50 + rand - lon = rand(100) - 50 + rand + lat = rand(-50..49) + rand + lon = rand(-50..49) + rand changeset = create(:changeset) user = changeset.user @@ -762,8 +771,8 @@ class AmfControllerTest < ActionController::TestCase # This node has some tags # create a node with random lat/lon - lat = rand(100) - 50 + rand - lon = rand(100) - 50 + rand + lat = rand(-50..49) + rand + lon = rand(-50..49) + rand amf_content "putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil] post :amf_write @@ -803,8 +812,8 @@ class AmfControllerTest < ActionController::TestCase # This node has no tags # create a node with random lat/lon - lat = rand(100) - 50 + rand - lon = rand(100) - 50 + rand + lat = rand(-50..49) + rand + lon = rand(-50..49) + rand changeset = create(:changeset) user = changeset.user @@ -839,8 +848,8 @@ class AmfControllerTest < ActionController::TestCase # This node has no tags # create a node with random lat/lon - lat = rand(100) - 50 + rand - lon = rand(100) - 50 + rand + lat = rand(-50..49) + rand + lon = rand(-50..49) + rand changeset = create(:changeset) user = changeset.user @@ -855,7 +864,7 @@ class AmfControllerTest < ActionController::TestCase 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(-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 @@ -895,7 +904,7 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 3, result.size - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "node", result[1] assert_equal nd.id, result[2] end @@ -913,7 +922,7 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 3, result.size - assert_equal -4, result[0] + assert_equal(-4, result[0]) assert_equal "node", result[1] assert_equal 999999, result[2] end @@ -931,8 +940,8 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 2, result.size - assert_equal -2, result[0] - assert_match /Node is not in the world/, result[1] + assert_equal(-2, result[0]) + assert_match(/Node is not in the world/, result[1]) end # check that we can create a way @@ -957,8 +966,8 @@ class AmfControllerTest < ActionController::TestCase assert_equal 8, result.size assert_equal 0, result[0] assert_equal "", result[1] - assert_equal -1, result[2] - assert_not_equal -1, result[3] + assert_equal(-1, result[2]) + assert_not_equal(-1, result[3]) assert_equal({}, result[4]) assert_equal 1, result[5] assert_equal({}, result[6]) @@ -979,8 +988,8 @@ class AmfControllerTest < ActionController::TestCase assert_equal 8, result.size assert_equal 0, result[0] assert_equal "", result[1] - assert_equal -1, result[2] - assert_not_equal -1, result[3] + assert_equal(-1, result[2]) + assert_not_equal(-1, result[3]) assert_equal({}, result[4]) assert_equal 1, result[5] assert_equal({}, result[6]) @@ -1002,8 +1011,8 @@ class AmfControllerTest < ActionController::TestCase assert_equal 8, result.size assert_equal 0, result[0] assert_equal "", result[1] - assert_equal -1, result[2] - assert_not_equal -1, result[3] + assert_equal(-1, result[2]) + assert_not_equal(-1, result[3]) assert_equal({ "-1" => new_node_id }, result[4]) assert_equal 1, result[5] assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6]) @@ -1184,8 +1193,8 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 2, result.size - assert_equal -1, result[0] - assert_match /Way #{way.id} is still used/, result[1] + assert_equal(-1, result[0]) + assert_match(/Way #{way.id} is still used/, result[1]) new_way = Way.find(way.id) assert_equal way.version, new_way.version @@ -1216,8 +1225,8 @@ class AmfControllerTest < ActionController::TestCase assert_equal 5, result.size assert_equal 0, result[0] assert_equal "", result[1] - assert_equal -1, result[2] - assert_not_equal -1, result[3] + assert_equal(-1, result[2]) + assert_not_equal(-1, result[3]) assert_equal 1, result[4] new_relation = Relation.find(new_relation_id) @@ -1298,8 +1307,8 @@ class AmfControllerTest < ActionController::TestCase result = amf_result("/1") assert_equal 2, result.size - assert_equal -1, result[0] - assert_match /relation #{relation.id} is used in/, result[1] + assert_equal(-1, result[0]) + assert_match(/relation #{relation.id} is used in/, result[1]) new_relation = Relation.find(relation.id) assert_equal relation.version, new_relation.version @@ -1310,7 +1319,9 @@ class AmfControllerTest < ActionController::TestCase # check that we can open a changeset def test_startchangeset_valid - amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1] + user = create(:user) + + amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1] post :amf_write assert_response :success amf_parse_response @@ -1327,7 +1338,7 @@ class AmfControllerTest < ActionController::TestCase old_cs_id = new_cs_id - amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "newer" }, old_cs_id, "newer", 1] + amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "newer" }, old_cs_id, "newer", 1] post :amf_write assert_response :success amf_parse_response @@ -1350,7 +1361,7 @@ class AmfControllerTest < ActionController::TestCase old_cs_id = new_cs_id - amf_content "startchangeset", "/1", ["test@example.com:test", {}, old_cs_id, "", 0] + amf_content "startchangeset", "/1", ["#{user.email}:test", {}, old_cs_id, "", 0] post :amf_write assert_response :success amf_parse_response @@ -1368,7 +1379,10 @@ class AmfControllerTest < ActionController::TestCase # check that we can't close somebody elses changeset def test_startchangeset_invalid_wrong_user - amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1] + user = create(:user) + user2 = create(:user) + + amf_content "startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1] post :amf_write assert_response :success amf_parse_response @@ -1383,14 +1397,14 @@ class AmfControllerTest < ActionController::TestCase assert_equal true, cs.is_open? assert_equal({ "comment" => "new", "source" => "new" }, cs.tags) - amf_content "startchangeset", "/1", ["test@openstreetmap.org:test", {}, cs_id, "delete", 0] + amf_content "startchangeset", "/1", ["#{user2.email}:test", {}, cs_id, "delete", 0] post :amf_write assert_response :success amf_parse_response result = amf_result("/1") assert_equal 2, result.size - assert_equal -2, result[0] + assert_equal(-2, result[0]) assert_equal "The user doesn't own that changeset", result[1] cs = Changeset.find(cs_id) @@ -1400,10 +1414,12 @@ class AmfControllerTest < ActionController::TestCase # check that invalid characters are stripped from changeset tags def test_startchangeset_invalid_xmlchar_comment + user = create(:user) + invalid = "\035\022" comment = "foo#{invalid}bar" - amf_content "startchangeset", "/1", ["test@example.com:test", {}, nil, comment, 1] + amf_content "startchangeset", "/1", ["#{user.email}:test", {}, nil, comment, 1] post :amf_write assert_response :success amf_parse_response