X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3170600b9c6a1a42a1b2385fff08eca1c5f07b26..959442d087b9b25fbec9c78ec122106b82d887dd:/test/unit/node_test.rb?ds=sidebyside
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 21a62cc5f..24300e428 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -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 = ""
+ 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) {
@@ -253,6 +267,54 @@ class NodeTest < ActiveSupport::TestCase
message_update = assert_raise(OSM::APIBadXMLError) {
Node.from_xml(no_text, false)
}
- assert_match /Must specify a string with one or more characters/, message_create.message
+ assert_match /Must specify a string with one or more characters/, message_update.message
+ end
+
+ def test_from_xml_no_node
+ no_node = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_node, true)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_node, false)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, true)
+ }
+ assert_equal "Element node/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, false)
+ }
+ assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
end
end