X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46..d0e45c7c8e85c5536970fc0ac98f5f9626ebf3c8:/test/controllers/amf_controller_test.rb diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb index 83ef03bbf..0bdd01bd2 100644 --- a/test/controllers/amf_controller_test.rb +++ b/test/controllers/amf_controller_test.rb @@ -1,8 +1,9 @@ require "test_helper" require "stringio" -include Potlatch class AmfControllerTest < ActionController::TestCase + include Potlatch + ## # test all routes which lead to this controller def test_routes @@ -72,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?) @@ -153,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? @@ -214,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 ## @@ -277,8 +278,8 @@ 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?(way.id), - "map should not include visible way" + 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 @@ -369,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? @@ -390,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? @@ -407,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? @@ -497,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) @@ -509,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 @@ -545,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 @@ -635,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 @@ -670,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] @@ -681,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 @@ -730,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 @@ -746,7 +747,7 @@ class AmfControllerTest < ActionController::TestCase assert_equal 5, result.size assert_equal 0, result[0], "expected to get the status ok from 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 result[3].positive?, "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 @@ -770,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 @@ -783,7 +784,7 @@ class AmfControllerTest < ActionController::TestCase 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 result[3].positive?, "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 @@ -811,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 @@ -830,7 +831,7 @@ class AmfControllerTest < ActionController::TestCase 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 result[3].positive?, "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 @@ -847,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 @@ -863,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 @@ -903,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 @@ -921,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 @@ -939,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 @@ -965,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]) @@ -987,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]) @@ -1010,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]) @@ -1192,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 @@ -1224,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) @@ -1306,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 @@ -1403,7 +1404,7 @@ class AmfControllerTest < ActionController::TestCase 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)