X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07ffb4c3f6e20d76a5a9dc476920e42f63b37d8e..4549de5f327adba0938a95198aa21c15ff98521a:/test/models/relation_test.rb diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb index 6b76d82a4..e3ad13dc7 100644 --- a/test/models/relation_test.rb +++ b/test/models/relation_test.rb @@ -4,10 +4,10 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_id noid = "" assert_nothing_raised do - Relation.from_xml(noid, true) + Relation.from_xml(noid, :create => true) end message = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(noid, false) + Relation.from_xml(noid, :create => false) end assert_match(/ID is required when updating/, message.message) end @@ -15,11 +15,11 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_changeset_id nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(nocs, true) + Relation.from_xml(nocs, :create => true) end assert_match(/Changeset id is missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(nocs, false) + Relation.from_xml(nocs, :create => false) end assert_match(/Changeset id is missing/, message_update.message) end @@ -27,10 +27,10 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_version no_version = "" assert_nothing_raised do - Relation.from_xml(no_version, true) + Relation.from_xml(no_version, :create => true) end message_update = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(no_version, false) + Relation.from_xml(no_version, :create => false) end assert_match(/Version is required when updating/, message_update.message) end @@ -40,10 +40,10 @@ class RelationTest < ActiveSupport::TestCase id_list.each do |id| zero_id = "" assert_nothing_raised do - Relation.from_xml(zero_id, true) + Relation.from_xml(zero_id, :create => true) end message_update = assert_raise(OSM::APIBadUserInput) do - Relation.from_xml(zero_id, false) + Relation.from_xml(zero_id, :create => false) end assert_match(/ID of relation cannot be zero when updating/, message_update.message) end @@ -52,11 +52,11 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_text no_text = "" message_create = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(no_text, true) + Relation.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 - Relation.from_xml(no_text, false) + Relation.from_xml(no_text, :create => false) end assert_match(/Must specify a string with one or more characters/, message_update.message) end @@ -64,11 +64,11 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(nokv, true) + Relation.from_xml(nokv, :create => true) end assert_match(/tag is missing key/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(nokv, false) + Relation.from_xml(nokv, :create => false) end assert_match(/tag is missing key/, message_update.message) end @@ -76,11 +76,11 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_v no_v = "" message_create = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(no_v, true) + Relation.from_xml(no_v, :create => true) end assert_match(/tag is missing value/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Relation.from_xml(no_v, false) + Relation.from_xml(no_v, :create => false) end assert_match(/tag is missing value/, message_update.message) end @@ -88,11 +88,11 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_duplicate_k dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) do - Relation.from_xml(dupk, true) + Relation.from_xml(dupk, :create => true) end assert_equal "Element relation/ has duplicate tags with key dup", message_create.message message_update = assert_raise(OSM::APIDuplicateTagsError) do - Relation.from_xml(dupk, false) + Relation.from_xml(dupk, :create => false) end assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message end