X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a3eb48385bcf1465339d473c0c1657e075cd507d..443080d7b05b5e2cc3310699f5e9d5edde010aca:/test/models/node_test.rb diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 7acc6168f..ff833d0ed 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -1,50 +1,50 @@ -require 'test_helper' +require "test_helper" class NodeTest < ActiveSupport::TestCase api_fixtures - + def test_node_count - assert_equal 18, Node.count + assert_equal 19, Node.count end def test_node_too_far_north invalid_node_test(:node_too_far_north) end - + def test_node_north_limit valid_node_test(:node_north_limit) end - + def test_node_too_far_south invalid_node_test(:node_too_far_south) end - + def test_node_south_limit valid_node_test(:node_south_limit) end - + def test_node_too_far_west invalid_node_test(:node_too_far_west) end - + def test_node_west_limit valid_node_test(:node_west_limit) end - + def test_node_too_far_east invalid_node_test(:node_too_far_east) end - + def test_node_east_limit valid_node_test(:node_east_limit) end - + def test_totally_wrong invalid_node_test(:node_totally_wrong) 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 + # 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) @@ -55,11 +55,11 @@ class NodeTest < ActiveSupport::TestCase 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 node.tile, QuadTile.tile_for_point(node.lat, node.lon) assert node.valid? end - - # This helper method will check to make sure that a node is outwith the world, + + # 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) @@ -71,17 +71,17 @@ class NodeTest < ActiveSupport::TestCase 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 node.tile, QuadTile.tile_for_point(node.lat, node.lon) assert_equal false, dbnode.valid? end - + # Check that you can create a node and store it def test_create node_template = Node.new( :latitude => 12.3456, :longitude => 65.4321, :changeset_id => changesets(:normal_user_first_change).id, - :visible => 1, + :visible => 1, :version => 1 ) assert node_template.create_with_history(users(:normal_user)) @@ -115,7 +115,7 @@ class NodeTest < ActiveSupport::TestCase node_template.latitude = 12.3456 node_template.longitude = 65.4321 - #node_template.tags = "updated=yes" + # node_template.tags = "updated=yes" assert node.update_from(node_template, users(:normal_user)) node = Node.find(node_template.id) @@ -124,7 +124,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,11 +133,11 @@ 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)) + node_template = Node.find(current_nodes(:visible_node).id) assert_not_nil node_template assert_equal OldNode.where(:node_id => node_template.id).count, 1 @@ -152,7 +152,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 +161,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,146 +171,146 @@ 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(OSM::APIBadXMLError) 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) - } + 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) - } + end assert_match /lat missing/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolat, false) - } + 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) - } + end assert_match /lon missing/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolon, false) - } + 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) - } + end assert_match /Changeset id is missing/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nocs, false) - } + 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(OSM::APIBadXMLError) 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) - } + 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) - } + end assert_match /Fatal error: Attribute lat redefined at/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nocs, false) - } + 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(OSM::APIBadUserInput) 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) - } + 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) - } + end assert_match /Must specify a string with one or more characters/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(no_text, false) - } + 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) - } + end assert_match /tag is missing key/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nokv, false) - } + 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) - } + end assert_match /tag is missing value/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Node.from_xml(no_v, false) - } + 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 @@ -318,7 +318,7 @@ class NodeTest < ActiveSupport::TestCase node = current_nodes(:node_with_versions) tags = Node.find(node.id).node_tags.order(:k) assert_equal 2, tags.count - assert_equal "testing", tags[0].k + 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 @@ -335,7 +335,7 @@ class NodeTest < ActiveSupport::TestCase def test_containing_relation_members node = current_nodes(:node_used_by_relationship) crm = Node.find(node.id).containing_relation_members.order(:relation_id) -# assert_equal 3, crm.size + # assert_equal 3, crm.size assert_equal 1, crm.first.relation_id assert_equal "Node", crm.first.member_type assert_equal node.id, crm.first.member_id