X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e8c0d471fbefa97d1dd4fb5c5749280a4187f88..d1a29bade4facd38e67c22ee58a02bfdba742ab7:/test/models/way_test.rb?ds=sidebyside diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 341353046..3c44f2f26 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -1,14 +1,6 @@ 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 = create(:node) visible_way = create(:way) @@ -35,10 +27,9 @@ class WayTest < ActiveSupport::TestCase 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 + 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 @@ -51,13 +42,13 @@ class WayTest < ActiveSupport::TestCase def test_from_xml_no_id noid = "" - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Way.from_xml(noid, true) end message = assert_raise(OSM::APIBadXMLError) do Way.from_xml(noid, false) end - assert_match /ID is required when updating/, message.message + assert_match(/ID is required when updating/, message.message) end def test_from_xml_no_changeset_id @@ -65,35 +56,35 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nocs, true) end - assert_match /Changeset id is missing/, message_create.message + assert_match(/Changeset id is missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nocs, false) end - assert_match /Changeset id is missing/, message_update.message + assert_match(/Changeset id is missing/, message_update.message) end def test_from_xml_no_version no_version = "" - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Way.from_xml(no_version, true) end message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_version, false) end - assert_match /Version is required when updating/, message_update.message + 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 = "" - assert_nothing_raised(OSM::APIBadUserInput) do + assert_nothing_raised do Way.from_xml(zero_id, true) end message_update = assert_raise(OSM::APIBadUserInput) do Way.from_xml(zero_id, false) end - assert_match /ID of way cannot be zero when updating/, message_update.message + assert_match(/ID of way cannot be zero when updating/, message_update.message) end end @@ -102,11 +93,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_text, true) end - 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_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_text, false) end - assert_match /Must specify a string with one or more characters/, message_update.message + assert_match(/Must specify a string with one or more characters/, message_update.message) end def test_from_xml_no_k_v @@ -114,11 +105,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nokv, true) end - assert_match /tag is missing key/, message_create.message + assert_match(/tag is missing key/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nokv, false) end - assert_match /tag is missing key/, message_update.message + assert_match(/tag is missing key/, message_update.message) end def test_from_xml_no_v @@ -126,11 +117,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_v, true) end - assert_match /tag is missing value/, message_create.message + assert_match(/tag is missing value/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_v, false) end - assert_match /tag is missing value/, message_update.message + assert_match(/tag is missing value/, message_update.message) end def test_from_xml_duplicate_k @@ -146,34 +137,46 @@ 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 11, 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 11, 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 11, 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 taglist.count, tags.count @@ -184,7 +187,7 @@ class WayTest < ActiveSupport::TestCase 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 taglist.count, tags.count @@ -194,19 +197,25 @@ class WayTest < ActiveSupport::TestCase 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