X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..86822ea225baf400c7978b0d459b821dbe17e293:/test/models/way_test.rb diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 4fa18f9b8..4519ebba8 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -1,20 +1,17 @@ require "test_helper" 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 - node = current_nodes(:used_node_1) - [:visible_way, - :invisible_way, - :used_way].each do |way_symbol| - way = current_ways(way_symbol) + 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" @@ -25,18 +22,21 @@ class WayTest < ActiveSupport::TestCase # 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 - way = Way.find(current_ways(:visible_way).id) assert way.valid? # it already has 1 node - 1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) do - way.add_nd_num(current_nodes(:used_node_1).id) - way.add_nd_num(current_nodes(:used_node_2).id) + 1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do + way.add_nd_num(node_a.id) + way.add_nd_num(node_b.id) end way.save # print way.nds.size assert way.valid? - way.add_nd_num(current_nodes(:visible_node).id) + way.add_nd_num(node_c.id) assert way.valid? end @@ -137,64 +137,85 @@ class WayTest < ActiveSupport::TestCase 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 - 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 - 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 - 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 - 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 - 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 - 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) - 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 - way = current_ways(:way_with_versions) + way = create(:way) + taglist = create_list(:way_tag, 2, :way => way) 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 - 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) # assert_equal 1, crm.size - assert_equal 1, crm.first.relation_id + 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 1, crm.first.relation.id + assert_equal relation.id, crm.first.relation.id 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 - assert_equal 1, cr.first.id + assert_equal relation.id, cr.first.id end end