cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw errors in the way xml parsing if there is a problem. Bring the way parsing in line with the node parsing. Properly deal with the 0 id case. Some Way.from_xml tests.

Browse source
This commit is contained in:
Shaun McDonald 2009-06-10 15:42:12 +00:00
parent a6a54db7d5
commit e4d7b3ee66
4 changed files with 98 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/unit/node_test.rb
View file

@ -214,11 +214,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(nocs, true)
}
assert_match /changeset id missing/, message_create.message
assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(nocs, false)
}
assert_match /changeset id missing/, message_update.message
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
@ -244,6 +244,20 @@ class NodeTest < ActiveSupport::TestCase
assert_match /Fatal error: Attribute lat redefined at/, message_update.message
end
def test_from_xml_id_zero
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = "<osm><node id='#{id}' lat='12.3' lon='12.3' changeset='33' version='23' /></osm>"
assert_nothing_raised(OSM::APIBadUserInput) {
Node.from_xml(zero_id, true)
}
message_update = assert_raise(OSM::APIBadUserInput) {
Node.from_xml(zero_id, false)
}
assert_match /ID of node cannot be zero when updating/, message_update.message
end
end
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {

62
test/unit/way_test.rb
View file

@ -26,7 +26,7 @@ class WayTest < ActiveSupport::TestCase
way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
1.upto((APP_CONFIG['max_number_of_way_nodes'])/2) {
1.upto((APP_CONFIG['max_number_of_way_nodes']) / 2) {
way.add_nd_num(current_nodes(:used_node_1).id)
way.add_nd_num(current_nodes(:used_node_2).id)
}
@ -36,4 +36,64 @@ class WayTest < ActiveSupport::TestCase
way.add_nd_num(current_nodes(:visible_node).id)
assert way.valid?
end
def test_from_xml_no_id
noid = "<osm><way version='12' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
Way.from_xml(noid, true)
}
message = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(noid, false)
}
assert_match /ID is required when updating/, message.message
end
def test_from_xml_no_changeset_id
nocs = "<osm><way id='123' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(nocs, true)
}
assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(nocs, false)
}
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
no_version = "<osm><way id='123' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
Way.from_xml(no_version, true)
}
message_update = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(no_version, false)
}
assert_match /Version is required when updating/, message_update.message
end
def test_from_xml_id_zero
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = "<osm><way id='#{id}' changeset='33' version='23' /></osm>"
assert_nothing_raised(OSM::APIBadUserInput) {
Way.from_xml(zero_id, true)
}
message_update = assert_raise(OSM::APIBadUserInput) {
Way.from_xml(zero_id, false)
}
assert_match /ID of way cannot be zero when updating/, message_update.message
end
end
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(no_text, true)
}
assert_match /Must specify a string with one or more characters/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(no_text, false)
}
assert_match /Must specify a string with one or more characters/, message_create.message
end
end