Clean up diary_entry.js

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

diff --git a/test/unit/relation_test.rb b/test/unit/relation_test.rb
index 1c46c70122c77e4ba1befeb0be139a83373957b4..a62320cc7d66b0cd590f851b5fe6f9d6a6b75829 100644 (file)
--- a/test/unit/relation_test.rb
+++ b/test/unit/relation_test.rb
@@ -4,7 +4,7 @@ class RelationTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_relation_count
-    assert_equal 6, Relation.count
+    assert_equal 8, Relation.count
   end
   
   def test_from_xml_no_id
@@ -66,4 +66,40 @@ class RelationTest < ActiveSupport::TestCase
     }
     assert_match /Must specify a string with one or more characters/, message_update.message
   end
+  
+  def test_from_xml_no_k_v
+    nokv = "<osm><relation id='23' changeset='23' version='23'><tag /></relation></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(nokv, true)
+    }
+    assert_match /tag is missing key/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(nokv, false)
+    }
+    assert_match /tag is missing key/, message_update.message
+  end
+  
+  def test_from_xml_no_v
+    no_v = "<osm><relation id='23' changeset='23' version='23'><tag k='key' /></relation></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_v, true)
+    }
+    assert_match /tag is missing value/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_v, false)
+    }
+    assert_match /tag is missing value/, message_update.message
+  end
+  
+  def test_from_xml_duplicate_k
+    dupk = "<osm><relation id='23' changeset='23' version='23'><tag k='dup' v='test'/><tag k='dup' v='tester'/></relation></osm>"
+    message_create = assert_raise(OSM::APIDuplicateTagsError) {
+      Relation.from_xml(dupk, true)
+    }
+    assert_equal "Element relation/ has duplicate tags with key dup", message_create.message
+    message_update = assert_raise(OSM::APIDuplicateTagsError) {
+      Relation.from_xml(dupk, false)
+    }
+    assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
+  end
 end