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
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
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
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
# 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
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
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
# 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"
# 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"
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].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"
+ 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
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
# 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
projects / rails.git / blobdiff