Merge 16817:16819 from trunk.

[rails.git] / test / unit / node_test.rb

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 21a62cc5f84a3b37bafce172e76922ed25c82c50..dd907f0f48e79bd4b6f7b17f7fbba4ab2fd416e1 100644 (file)
--- 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 = "<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) {
@@ -253,6 +267,42 @@ 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_k_v
+    nokv = "<osm><node id='23' lat='12.3' lon='23.4' changeset='12' version='23'><tag /></node></osm>"
+    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 = "<osm><node id='23' lat='23.43' lon='23.32' changeset='23' version='32'><tag k='key' /></node></osm>"
+    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 = "<osm><node id='23' lat='23.2' lon='23' changeset='34' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></node></osm>"
+    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