X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e4d7b3ee6631e1c5aee23ebe52adb32c716f5cbd..42b329ed82c7899b970e1f0fd8d6d29fd625f7d5:/test/unit/way_test.rb

diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb
index afbe36252..6b9237da7 100644
--- 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
-    assert_equal 4, Way.count
+    assert_equal 7, Way.count
   end
   
   def test_bbox
@@ -15,7 +15,10 @@ class WayTest < ActiveSupport::TestCase
       :invisible_way,
       :used_way ].each do |way_symbol|
       way = current_ways(way_symbol)
-      assert_equal node.bbox, way.bbox
+      assert_equal node.bbox.min_lon, way.bbox.min_lon, 'min_lon'
+      assert_equal node.bbox.min_lat, way.bbox.min_lat, 'min_lat'
+      assert_equal node.bbox.max_lon, way.bbox.max_lon, 'max_lon'
+      assert_equal node.bbox.max_lat, way.bbox.max_lat, 'max_lat'
     end
   end
   
@@ -26,7 +29,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((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)
     }
@@ -94,6 +97,87 @@ class WayTest < ActiveSupport::TestCase
     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
+
+  def test_way_nodes
+    way = current_ways(:way_with_multiple_nodes)
+    nodes = Way.find(way.id).way_nodes
+    assert_equal 3, nodes.count
+    assert_equal 4, nodes[0].node_id
+    assert_equal 15, nodes[1].node_id
+    assert_equal 6, nodes[2].node_id
+  end
+
+  def test_nodes
+    way = current_ways(:way_with_multiple_nodes)
+    nodes = Way.find(way.id).nodes
+    assert_equal 3, nodes.count
+    assert_equal 4, nodes[0].id
+    assert_equal 15, nodes[1].id
+    assert_equal 6, nodes[2].id
+  end
+
+  def test_nds
+    way = current_ways(:way_with_multiple_nodes)
+    nodes = Way.find(way.id).nds
+    assert_equal 3, nodes.count
+    assert_equal 4, nodes[0]
+    assert_equal 15, nodes[1]
+    assert_equal 6, nodes[2]
+  end
+
+  def test_way_tags
+    way = current_ways(:way_with_versions)
+    tags = Way.find(way.id).way_tags.order(:k)
+    assert_equal 2, tags.count
+    assert_equal "testing", tags[0].k 
+    assert_equal "added in way version 3", tags[0].v
+    assert_equal "testing two", tags[1].k
+    assert_equal "modified in way version 4", tags[1].v
+  end
+
+  def test_tags
+    way = current_ways(:way_with_versions)
+    tags = Way.find(way.id).tags
+    assert_equal 2, tags.size
+    assert_equal "added in way version 3", tags["testing"]
+    assert_equal "modified in way version 4", tags["testing two"]
   end
 end