X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/34e3e51456774127d43408b7ab65c24f41373f62..72855280e75474735d0c2b65aae55a68eda71462:/test/models/node_test.rb
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 9a38dd947..ff833d0ed 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -1,10 +1,10 @@
-require 'test_helper'
+require "test_helper"
class NodeTest < ActiveSupport::TestCase
api_fixtures
def test_node_count
- assert_equal 18, Node.count
+ assert_equal 19, Node.count
end
def test_node_too_far_north
@@ -55,7 +55,7 @@ class NodeTest < ActiveSupport::TestCase
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 node.tile, QuadTile.tile_for_point(node.lat, node.lon)
assert node.valid?
end
@@ -71,7 +71,7 @@ class NodeTest < ActiveSupport::TestCase
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 node.tile, QuadTile.tile_for_point(node.lat, node.lon)
assert_equal false, dbnode.valid?
end
@@ -115,7 +115,7 @@ class NodeTest < ActiveSupport::TestCase
node_template.latitude = 12.3456
node_template.longitude = 65.4321
- #node_template.tags = "updated=yes"
+ # node_template.tags = "updated=yes"
assert node.update_from(node_template, users(:normal_user))
node = Node.find(node_template.id)
@@ -124,7 +124,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, node.longitude
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.tags, node.tags
assert_equal OldNode.where(:node_id => node_template.id).count, 2
old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
@@ -133,7 +133,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, old_node.longitude
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.tags, old_node.tags
end
def test_delete
@@ -152,7 +152,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, node.longitude
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.tags, node.tags
assert_equal OldNode.where(:node_id => node_template.id).count, 2
old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
@@ -161,7 +161,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, old_node.longitude
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.tags, old_node.tags
end
def test_from_xml_no_id
@@ -171,72 +171,72 @@ class NodeTest < ActiveSupport::TestCase
version = 1
noid = ""
# First try a create which doesn't need the id
- assert_nothing_raised(OSM::APIBadXMLError) {
+ assert_nothing_raised(OSM::APIBadXMLError) 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) {
+ message = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(noid, false)
- }
+ end
assert_match /ID is required when updating./, message.message
end
def test_from_xml_no_lat
nolat = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, true)
- }
+ end
assert_match /lat missing/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, false)
- }
+ end
assert_match /lat missing/, message_update.message
end
def test_from_xml_no_lon
nolon = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, true)
- }
+ end
assert_match /lon missing/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, false)
- }
+ end
assert_match /lon missing/, message_update.message
end
def test_from_xml_no_changeset_id
nocs = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
- }
+ end
assert_match /Changeset id is missing/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
- }
+ end
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
no_version = ""
- assert_nothing_raised(OSM::APIBadXMLError) {
+ assert_nothing_raised(OSM::APIBadXMLError) do
Node.from_xml(no_version, true)
- }
- message_update = assert_raise(OSM::APIBadXMLError) {
+ 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
end
def test_from_xml_double_lat
nocs = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
- }
+ end
assert_match /Fatal error: Attribute lat redefined at/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
- }
+ end
assert_match /Fatal error: Attribute lat redefined at/, message_update.message
end
@@ -244,73 +244,73 @@ class NodeTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = ""
- assert_nothing_raised(OSM::APIBadUserInput) {
+ assert_nothing_raised(OSM::APIBadUserInput) do
Node.from_xml(zero_id, true)
- }
- message_update = assert_raise(OSM::APIBadUserInput) {
+ 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
end
end
def test_from_xml_no_text
no_text = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ 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
- message_update = assert_raise(OSM::APIBadXMLError) {
+ 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
end
def test_from_xml_no_node
no_node = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
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) {
+ end
+ assert_match %r{XML doesn't contain an osm/node element}, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_node, false)
- }
- assert_match /XML doesn't contain an osm\/node element/, message_update.message
+ end
+ assert_match %r{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) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, true)
- }
+ end
assert_match /tag is missing key/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, false)
- }
+ end
assert_match /tag is missing key/, message_update.message
end
def test_from_xml_no_v
no_v = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, true)
- }
+ end
assert_match /tag is missing value/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, false)
- }
+ end
assert_match /tag is missing value/, message_update.message
end
def test_from_xml_duplicate_k
dupk = ""
- message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ message_create = assert_raise(OSM::APIDuplicateTagsError) do
Node.from_xml(dupk, true)
- }
+ end
assert_equal "Element node/ has duplicate tags with key dup", message_create.message
- message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ message_update = assert_raise(OSM::APIDuplicateTagsError) do
Node.from_xml(dupk, false)
- }
+ end
assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
end
@@ -335,7 +335,7 @@ class NodeTest < ActiveSupport::TestCase
def test_containing_relation_members
node = current_nodes(:node_used_by_relationship)
crm = Node.find(node.id).containing_relation_members.order(:relation_id)
-# assert_equal 3, crm.size
+ # assert_equal 3, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Node", crm.first.member_type
assert_equal node.id, crm.first.member_id