X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9e070e06956801aba2378c1b79b4d9f13ae12ee..621cb8a1effa92f6a9df1c387d035b22e16c7941:/test/unit/node_test.rb
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index bb2b7dfa4..753e6a95c 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,14 +1,14 @@
require File.dirname(__FILE__) + '/../test_helper'
-class NodeTest < Test::Unit::TestCase
- fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags
- set_fixture_class :current_nodes => :Node
- set_fixture_class :nodes => :OldNode
- set_fixture_class :node_tags => :OldNodeTag
- set_fixture_class :current_node_tags => :NodeTag
-
+class NodeTest < ActiveSupport::TestCase
+ api_fixtures
+
+ def test_node_count
+ assert_equal 17, Node.count
+ end
+
def test_node_too_far_north
- invalid_node_test(:node_too_far_north)
+ invalid_node_test(:node_too_far_north)
end
def test_node_north_limit
@@ -51,12 +51,12 @@ class NodeTest < Test::Unit::TestCase
dbnode = Node.find(node.id)
assert_equal dbnode.lat, node.latitude.to_f/SCALE
assert_equal dbnode.lon, node.longitude.to_f/SCALE
- assert_equal dbnode.user_id, node.user_id
+ 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_valid node
+ assert node.valid?
end
# This helper method will check to make sure that a node is outwith the world,
@@ -67,7 +67,7 @@ class NodeTest < Test::Unit::TestCase
dbnode = Node.find(node.id)
assert_equal dbnode.lat, node.latitude.to_f/SCALE
assert_equal dbnode.lon, node.longitude.to_f/SCALE
- assert_equal dbnode.user_id, node.user_id
+ 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
@@ -77,27 +77,29 @@ class NodeTest < Test::Unit::TestCase
# Check that you can create a node and store it
def test_create
- node_template = Node.new(:latitude => 12.3456,
- :longitude => 65.4321,
- :user_id => users(:normal_user),
- :visible => 1,
- :version => 1)
- assert node_template.save_with_history!
+ node_template = Node.new({
+ :latitude => 12.3456,
+ :longitude => 65.4321,
+ :changeset_id => changesets(:normal_user_first_change).id,
+ :visible => 1,
+ :version => 1
+ }, :without_protection => true)
+ assert node_template.create_with_history(users(:normal_user))
node = Node.find(node_template.id)
assert_not_nil node
assert_equal node_template.latitude, node.latitude
assert_equal node_template.longitude, node.longitude
- assert_equal node_template.user_id, node.user_id
+ assert_equal node_template.changeset_id, node.changeset_id
assert_equal node_template.visible, node.visible
assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 1
+ old_node = OldNode.where(:node_id => node_template.id).first
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.user_id, old_node.user_id
+ assert_equal node_template.changeset_id, old_node.changeset_id
assert_equal node_template.visible, old_node.visible
assert_equal node_template.tags, old_node.tags
assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
@@ -107,65 +109,208 @@ class NodeTest < Test::Unit::TestCase
node_template = Node.find(current_nodes(:visible_node).id)
assert_not_nil node_template
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
- assert_not_nil old_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_template.save_with_history!
+ assert node.update_from(node_template, users(:normal_user))
node = Node.find(node_template.id)
assert_not_nil node
assert_equal node_template.latitude, node.latitude
assert_equal node_template.longitude, node.longitude
- assert_equal node_template.user_id, node.user_id
+ assert_equal node_template.changeset_id, node.changeset_id
assert_equal node_template.visible, node.visible
#assert_equal node_template.tags, node.tags
- assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
- assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 2
+ old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
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.user_id, old_node.user_id
+ assert_equal node_template.changeset_id, old_node.changeset_id
assert_equal node_template.visible, old_node.visible
#assert_equal node_template.tags, old_node.tags
- assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
end
def test_delete
node_template = Node.find(current_nodes(:visible_node))
assert_not_nil node_template
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
- old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
- assert_not_nil old_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.visible = 0
- assert node_template.save_with_history!
+ assert node.delete_with_history!(node_template, users(:normal_user))
node = Node.find(node_template.id)
assert_not_nil node
assert_equal node_template.latitude, node.latitude
assert_equal node_template.longitude, node.longitude
- assert_equal node_template.user_id, node.user_id
- assert_equal node_template.visible, node.visible
+ assert_equal node_template.changeset_id, node.changeset_id
+ assert_equal false, node.visible
#assert_equal node_template.tags, node.tags
- assert_equal node_template.timestamp.to_i, node.timestamp.to_i
- assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
- assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1
- old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ])
+ assert_equal OldNode.where(:node_id => node_template.id).count, 2
+ old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
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.user_id, old_node.user_id
- assert_equal node_template.visible, old_node.visible
+ assert_equal node_template.changeset_id, old_node.changeset_id
+ assert_equal false, old_node.visible
#assert_equal node_template.tags, old_node.tags
- assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
+ end
+
+ def test_from_xml_no_id
+ lat = 56.7
+ lon = -2.3
+ changeset = 2
+ version = 1
+ noid = ""
+ # First try a create which doesn't need the id
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Node.from_xml(noid, true)
+ }
+ # Now try an update with no id, and make sure that it gives the appropriate exception
+ message = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(noid, false)
+ }
+ assert_match /ID is required when updating./, message.message
+ end
+
+ def test_from_xml_no_lat
+ nolat = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nolat, true)
+ }
+ assert_match /lat missing/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nolat, false)
+ }
+ assert_match /lat missing/, message_update.message
+ end
+
+ def test_from_xml_no_lon
+ nolon = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nolon, true)
+ }
+ assert_match /lon missing/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nolon, false)
+ }
+ assert_match /lon missing/, message_update.message
+ end
+
+ def test_from_xml_no_changeset_id
+ nocs = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nocs, true)
+ }
+ assert_match /Changeset id is missing/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nocs, false)
+ }
+ assert_match /Changeset id is missing/, message_update.message
+ end
+
+ def test_from_xml_no_version
+ no_version = ""
+ assert_nothing_raised(OSM::APIBadXMLError) {
+ Node.from_xml(no_version, true)
+ }
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_version, false)
+ }
+ assert_match /Version is required when updating/, message_update.message
+ end
+
+ def test_from_xml_double_lat
+ nocs = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nocs, true)
+ }
+ assert_match /Fatal error: Attribute lat redefined at/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nocs, false)
+ }
+ 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) {
+ Node.from_xml(zero_id, true)
+ }
+ message_update = assert_raise(OSM::APIBadUserInput) {
+ Node.from_xml(zero_id, false)
+ }
+ 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) {
+ Node.from_xml(no_text, true)
+ }
+ assert_match /Must specify a string with one or more characters/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_text, false)
+ }
+ 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) {
+ Node.from_xml(no_node, true)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_node, false)
+ }
+ assert_match /XML doesn't contain an osm\/node element/, message_update.message
+ end
+
+ def test_from_xml_no_k_v
+ nokv = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Node.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, true)
+ }
+ assert_equal "Element node/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Node.from_xml(dupk, false)
+ }
+ assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
end
end