X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ce310b38c346c67a2d1af08142c36ba11d11ed5..9da461cc2e9008e5a5dc861bfda0b00ce073f835:/test/models/node_test.rb
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index cf60c84ec..c53f0ee1d 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?
@@ -65,8 +63,8 @@ class NodeTest < ActiveSupport::TestCase
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
+ 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
@@ -168,14 +166,14 @@ 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
message = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(noid, false)
end
- assert_match /ID is required when updating./, message.message
+ assert_match(/ID is required when updating./, message.message)
end
def test_from_xml_no_lat
@@ -183,11 +181,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, true)
end
- assert_match /lat missing/, message_create.message
+ assert_match(/lat missing/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, false)
end
- assert_match /lat missing/, message_update.message
+ assert_match(/lat missing/, message_update.message)
end
def test_from_xml_no_lon
@@ -195,11 +193,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, true)
end
- assert_match /lon missing/, message_create.message
+ assert_match(/lon missing/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, false)
end
- assert_match /lon missing/, message_update.message
+ assert_match(/lon missing/, message_update.message)
end
def test_from_xml_no_changeset_id
@@ -207,22 +205,22 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
end
- assert_match /Changeset id is missing/, message_create.message
+ assert_match(/Changeset id is missing/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
end
- assert_match /Changeset id is missing/, message_update.message
+ assert_match(/Changeset id is missing/, message_update.message)
end
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
Node.from_xml(no_version, false)
end
- assert_match /Version is required when updating/, message_update.message
+ assert_match(/Version is required when updating/, message_update.message)
end
def test_from_xml_double_lat
@@ -230,24 +228,24 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
end
- assert_match /Fatal error: Attribute lat redefined at/, message_create.message
+ assert_match(/Fatal error: Attribute lat redefined at/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
end
- assert_match /Fatal error: Attribute lat redefined at/, message_update.message
+ 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) do
+ assert_nothing_raised do
Node.from_xml(zero_id, true)
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
+ assert_match(/ID of node cannot be zero when updating/, message_update.message)
end
end
@@ -256,11 +254,11 @@ class NodeTest < ActiveSupport::TestCase
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
+ assert_match(/Must specify a string with one or more characters/, message_create.message)
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
+ assert_match(/Must specify a string with one or more characters/, message_update.message)
end
def test_from_xml_no_node
@@ -280,11 +278,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, true)
end
- assert_match /tag is missing key/, message_create.message
+ assert_match(/tag is missing key/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, false)
end
- assert_match /tag is missing key/, message_update.message
+ assert_match(/tag is missing key/, message_update.message)
end
def test_from_xml_no_v
@@ -292,11 +290,11 @@ class NodeTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, true)
end
- assert_match /tag is missing value/, message_create.message
+ assert_match(/tag is missing value/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, false)
end
- assert_match /tag is missing value/, message_update.message
+ assert_match(/tag is missing value/, message_update.message)
end
def test_from_xml_duplicate_k