X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a5b296a298dd1aab608842687b5520fb33acd105..ca596106f5e2a42940db5bbdf45a677b328794d6:/test/models/node_test.rb?ds=sidebyside diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 9ad968ae9..c53f0ee1d 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -1,90 +1,83 @@ -require 'test_helper' +require "test_helper" class NodeTest < ActiveSupport::TestCase - api_fixtures - - def test_node_count - assert_equal 18, Node.count - end - def test_node_too_far_north - invalid_node_test(:node_too_far_north) + node = build(:node, :latitude => 90.01 * OldNode::SCALE) + assert_equal false, node.valid? end - + def test_node_north_limit - valid_node_test(:node_north_limit) + node = build(:node, :latitude => 90 * OldNode::SCALE) + assert node.valid? end - + def test_node_too_far_south - invalid_node_test(:node_too_far_south) + node = build(:node, :latitude => -90.01 * OldNode::SCALE) + assert_equal false, node.valid? end - + def test_node_south_limit - valid_node_test(:node_south_limit) + node = build(:node, :latitude => -90 * OldNode::SCALE) + assert node.valid? end - + def test_node_too_far_west - invalid_node_test(:node_too_far_west) + node = build(:node, :longitude => -180.01 * OldNode::SCALE) + assert_equal false, node.valid? end - + def test_node_west_limit - valid_node_test(:node_west_limit) + node = build(:node, :longitude => -180 * OldNode::SCALE) + assert node.valid? end - + def test_node_too_far_east - invalid_node_test(:node_too_far_east) + node = build(:node, :longitude => 180.01 * OldNode::SCALE) + assert_equal false, node.valid? end - + def test_node_east_limit - valid_node_test(:node_east_limit) + node = build(:node, :longitude => 180 * OldNode::SCALE) + assert node.valid? end - + def test_totally_wrong - invalid_node_test(:node_totally_wrong) + node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE) + assert_equal false, node.valid? end - - # This helper method will check to make sure that a node is within the world, and - # has the the same lat, lon and timestamp than what was put into the db by - # the fixture - def valid_node_test(nod) - node = current_nodes(nod) - dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE - assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.timestamp, node.timestamp - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon) - assert node.valid? + + def test_lat_lon + node = build(:node, :latitude => 12.345 * OldNode::SCALE, :longitude => 34.567 * OldNode::SCALE) + + assert_in_delta 12.345, node.lat, 0.0000001 + assert_in_delta 34.567, node.lon, 0.0000001 + + node.lat = 54.321 + node.lon = 76.543 + + assert_in_delta 54.321 * OldNode::SCALE, node.latitude, 0.000001 + assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001 end - - # This helper method will check to make sure that a node is outwith the world, - # and has the same lat, lon and timesamp than what was put into the db by the - # fixture - def invalid_node_test(nod) - node = current_nodes(nod) - dbnode = Node.find(node.id) - assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE - assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.timestamp, node.timestamp - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon) - assert_equal false, dbnode.valid? + + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_xml_format + node = build(:node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE) + + assert_match(/lat="0.0000400"/, node.to_xml.to_s) + assert_match(/lon="0.0000800"/, node.to_xml.to_s) end - + # Check that you can create a node and store it def test_create + changeset = create(:changeset) node_template = Node.new( :latitude => 12.3456, :longitude => 65.4321, - :changeset_id => changesets(:normal_user_first_change).id, - :visible => 1, + :changeset_id => changeset.id, + :visible => 1, :version => 1 ) - assert node_template.create_with_history(users(:normal_user)) + assert node_template.create_with_history(changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -106,17 +99,18 @@ class NodeTest < ActiveSupport::TestCase end def test_update - node_template = Node.find(current_nodes(:visible_node).id) - assert_not_nil node_template + node = create(:node) + create(:old_node, :node_id => node.id, :version => 1) + node_template = Node.find(node.id) + assert_not_nil node_template assert_equal OldNode.where(:node_id => node_template.id).count, 1 - node = Node.find(node_template.id) assert_not_nil node node_template.latitude = 12.3456 node_template.longitude = 65.4321 - #node_template.tags = "updated=yes" - assert node.update_from(node_template, users(:normal_user)) + # node_template.tags = "updated=yes" + assert node.update_from(node_template, node.changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -124,7 +118,7 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.longitude, node.longitude assert_equal node_template.changeset_id, node.changeset_id assert_equal node_template.visible, node.visible - #assert_equal node_template.tags, node.tags + # assert_equal node_template.tags, node.tags assert_equal OldNode.where(:node_id => node_template.id).count, 2 old_node = OldNode.where(:node_id => node_template.id, :version => 2).first @@ -133,18 +127,19 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.longitude, old_node.longitude assert_equal node_template.changeset_id, old_node.changeset_id assert_equal node_template.visible, old_node.visible - #assert_equal node_template.tags, old_node.tags + # assert_equal node_template.tags, old_node.tags end def test_delete - node_template = Node.find(current_nodes(:visible_node)) - assert_not_nil node_template + node = create(:node) + create(:old_node, :node_id => node.id, :version => 1) + node_template = Node.find(node.id) + assert_not_nil node_template assert_equal OldNode.where(:node_id => node_template.id).count, 1 - node = Node.find(node_template.id) assert_not_nil node - assert node.delete_with_history!(node_template, users(:normal_user)) + assert node.delete_with_history!(node_template, node.changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -152,7 +147,7 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.longitude, node.longitude assert_equal node_template.changeset_id, node.changeset_id assert_equal false, node.visible - #assert_equal node_template.tags, node.tags + # assert_equal node_template.tags, node.tags assert_equal OldNode.where(:node_id => node_template.id).count, 2 old_node = OldNode.where(:node_id => node_template.id, :version => 2).first @@ -161,9 +156,9 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.longitude, old_node.longitude assert_equal node_template.changeset_id, old_node.changeset_id assert_equal false, old_node.visible - #assert_equal node_template.tags, old_node.tags + # assert_equal node_template.tags, old_node.tags end - + def test_from_xml_no_id lat = 56.7 lon = -2.3 @@ -171,164 +166,201 @@ class NodeTest < ActiveSupport::TestCase version = 1 noid = "" # First try a create which doesn't need the id - assert_nothing_raised(OSM::APIBadXMLError) { + assert_nothing_raised do Node.from_xml(noid, true) - } + end # Now try an update with no id, and make sure that it gives the appropriate exception - message = assert_raise(OSM::APIBadXMLError) { + message = assert_raise(OSM::APIBadXMLError) do Node.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_lat nolat = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolat, true) - } - assert_match /lat missing/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/lat missing/, message_create.message) + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolat, false) - } - assert_match /lat missing/, message_update.message + end + assert_match(/lat missing/, message_update.message) end - + def test_from_xml_no_lon nolon = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolon, true) - } - assert_match /lon missing/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/lon missing/, message_create.message) + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolon, false) - } - assert_match /lon missing/, message_update.message + end + assert_match(/lon missing/, message_update.message) end def test_from_xml_no_changeset_id nocs = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 = "" - assert_nothing_raised(OSM::APIBadXMLError) { + assert_nothing_raised do Node.from_xml(no_version, true) - } - message_update = assert_raise(OSM::APIBadXMLError) { + end + message_update = assert_raise(OSM::APIBadXMLError) do Node.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_double_lat nocs = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nocs, true) - } - assert_match /Fatal error: Attribute lat redefined at/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/Fatal error: Attribute lat redefined at/, message_create.message) + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nocs, false) - } - assert_match /Fatal error: Attribute lat redefined at/, message_update.message + end + assert_match(/Fatal error: Attribute lat redefined at/, 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) { + assert_nothing_raised do Node.from_xml(zero_id, true) - } - message_update = assert_raise(OSM::APIBadUserInput) { + end + message_update = assert_raise(OSM::APIBadUserInput) do Node.from_xml(zero_id, false) - } - assert_match /ID of node cannot be zero when updating/, message_update.message + end + assert_match(/ID of node cannot be zero when updating/, message_update.message) end end - + def test_from_xml_no_text no_text = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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_node no_node = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(no_node, true) - } - assert_match /XML doesn't contain an osm\/node element/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match %r{XML doesn't contain an osm/node element}, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(no_node, false) - } - assert_match /XML doesn't contain an osm\/node element/, message_update.message + end + assert_match %r{XML doesn't contain an osm/node element}, message_update.message end - + def test_from_xml_no_k_v nokv = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 = "" - message_create = assert_raise(OSM::APIDuplicateTagsError) { + message_create = assert_raise(OSM::APIDuplicateTagsError) do Node.from_xml(dupk, true) - } + end assert_equal "Element node/ has duplicate tags with key dup", message_create.message - message_update = assert_raise(OSM::APIDuplicateTagsError) { + message_update = assert_raise(OSM::APIDuplicateTagsError) do Node.from_xml(dupk, false) - } + end assert_equal "Element node/23 has duplicate tags with key dup", message_update.message end def test_node_tags - node = current_nodes(:node_with_versions) + node = create(:node) + taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).node_tags.order(:k) - assert_equal 2, tags.count - assert_equal "testing", tags[0].k - assert_equal "added in node version 3", tags[0].v - assert_equal "testing two", tags[1].k - assert_equal "modified in node 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 - node = current_nodes(:node_with_versions) + node = create(:node) + taglist = create_list(:node_tag, 2, :node => node) tags = Node.find(node.id).tags - assert_equal 2, tags.size - assert_equal "added in node version 3", tags["testing"] - assert_equal "modified in node 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 + node = create(:node) + relation_member1 = create(:relation_member, :member => node) + relation_member2 = create(:relation_member, :member => node) + relation_member3 = create(:relation_member, :member => node) + crm = Node.find(node.id).containing_relation_members.order(:relation_id) + # assert_equal 3, crm.size + assert_equal relation_member1.relation_id, crm.first.relation_id + assert_equal "Node", crm.first.member_type + assert_equal node.id, crm.first.member_id + assert_equal relation_member1.relation_id, crm.first.relation.id + assert_equal relation_member2.relation_id, crm.second.relation_id + assert_equal "Node", crm.second.member_type + assert_equal node.id, crm.second.member_id + assert_equal relation_member2.relation_id, crm.second.relation.id + assert_equal relation_member3.relation_id, crm.third.relation_id + assert_equal "Node", crm.third.member_type + assert_equal node.id, crm.third.member_id + assert_equal relation_member3.relation_id, crm.third.relation.id + end + + def test_containing_relations + node = create(:node) + relation_member1 = create(:relation_member, :member => node) + relation_member2 = create(:relation_member, :member => node) + relation_member3 = create(:relation_member, :member => node) + cr = Node.find(node.id).containing_relations.order(:id) + + assert_equal 3, cr.size + assert_equal relation_member1.relation.id, cr.first.id + assert_equal relation_member2.relation.id, cr.second.id + assert_equal relation_member3.relation.id, cr.third.id end end