X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/66d74a8c2c5713cc6c8e22d2a6db3b64de2ae875..5708c25e04a3d31796771fbcb44485bf601cec8b:/test/models/node_test.rb diff --git a/test/models/node_test.rb b/test/models/node_test.rb index bd664cfca..5f63251ee 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -1,51 +1,58 @@ require "test_helper" class NodeTest < ActiveSupport::TestCase - api_fixtures - def test_node_too_far_north node = build(:node, :latitude => 90.01 * OldNode::SCALE) - assert_equal false, node.valid? + node.validate + assert node.errors.full_messages.include?("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_equal false, node.errors.full_messages.include?("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 node.errors.full_messages.include?("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_equal false, node.errors.full_messages.include?("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 node.errors.full_messages.include?("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_equal false, node.errors.full_messages.include?("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 node.errors.full_messages.include?("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_equal false, node.errors.full_messages.include?("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 node.errors.full_messages.include?("Node is not in the world") end def test_lat_lon @@ -65,8 +72,8 @@ class NodeTest < ActiveSupport::TestCase 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 + 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 @@ -168,14 +175,14 @@ class NodeTest < ActiveSupport::TestCase version = 1 noid = "" # First try a create which doesn't need the id - assert_nothing_raised(OSM::APIBadXMLError) do + 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) do Node.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_lat @@ -183,11 +190,11 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolat, 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) end - assert_match /lat missing/, message_update.message + assert_match(/lat missing/, message_update.message) end def test_from_xml_no_lon @@ -195,11 +202,11 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nolon, 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) end - assert_match /lon missing/, message_update.message + assert_match(/lon missing/, message_update.message) end def test_from_xml_no_changeset_id @@ -207,22 +214,22 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 Node.from_xml(no_version, true) 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 + assert_match(/Version is required when updating/, message_update.message) end def test_from_xml_double_lat @@ -230,24 +237,24 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.from_xml(nocs, 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) 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 id_list = ["", "0", "00", "0.0", "a"] id_list.each do |id| zero_id = "" - assert_nothing_raised(OSM::APIBadUserInput) do + assert_nothing_raised do Node.from_xml(zero_id, true) 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 + assert_match(/ID of node cannot be zero when updating/, message_update.message) end end @@ -256,11 +263,11 @@ class NodeTest < ActiveSupport::TestCase 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 + 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) 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 @@ -280,11 +287,11 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 @@ -292,11 +299,11 @@ class NodeTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Node.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 Node.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 @@ -333,29 +340,36 @@ class NodeTest < ActiveSupport::TestCase end def test_containing_relation_members - node = current_nodes(:node_used_by_relationship) + 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 1, crm.first.relation_id + 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 1, crm.first.relation.id - assert_equal 2, crm.second.relation_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 2, crm.second.relation.id - assert_equal 3, crm.third.relation_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 3, crm.third.relation.id + assert_equal relation_member3.relation_id, crm.third.relation.id end def test_containing_relations - node = current_nodes(:node_used_by_relationship) + 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 1, cr.first.id - assert_equal 2, cr.second.id - assert_equal 3, cr.third.id + 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