Merge branch 'master' into tag-colour-preview-rebase

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

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 69529e654e5cd9d74bd7e55dee20336180f07aa9..3c44f2f26bd6ddb5975920b2e6948038defb5e4f 100644 (file)
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,200 +1,221 @@
-require 'test_helper'
+require "test_helper"

 
 class WayTest < ActiveSupport::TestCase
 
 class WayTest < ActiveSupport::TestCase

-  api_fixtures
-
-  # 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 7, Way.count
-  end
-

   def test_bbox
   def test_bbox

-    node = current_nodes(:used_node_1)
-    [ :visible_way,
-      :invisible_way,
-      :used_way ].each do |way_symbol|
-      way = current_ways(way_symbol)
-      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'
+    node = create(:node)
+    visible_way = create(:way)
+    create(:way_node, :way => visible_way, :node => node)
+    invisible_way = create(:way, :deleted)
+    create(:way_node, :way => invisible_way, :node => node)
+    used_way = create(:way)
+    create(:way_node, :way => used_way, :node => node)
+    create(:relation_member, :member => used_way)
+
+    [visible_way, invisible_way, used_way].each do |way|
+      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
 
   # Check that the preconditions fail when you are over the defined limit of
   # the maximum number of nodes in each way.
   def test_max_nodes_per_way_limit
     end
   end
 
   # Check that the preconditions fail when you are over the defined limit of
   # the maximum number of nodes in each way.
   def test_max_nodes_per_way_limit

+    node_a = create(:node)
+    node_b = create(:node)
+    node_c = create(:node)
+    way = create(:way_with_nodes, :nodes_count => 1)

     # Take one of the current ways and add nodes to it until we are near the limit
     # Take one of the current ways and add nodes to it until we are near the limit

-    way = Way.find(current_ways(:visible_way).id)

     assert way.valid?
     # it already has 1 node
     assert way.valid?
     # it already has 1 node

-    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)
-    }
+    1.upto(Settings.max_number_of_way_nodes / 2) do
+      way.add_nd_num(node_a.id)
+      way.add_nd_num(node_b.id)
+    end

     way.save
     way.save

-    #print way.nds.size
+    # print way.nds.size

     assert way.valid?
     assert way.valid?

-    way.add_nd_num(current_nodes(:visible_node).id)
+    way.add_nd_num(node_c.id)

     assert way.valid?
   end
 
   def test_from_xml_no_id
     noid = "<osm><way version='12' changeset='23' /></osm>"
     assert way.valid?
   end
 
   def test_from_xml_no_id
     noid = "<osm><way version='12' changeset='23' /></osm>"

-    assert_nothing_raised(OSM::APIBadXMLError) {
+    assert_nothing_raised do

       Way.from_xml(noid, true)
       Way.from_xml(noid, true)

-    }
-    message = assert_raise(OSM::APIBadXMLError) {
+    end
+    message = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(noid, false)
       Way.from_xml(noid, false)

-    }
-    assert_match /ID is required when updating/, message.message
+    end
+    assert_match(/ID is required when updating/, message.message)

   end
 
   def test_from_xml_no_changeset_id
     nocs = "<osm><way id='123' version='23' /></osm>"
   end
 
   def test_from_xml_no_changeset_id
     nocs = "<osm><way id='123' version='23' /></osm>"

-    message_create = assert_raise(OSM::APIBadXMLError) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(nocs, true)
       Way.from_xml(nocs, true)

-    }
-    assert_match /Changeset id is missing/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
+    end
+    assert_match(/Changeset id is missing/, message_create.message)
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(nocs, false)
       Way.from_xml(nocs, false)

-    }
-    assert_match /Changeset id is missing/, message_update.message
+    end
+    assert_match(/Changeset id is missing/, message_update.message)

   end
 
   def test_from_xml_no_version
     no_version = "<osm><way id='123' changeset='23' /></osm>"
   end
 
   def test_from_xml_no_version
     no_version = "<osm><way id='123' changeset='23' /></osm>"

-    assert_nothing_raised(OSM::APIBadXMLError) {
+    assert_nothing_raised do

       Way.from_xml(no_version, true)
       Way.from_xml(no_version, true)

-    }
-    message_update = assert_raise(OSM::APIBadXMLError) {
+    end
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(no_version, false)
       Way.from_xml(no_version, false)

-    }
-    assert_match /Version is required when updating/, message_update.message
+    end
+    assert_match(/Version is required when updating/, 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><way id='#{id}' changeset='33' version='23' /></osm>"
   end
 
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     id_list.each do |id|
       zero_id = "<osm><way id='#{id}' changeset='33' version='23' /></osm>"

-      assert_nothing_raised(OSM::APIBadUserInput) {
+      assert_nothing_raised do

         Way.from_xml(zero_id, true)
         Way.from_xml(zero_id, true)

-      }
-      message_update = assert_raise(OSM::APIBadUserInput) {
+      end
+      message_update = assert_raise(OSM::APIBadUserInput) do

         Way.from_xml(zero_id, false)
         Way.from_xml(zero_id, false)

-      }
-      assert_match /ID of way cannot be zero when updating/, message_update.message
+      end
+      assert_match(/ID of way cannot be zero when updating/, message_update.message)

     end
   end
 
   def test_from_xml_no_text
     no_text = ""
     end
   end
 
   def test_from_xml_no_text
     no_text = ""

-    message_create = assert_raise(OSM::APIBadXMLError) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(no_text, true)
       Way.from_xml(no_text, true)

-    }
-    assert_match /Must specify a string with one or more characters/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
+    end
+    assert_match(/Must specify a string with one or more characters/, message_create.message)
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(no_text, false)
       Way.from_xml(no_text, false)

