Merge branch 'master' into openstreetbugs

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

diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb
index afbe36252161fb66b58c2f28aeb18f58488a5830..39da76ec0ad204b496795c85ebc69622216a05de 100644 (file)
--- a/test/unit/way_test.rb
+++ b/test/unit/way_test.rb
@@ -6,7 +6,7 @@ class WayTest < ActiveSupport::TestCase
   # Check that we have the correct number of currnet ways in the db
   # This will need to updated whenever the current_ways.yml is updated
   def test_db_count
   # Check that we have the correct number of currnet ways in the db
   # This will need to updated whenever the current_ways.yml is updated
   def test_db_count

-    assert_equal 4, Way.count
+    assert_equal 5, Way.count

   end
   
   def test_bbox
   end
   
   def test_bbox


@@ -94,6 +94,42 @@ class WayTest < ActiveSupport::TestCase
     message_update = assert_raise(OSM::APIBadXMLError) {
       Way.from_xml(no_text, false)
     }
     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
+    assert_match /Must specify a string with one or more characters/, message_update.message
+  end
+  
+  def test_from_xml_no_k_v
+    nokv = "<osm><way id='23' changeset='23' version='23'><tag /></way></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Way.from_xml(nokv, true)
+    }
+    assert_match /tag is missing key/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Way.from_xml(nokv, false)
+    }
+    assert_match /tag is missing key/, message_update.message
+  end
+  
+  def test_from_xml_no_v
+    no_v = "<osm><way id='23' changeset='23' version='23'><tag k='key' /></way></osm>"
+    message_create = assert_raise(OSM::APIBadXMLError) {
+      Way.from_xml(no_v, true)
+    }
+    assert_match /tag is missing value/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Way.from_xml(no_v, false)
+    }
+    assert_match /tag is missing value/, message_update.message
+  end
+  
+  def test_from_xml_duplicate_k
+    dupk = "<osm><way id='23' changeset='23' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></way></osm>"
+    message_create = assert_raise(OSM::APIDuplicateTagsError) {
+      Way.from_xml(dupk, true)
+    }
+    assert_equal "Element way/ has duplicate tags with key dup", message_create.message
+    message_update = assert_raise(OSM::APIDuplicateTagsError) {
+      Way.from_xml(dupk, false)
+    }
+    assert_equal "Element way/23 has duplicate tags with key dup", message_update.message

   end
 end
   end
 end