require "test_helper"
require "stringio"
-include Potlatch
class AmfControllerTest < ActionController::TestCase
- api_fixtures
+ include Potlatch
##
# test all routes which lead to this controller
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
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?)
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?
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
##
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
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
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
# 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
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?
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, ""],
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?
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]
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?
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
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)
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
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
# 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
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
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]
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
# 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
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
# 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
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
# 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
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
# 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
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
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
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
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
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])
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])
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])
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
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)
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
# 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
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
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
# 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
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)
# 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
projects / rails.git / blobdiff