X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a3130ec61187636fe5b0aabece6a94ebf7bb476..7377cb63939f8743ca31e67ea3965c2b15d20057:/test/models/node_test.rb?ds=inline diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 2afff3358..a68be4aa9 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -1,8 +1,6 @@ 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? @@ -48,16 +46,38 @@ class NodeTest < ActiveSupport::TestCase assert_equal false, node.valid? end + 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 + + # 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, + :changeset_id => changeset.id, :visible => 1, :version => 1 ) - assert node_template.create_with_history(changesets(:normal_user_first_change).user) + assert node_template.create_with_history(changeset.user) node = Node.find(node_template.id) assert_not_nil node @@ -146,7 +166,7 @@ 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 @@ -194,7 +214,7 @@ class NodeTest < ActiveSupport::TestCase 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 @@ -219,7 +239,7 @@ class NodeTest < ActiveSupport::TestCase 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 @@ -311,29 +331,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