X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..be9d93640c9303cce9b4789e365eafa15a740b1b:/test/models/node_test.rb diff --git a/test/models/node_test.rb b/test/models/node_test.rb index a68be4aa9..9efe9a9c9 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -3,47 +3,56 @@ require "test_helper" class NodeTest < ActiveSupport::TestCase def test_node_too_far_north node = build(:node, :latitude => 90.01 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_north_limit node = build(:node, :latitude => 90 * OldNode::SCALE) - assert node.valid? + node.validate + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_south node = build(:node, :latitude => -90.01 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_south_limit node = build(:node, :latitude => -90 * OldNode::SCALE) - assert node.valid? + node.validate + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_west node = build(:node, :longitude => -180.01 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_west_limit node = build(:node, :longitude => -180 * OldNode::SCALE) - assert node.valid? + node.validate + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_east node = build(:node, :longitude => 180.01 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_east_limit node = build(:node, :longitude => 180 * OldNode::SCALE) - assert node.valid? + node.validate + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_totally_wrong node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert_includes node.errors.full_messages, "Node is not in the world" end def test_lat_lon @@ -59,24 +68,14 @@ class NodeTest < ActiveSupport::TestCase assert_in_delta 76.543 * OldNode::SCALE, node.longitude, 0.000001 end - # 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 => changeset.id, - :visible => 1, - :version => 1 - ) + node_template = build(:node, :lat => 12.3456, + :lon => 65.4321, + :changeset_id => changeset.id, + :visible => true, + :version => 1) assert node_template.create_with_history(changeset.user) node = Node.find(node_template.id) @@ -87,8 +86,8 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.visible, node.visible assert_equal node_template.timestamp.to_i, node.timestamp.to_i - assert_equal OldNode.where(:node_id => node_template.id).count, 1 - old_node = OldNode.where(:node_id => node_template.id).first + assert_equal(1, OldNode.where(:node_id => node_template.id).count) + old_node = OldNode.find_by(:node_id => node_template.id, :version => 1) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude @@ -99,16 +98,17 @@ class NodeTest < ActiveSupport::TestCase end def test_update - node = create(:node) - create(:old_node, :node_id => node.id, :version => 1) + node = create(:node, :lat => 12.6543, :lon => 65.1234) + create(:old_node, :node_id => node.id, :version => 1, :lat => node.lat, :lon => node.lon) + node_template = Node.find(node.id) assert_not_nil node_template - assert_equal OldNode.where(:node_id => node_template.id).count, 1 + assert_equal(1, OldNode.where(:node_id => node_template.id).count) assert_not_nil node - node_template.latitude = 12.3456 - node_template.longitude = 65.4321 + node_template.lat = 12.3456 + node_template.lon = 65.4321 # node_template.tags = "updated=yes" assert node.update_from(node_template, node.changeset.user) @@ -120,8 +120,8 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.visible, node.visible # 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 + assert_equal(2, OldNode.where(:node_id => node_template.id).count) + old_node = OldNode.find_by(:node_id => node_template.id, :version => 2) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude @@ -136,7 +136,7 @@ class NodeTest < ActiveSupport::TestCase node_template = Node.find(node.id) assert_not_nil node_template - assert_equal OldNode.where(:node_id => node_template.id).count, 1 + assert_equal(1, OldNode.where(:node_id => node_template.id).count) assert_not_nil node assert node.delete_with_history!(node_template, node.changeset.user) @@ -146,16 +146,16 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.latitude, node.latitude assert_equal node_template.longitude, node.longitude assert_equal node_template.changeset_id, node.changeset_id - assert_equal false, node.visible + assert_not node.visible # 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 + assert_equal(2, OldNode.where(:node_id => node_template.id).count) + old_node = OldNode.find_by(:node_id => node_template.id, :version => 2) assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude 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_not old_node.visible # assert_equal node_template.tags, old_node.tags end @@ -167,72 +167,72 @@ class NodeTest < ActiveSupport::TestCase noid = "" # First try a create which doesn't need the id assert_nothing_raised do - Node.from_xml(noid, true) + Node.from_xml(noid, :create => true) end # Now try an update with no id, and make sure that it gives the appropriate exception message = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(noid, false) + Node.from_xml(noid, :create => 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_lat nolat = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolat, true) + Node.from_xml(nolat, :create => true) end - assert_match /lat missing/, message_create.message + assert_match(/lat missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolat, false) + Node.from_xml(nolat, :create => false) end - assert_match /lat missing/, message_update.message + assert_match(/lat missing/, message_update.message) end def test_from_xml_no_lon nolon = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolon, true) + Node.from_xml(nolon, :create => true) end - assert_match /lon missing/, message_create.message + assert_match(/lon missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolon, false) + Node.from_xml(nolon, :create => false) end - assert_match /lon missing/, message_update.message + assert_match(/lon missing/, message_update.message) end def test_from_xml_no_changeset_id nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, true) + Node.from_xml(nocs, :create => 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 - Node.from_xml(nocs, false) + Node.from_xml(nocs, :create => 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 do - Node.from_xml(no_version, true) + Node.from_xml(no_version, :create => true) end message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_version, false) + Node.from_xml(no_version, :create => 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_double_lat nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, true) + Node.from_xml(nocs, :create => true) end - assert_match /Fatal error: Attribute lat redefined at/, message_create.message + assert_match(/Fatal error: Attribute lat redefined at/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, false) + Node.from_xml(nocs, :create => false) end - assert_match /Fatal error: Attribute lat redefined at/, message_update.message + assert_match(/Fatal error: Attribute lat redefined at/, message_update.message) end def test_from_xml_id_zero @@ -240,35 +240,35 @@ class NodeTest < ActiveSupport::TestCase id_list.each do |id| zero_id = "" assert_nothing_raised do - Node.from_xml(zero_id, true) + Node.from_xml(zero_id, :create => true) end message_update = assert_raise(OSM::APIBadUserInput) do - Node.from_xml(zero_id, false) + Node.from_xml(zero_id, :create => false) end - assert_match /ID of node cannot be zero when updating/, message_update.message + 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) do - Node.from_xml(no_text, true) + Node.from_xml(no_text, :create => 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 - Node.from_xml(no_text, false) + Node.from_xml(no_text, :create => 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_node no_node = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_node, true) + Node.from_xml(no_node, :create => true) 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) + Node.from_xml(no_node, :create => false) end assert_match %r{XML doesn't contain an osm/node element}, message_update.message end @@ -276,35 +276,35 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nokv, true) + Node.from_xml(nokv, :create => 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 - Node.from_xml(nokv, false) + Node.from_xml(nokv, :create => 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 no_v = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_v, true) + Node.from_xml(no_v, :create => 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 - Node.from_xml(no_v, false) + Node.from_xml(no_v, :create => 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 dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) do - Node.from_xml(dupk, true) + Node.from_xml(dupk, :create => true) end assert_equal "Element node/ has duplicate tags with key dup", message_create.message message_update = assert_raise(OSM::APIDuplicateTagsError) do - Node.from_xml(dupk, false) + Node.from_xml(dupk, :create => false) end assert_equal "Element node/23 has duplicate tags with key dup", message_update.message end @@ -363,4 +363,86 @@ class NodeTest < ActiveSupport::TestCase assert_equal relation_member2.relation.id, cr.second.id assert_equal relation_member3.relation.id, cr.third.id end + + test "raises missing changeset exception when creating" do + user = create(:user) + node = Node.new + assert_raises OSM::APIChangesetMissingError do + node.create_with_history(user) + end + end + + test "raises user-changeset mismatch exception when creating" do + user = create(:user) + changeset = create(:changeset) + node = Node.new(:changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + node.create_with_history(user) + end + end + + test "raises already closed changeset exception when creating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + node = Node.new(:changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + node.create_with_history(user) + end + end + + test "raises id precondition exception when updating" do + user = create(:user) + node = Node.new(:id => 23) + new_node = Node.new(:id => 42) + assert_raises OSM::APIPreconditionFailedError do + node.update_from(new_node, user) + end + end + + test "raises version mismatch exception when updating" do + user = create(:user) + node = Node.new(:id => 42, :version => 7) + new_node = Node.new(:id => 42, :version => 12) + assert_raises OSM::APIVersionMismatchError do + node.update_from(new_node, user) + end + end + + test "raises missing changeset exception when updating" do + user = create(:user) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12) + assert_raises OSM::APIChangesetMissingError do + node.update_from(new_node, user) + end + end + + test "raises user-changeset mismatch exception when updating" do + user = create(:user) + changeset = create(:changeset) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIUserChangesetMismatchError do + node.update_from(new_node, user) + end + end + + test "raises already closed changeset exception when updating" do + user = create(:user) + changeset = create(:changeset, :closed, :user => user) + node = Node.new(:id => 42, :version => 12) + new_node = Node.new(:id => 42, :version => 12, :changeset => changeset) + assert_raises OSM::APIChangesetAlreadyClosedError do + node.update_from(new_node, user) + end + end + + test "raises id precondition exception when deleting" do + user = create(:user) + node = Node.new(:id => 23, :visible => true) + new_node = Node.new(:id => 42, :visible => false) + assert_raises OSM::APIPreconditionFailedError do + node.delete_with_history!(new_node, user) + end + end end