X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a182820139de22196d7f30e06047a81afc7323f5..2c342adc0df6b932165b521247201772f4369923:/test/models/way_test.rb
diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index fb37be1b4..8674b3790 100644
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -27,26 +27,25 @@ class WayTest < ActiveSupport::TestCase
node_c = create(:node)
way = create(:way_with_nodes, :nodes_count => 1)
# Take one of the current ways and add nodes to it until we are near the limit
- assert way.valid?
+ assert_predicate way, :valid?
# it already has 1 node
- 1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do
+ 1.upto(Settings.max_number_of_way_nodes / 2) do
way.add_nd_num(node_a.id)
way.add_nd_num(node_b.id)
end
way.save
- # print way.nds.size
- assert way.valid?
+ assert_predicate way, :valid?
way.add_nd_num(node_c.id)
- assert way.valid?
+ assert_predicate way, :valid?
end
def test_from_xml_no_id
noid = ""
assert_nothing_raised do
- Way.from_xml(noid, true)
+ Way.from_xml(noid, :create => true)
end
message = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(noid, false)
+ Way.from_xml(noid, :create => false)
end
assert_match(/ID is required when updating/, message.message)
end
@@ -54,11 +53,11 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_changeset_id
nocs = ""
message_create = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(nocs, true)
+ Way.from_xml(nocs, :create => true)
end
assert_match(/Changeset id is missing/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(nocs, false)
+ Way.from_xml(nocs, :create => false)
end
assert_match(/Changeset id is missing/, message_update.message)
end
@@ -66,10 +65,10 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_version
no_version = ""
assert_nothing_raised do
- Way.from_xml(no_version, true)
+ Way.from_xml(no_version, :create => true)
end
message_update = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(no_version, false)
+ Way.from_xml(no_version, :create => false)
end
assert_match(/Version is required when updating/, message_update.message)
end
@@ -79,10 +78,10 @@ class WayTest < ActiveSupport::TestCase
id_list.each do |id|
zero_id = ""
assert_nothing_raised do
- Way.from_xml(zero_id, true)
+ Way.from_xml(zero_id, :create => true)
end
message_update = assert_raise(OSM::APIBadUserInput) do
- Way.from_xml(zero_id, false)
+ Way.from_xml(zero_id, :create => false)
end
assert_match(/ID of way cannot be zero when updating/, message_update.message)
end
@@ -91,11 +90,11 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(no_text, true)
+ Way.from_xml(no_text, :create => true)
end
assert_match(/Must specify a string with one or more characters/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(no_text, false)
+ Way.from_xml(no_text, :create => false)
end
assert_match(/Must specify a string with one or more characters/, message_update.message)
end
@@ -103,11 +102,11 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_k_v
nokv = ""
message_create = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(nokv, true)
+ Way.from_xml(nokv, :create => true)
end
assert_match(/tag is missing key/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(nokv, false)
+ Way.from_xml(nokv, :create => false)
end
assert_match(/tag is missing key/, message_update.message)
end
@@ -115,11 +114,11 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_v
no_v = ""
message_create = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(no_v, true)
+ Way.from_xml(no_v, :create => true)
end
assert_match(/tag is missing value/, message_create.message)
message_update = assert_raise(OSM::APIBadXMLError) do
- Way.from_xml(no_v, false)
+ Way.from_xml(no_v, :create => false)
end
assert_match(/tag is missing value/, message_update.message)
end
@@ -127,11 +126,11 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_duplicate_k
dupk = ""
message_create = assert_raise(OSM::APIDuplicateTagsError) do
- Way.from_xml(dupk, true)
+ Way.from_xml(dupk, :create => true)
end
assert_equal "Element way/ has duplicate tags with key dup", message_create.message
message_update = assert_raise(OSM::APIDuplicateTagsError) do
- Way.from_xml(dupk, false)
+ Way.from_xml(dupk, :create => false)
end
assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
end