X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..85b0098b1c694de2859ac2aa4b864a6cb947c916:/test/models/old_node_test.rb?ds=sidebyside diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb index 9adac9f81..42097c853 100644 --- a/test/models/old_node_test.rb +++ b/test/models/old_node_test.rb @@ -1,128 +1,133 @@ -require 'test_helper' +require "test_helper" class OldNodeTest < ActiveSupport::TestCase - api_fixtures - - def test_node_count - assert_equal 23, OldNode.count - end - def test_node_too_far_north - invalid_node_test(:node_too_far_north) + node = build(:old_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(:old_node, :latitude => 90 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_south - invalid_node_test(:node_too_far_south) + node = build(:old_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(:old_node, :latitude => -90 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_west - invalid_node_test(:node_too_far_west) + node = build(:old_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(:old_node, :longitude => -180 * OldNode::SCALE) + assert node.valid? end def test_node_too_far_east - invalid_node_test(:node_too_far_east) + node = build(:old_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(:old_node, :longitude => 180 * OldNode::SCALE) + assert node.valid? end def test_totally_wrong - invalid_node_test(:node_totally_wrong) + node = build(:old_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 = nodes(nod) - dbnode = Node.find(node.node_id) - assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE - assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - assert_equal dbnode.timestamp, node.timestamp - #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon) - assert node.valid? + def test_lat_lon + node = build(:old_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 helpermethod 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 = nodes(nod) - dbnode = Node.find(node.node_id) - assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE - assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE - assert_equal dbnode.changeset_id, node.changeset_id - assert_equal dbnode.version, node.version - assert_equal dbnode.visible, node.visible - assert_equal dbnode.timestamp, node.timestamp - #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon) - assert_equal false, node.valid? + # Ensure the lat/lon is formatted as a decimal e.g. not 4.0e-05 + def test_lat_lon_xml_format + old_node = build(:old_node, :latitude => 0.00004 * OldNode::SCALE, :longitude => 0.00008 * OldNode::SCALE) + + assert_match /lat="0.0000400"/, old_node.to_xml.to_s + assert_match /lon="0.0000800"/, old_node.to_xml.to_s end def test_node_tags - node = nodes(:node_with_versions_v1) + node_v1 = create(:old_node, :version => 1) + node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2) + node_v3 = create(:old_node, :node_id => node_v1.node_id, :version => 3) + node_v4 = create(:old_node, :node_id => node_v1.node_id, :version => 4) + taglist_v3 = create_list(:old_node_tag, 3, :old_node => node_v3) + taglist_v4 = create_list(:old_node_tag, 2, :old_node => node_v4) + + node = node_v1 tags = OldNode.find(node.id).old_tags.order(:k) assert_equal 0, tags.count - node = nodes(:node_with_versions_v2) + node = node_v2 tags = OldNode.find(node.id).old_tags.order(:k) assert_equal 0, tags.count - node = nodes(:node_with_versions_v3) + node = node_v3 tags = OldNode.find(node.id).old_tags.order(:k) - assert_equal 3, tags.count - assert_equal "testing", tags[0].k - assert_equal "added in node version 3", tags[0].v - assert_equal "testing three", tags[1].k - assert_equal "added in node version 3", tags[1].v - assert_equal "testing two", tags[2].k - assert_equal "added in node version 3", tags[2].v - - node = nodes(:node_with_versions_v4) + assert_equal taglist_v3.count, tags.count + taglist_v3.sort_by!(&:k).each_index do |i| + assert_equal taglist_v3[i].k, tags[i].k + assert_equal taglist_v3[i].v, tags[i].v + end + + node = node_v4 tags = OldNode.find(node.id).old_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_v4.count, tags.count + taglist_v4.sort_by!(&:k).each_index do |i| + assert_equal taglist_v4[i].k, tags[i].k + assert_equal taglist_v4[i].v, tags[i].v + end end def test_tags - node = nodes(:node_with_versions_v1) + node_v1 = create(:old_node, :version => 1) + node_v2 = create(:old_node, :node_id => node_v1.node_id, :version => 2) + node_v3 = create(:old_node, :node_id => node_v1.node_id, :version => 3) + node_v4 = create(:old_node, :node_id => node_v1.node_id, :version => 4) + taglist_v3 = create_list(:old_node_tag, 3, :old_node => node_v3) + taglist_v4 = create_list(:old_node_tag, 2, :old_node => node_v4) + + node = node_v1 tags = OldNode.find(node.id).tags assert_equal 0, tags.size - node = nodes(:node_with_versions_v2) + node = node_v2 tags = OldNode.find(node.id).tags assert_equal 0, tags.size - node = nodes(:node_with_versions_v3) + node = node_v3 tags = OldNode.find(node.id).tags - assert_equal 3, tags.size - assert_equal "added in node version 3", tags["testing"] - assert_equal "added in node version 3", tags["testing two"] - assert_equal "added in node version 3", tags["testing three"] + assert_equal taglist_v3.count, tags.count + taglist_v3.each do |tag| + assert_equal tag.v, tags[tag.k] + end - node = nodes(:node_with_versions_v4) + node = node_v4 tags = OldNode.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_v4.count, tags.count + taglist_v4.each do |tag| + assert_equal tag.v, tags[tag.k] + end end end