-    }
-    assert_match /Must specify a string with one or more characters/, message_update.message
+    end
+    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>"
   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) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(nokv, true)
       Way.from_xml(nokv, true)

-    }
-    assert_match /tag is missing key/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
+    end
+    assert_match(/tag is missing key/, message_create.message)
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(nokv, false)
       Way.from_xml(nokv, false)

-    }
-    assert_match /tag is missing key/, message_update.message
+    end
+    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>"
   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) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(no_v, true)
       Way.from_xml(no_v, true)

-    }
-    assert_match /tag is missing value/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
+    end
+    assert_match(/tag is missing value/, message_create.message)
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Way.from_xml(no_v, false)
       Way.from_xml(no_v, false)

-    }
-    assert_match /tag is missing value/, message_update.message
+    end
+    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>"
   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) {
+    message_create = assert_raise(OSM::APIDuplicateTagsError) do

       Way.from_xml(dupk, true)
       Way.from_xml(dupk, true)

-    }
+    end

     assert_equal "Element way/ has duplicate tags with key dup", message_create.message
     assert_equal "Element way/ has duplicate tags with key dup", message_create.message

-    message_update = assert_raise(OSM::APIDuplicateTagsError) {
+    message_update = assert_raise(OSM::APIDuplicateTagsError) do

       Way.from_xml(dupk, false)
       Way.from_xml(dupk, false)

-    }
+    end

     assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
   end
 
   def test_way_nodes
     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)
+    way = create(:way)
+    node1 = create(:way_node, :way => way, :sequence_id => 1).node
+    node2 = create(:way_node, :way => way, :sequence_id => 2).node
+    node3 = create(:way_node, :way => way, :sequence_id => 3).node
+

     nodes = Way.find(way.id).way_nodes
     assert_equal 3, nodes.count
     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
+    assert_equal node1.id, nodes[0].node_id
+    assert_equal node2.id, nodes[1].node_id
+    assert_equal node3.id, nodes[2].node_id

   end
 
   def test_nodes
   end
 
   def test_nodes

-    way = current_ways(:way_with_multiple_nodes)
+    way = create(:way)
+    node1 = create(:way_node, :way => way, :sequence_id => 1).node
+    node2 = create(:way_node, :way => way, :sequence_id => 2).node
+    node3 = create(:way_node, :way => way, :sequence_id => 3).node
+

     nodes = Way.find(way.id).nodes
     assert_equal 3, nodes.count
     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
+    assert_equal node1.id, nodes[0].id
+    assert_equal node2.id, nodes[1].id
+    assert_equal node3.id, nodes[2].id

   end
 
   def test_nds
   end
 
   def test_nds

-    way = current_ways(:way_with_multiple_nodes)
+    way = create(:way)
+    node1 = create(:way_node, :way => way, :sequence_id => 1).node
+    node2 = create(:way_node, :way => way, :sequence_id => 2).node
+    node3 = create(:way_node, :way => way, :sequence_id => 3).node
+

     nodes = Way.find(way.id).nds
     assert_equal 3, nodes.count
     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]
+    assert_equal node1.id, nodes[0]
+    assert_equal node2.id, nodes[1]
+    assert_equal node3.id, nodes[2]

   end
 
   def test_way_tags
   end
 
   def test_way_tags

-    way = current_ways(:way_with_versions)
+    way = create(:way)
+    taglist = create_list(:way_tag, 2, :way => way)

     tags = Way.find(way.id).way_tags.order(:k)
     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
+    assert_equal taglist.count, tags.count
+    taglist.sort_by!(&:k).each_index do |i|
+      assert_equal taglist[i].k, tags[i].k
+      assert_equal taglist[i].v, tags[i].v
+    end

   end
 
   def test_tags
   end
 
   def test_tags

-    way = current_ways(:way_with_versions)
+    way = create(:way)
+    taglist = create_list(:way_tag, 2, :way => way)

     tags = Way.find(way.id).tags
     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"]
+    assert_equal taglist.count, tags.count
+    taglist.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end

   end
 
   def test_containing_relation_members
   end
 
   def test_containing_relation_members

-    way = current_ways(:used_way)
+    way = create(:way)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => way)
+

     crm = Way.find(way.id).containing_relation_members.order(:relation_id)
     crm = Way.find(way.id).containing_relation_members.order(:relation_id)

-#    assert_equal 1, crm.size
-    assert_equal 1, crm.first.relation_id
+    #    assert_equal 1, crm.size
+    assert_equal relation.id, crm.first.relation_id

     assert_equal "Way", crm.first.member_type
     assert_equal way.id, crm.first.member_id
     assert_equal "Way", crm.first.member_type
     assert_equal way.id, crm.first.member_id

-    assert_equal 1, crm.first.relation.id
+    assert_equal relation.id, crm.first.relation.id

   end
 
   def test_containing_relations
   end
 
   def test_containing_relations

-    way = current_ways(:used_way)
+    way = create(:way)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => way)
+

     cr = Way.find(way.id).containing_relations.order(:id)
     assert_equal 1, cr.size
     cr = Way.find(way.id).containing_relations.order(:id)
     assert_equal 1, cr.size

-    assert_equal 1, cr.first.id
+    assert_equal relation.id, cr.first.id

   end
 end
   end
 end