Merge remote-tracking branch 'openstreetmap/pull/1496'
This commit is contained in:
Tom Hughes
commit
b78bb9f631
4 changed files with 129 additions and 159 deletions
13
test/factories/node.rb
Normal file
13
test/factories/node.rb
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
FactoryGirl.define do
|
||||
factory :node do
|
||||
latitude 1 * GeoRecord::SCALE
|
||||
longitude 1 * GeoRecord::SCALE
|
||||
|
||||
# FIXME: needs changeset factory
|
||||
changeset_id 1
|
||||
|
||||
visible true
|
||||
timestamp Time.now
|
||||
version 1
|
||||
end
|
||||
end
|
||||
|
|
@ -3,76 +3,49 @@ require "test_helper"
|
|||
class NodeTest < ActiveSupport::TestCase
|
||||
api_fixtures
|
||||
|
||||
def test_node_count
|
||||
assert_equal 19, Node.count
|
||||
end
|
||||
|
||||
def test_node_too_far_north
|
||||
invalid_node_test(:node_too_far_north)
|
||||
node = build(:node, :latitude => 90.01 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
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
|
||||
# the fixture
|
||||
def valid_node_test(nod)
|
||||
node = current_nodes(nod)
|
||||
dbnode = Node.find(node.id)
|
||||
assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE
|
||||
assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE
|
||||
assert_equal dbnode.changeset_id, node.changeset_id
|
||||
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)
|
||||
node = build(:node, :latitude => 90 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
# 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)
|
||||
node = current_nodes(nod)
|
||||
dbnode = Node.find(node.id)
|
||||
assert_equal dbnode.lat, node.latitude.to_f / Node::SCALE
|
||||
assert_equal dbnode.lon, node.longitude.to_f / Node::SCALE
|
||||
assert_equal dbnode.changeset_id, node.changeset_id
|
||||
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 false, dbnode.valid?
|
||||
def test_node_too_far_south
|
||||
node = build(:node, :latitude => -90.01 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
end
|
||||
|
||||
def test_node_south_limit
|
||||
node = build(:node, :latitude => -90 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def test_node_too_far_west
|
||||
node = build(:node, :longitude => -180.01 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
end
|
||||
|
||||
def test_node_west_limit
|
||||
node = build(:node, :longitude => -180 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def test_node_too_far_east
|
||||
node = build(:node, :longitude => 180.01 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
end
|
||||
|
||||
def test_node_east_limit
|
||||
node = build(:node, :longitude => 180 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def test_totally_wrong
|
||||
node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
end
|
||||
|
||||
# Check that you can create a node and store it
|
||||
|
|
@ -107,17 +80,18 @@ class NodeTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_update
|
||||
node_template = Node.find(current_nodes(:visible_node).id)
|
||||
assert_not_nil node_template
|
||||
node = create(:node)
|
||||
create(:old_node, :node_id => node.id, :version => 1)
|
||||
node_template = Node.find(node.id)
|
||||
|
||||
assert_not_nil node_template
|
||||
assert_equal OldNode.where(:node_id => node_template.id).count, 1
|
||||
node = Node.find(node_template.id)
|
||||
assert_not_nil node
|
||||
|
||||
node_template.latitude = 12.3456
|
||||
node_template.longitude = 65.4321
|
||||
# node_template.tags = "updated=yes"
|
||||
assert node.update_from(node_template, current_nodes(:visible_node).changeset.user)
|
||||
assert node.update_from(node_template, node.changeset.user)
|
||||
|
||||
node = Node.find(node_template.id)
|
||||
assert_not_nil node
|
||||
|
|
@ -138,14 +112,15 @@ class NodeTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_delete
|
||||
node_template = Node.find(current_nodes(:visible_node).id)
|
||||
assert_not_nil node_template
|
||||
node = create(:node)
|
||||
create(:old_node, :node_id => node.id, :version => 1)
|
||||
node_template = Node.find(node.id)
|
||||
|
||||
assert_not_nil node_template
|
||||
assert_equal OldNode.where(:node_id => node_template.id).count, 1
|
||||
node = Node.find(node_template.id)
|
||||
assert_not_nil node
|
||||
|
||||
assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user)
|
||||
assert node.delete_with_history!(node_template, node.changeset.user)
|
||||
|
||||
node = Node.find(node_template.id)
|
||||
assert_not_nil node
|
||||
|
|
@ -316,7 +291,7 @@ class NodeTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_node_tags
|
||||
node = current_nodes(:node_with_versions)
|
||||
node = create(:node)
|
||||
taglist = create_list(:node_tag, 2, :node => node)
|
||||
tags = Node.find(node.id).node_tags.order(:k)
|
||||
assert_equal taglist.count, tags.count
|
||||
|
|
@ -327,7 +302,7 @@ class NodeTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_tags
|
||||
node = current_nodes(:node_with_versions)
|
||||
node = create(:node)
|
||||
taglist = create_list(:node_tag, 2, :node => node)
|
||||
tags = Node.find(node.id).tags
|
||||
assert_equal taglist.count, tags.count
|
||||
|
|
|
|||
|
|
@ -1,93 +1,68 @@
|
|||
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)
|
||||
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
|
||||
# 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)
|
||||
node = build(:old_node, :latitude => 90 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
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)
|
||||
def 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
|
||||
node = build(:old_node, :latitude => -90 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def 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
|
||||
node = build(:old_node, :longitude => -180 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def 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
|
||||
node = build(:old_node, :longitude => 180 * OldNode::SCALE)
|
||||
assert node.valid?
|
||||
end
|
||||
|
||||
def test_totally_wrong
|
||||
node = build(:old_node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE)
|
||||
assert_equal false, node.valid?
|
||||
end
|
||||
|
||||
def test_node_tags
|
||||
taglist_v3 = create_list(:old_node_tag, 3, :old_node => nodes(:node_with_versions_v3))
|
||||
taglist_v4 = create_list(:old_node_tag, 2, :old_node => nodes(:node_with_versions_v4))
|
||||
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 = nodes(:node_with_versions_v1)
|
||||
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 taglist_v3.count, tags.count
|
||||
taglist_v3.sort_by!(&:k).each_index do |i|
|
||||
|
|
@ -95,7 +70,7 @@ class OldNodeTest < ActiveSupport::TestCase
|
|||
assert_equal taglist_v3[i].v, tags[i].v
|
||||
end
|
||||
|
||||
node = nodes(:node_with_versions_v4)
|
||||
node = node_v4
|
||||
tags = OldNode.find(node.id).old_tags.order(:k)
|
||||
assert_equal taglist_v4.count, tags.count
|
||||
taglist_v4.sort_by!(&:k).each_index do |i|
|
||||
|
|
@ -105,25 +80,29 @@ class OldNodeTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_tags
|
||||
taglist_v3 = create_list(:old_node_tag, 3, :old_node => nodes(:node_with_versions_v3))
|
||||
taglist_v4 = create_list(:old_node_tag, 2, :old_node => nodes(:node_with_versions_v4))
|
||||
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 = nodes(:node_with_versions_v1)
|
||||
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 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 taglist_v4.count, tags.count
|
||||
taglist_v4.each do |tag|
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@ require "test_helper"
|
|||
require "osm"
|
||||
|
||||
class RedactionTest < ActiveSupport::TestCase
|
||||
api_fixtures
|
||||
|
||||
def test_cannot_redact_current
|
||||
n = current_nodes(:node_with_versions)
|
||||
n = create(:node)
|
||||
r = create(:redaction)
|
||||
assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
|
||||
assert_raise(OSM::APICannotRedactError) do
|
||||
|
|
@ -14,21 +12,26 @@ class RedactionTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def test_cannot_redact_current_via_old
|
||||
n = nodes(:node_with_versions_v4)
|
||||
node = create(:node)
|
||||
node_v1 = create(:old_node, :node_id => node.id)
|
||||
r = create(:redaction)
|
||||
assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
|
||||
assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
|
||||
assert_raise(OSM::APICannotRedactError) do
|
||||
n.redact!(r)
|
||||
node_v1.redact!(r)
|
||||
end
|
||||
end
|
||||
|
||||
def test_can_redact_old
|
||||
n = nodes(:node_with_versions_v3)
|
||||
node = create(:node, :version => 2)
|
||||
node_v1 = create(:old_node, :node_id => node.id)
|
||||
node_v2 = create(:old_node, :node_id => node.id, :version => 2)
|
||||
r = create(:redaction)
|
||||
assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
|
||||
|
||||
assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
|
||||
assert_nothing_raised(OSM::APICannotRedactError) do
|
||||
n.redact!(r)
|
||||
node_v1.redact!(r)
|
||||
end
|
||||
assert_equal(true, n.redacted?, "Expected node to be redacted after redact! call.")
|
||||
assert_equal(true, node_v1.redacted?, "Expected node version 1 to be redacted after redact! call.")
|
||||
assert_equal(false, node_v2.redacted?, "Expected node version 2 to not be redacted after redact! call.")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue