X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..f464e2a6e9679636d6ae8dbe7b3448cc4cab334d:/test/models/relation_test.rb?ds=inline
diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index 5d60ebb52..028cd7d48 100644
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -1,105 +1,105 @@
-require 'test_helper'
+require "test_helper"
class RelationTest < ActiveSupport::TestCase
api_fixtures
-
+
def test_relation_count
assert_equal 8, Relation.count
end
-
+
def test_from_xml_no_id
noid = ""
- assert_nothing_raised(OSM::APIBadXMLError) {
+ assert_nothing_raised(OSM::APIBadXMLError) do
Relation.from_xml(noid, true)
- }
- message = assert_raise(OSM::APIBadXMLError) {
+ end
+ message = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(noid, false)
- }
+ end
assert_match /ID is required when updating/, message.message
end
-
+
def test_from_xml_no_changeset_id
nocs = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Relation.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
Relation.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
Relation.from_xml(no_version, true)
- }
- message_update = assert_raise(OSM::APIBadXMLError) {
+ end
+ message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_version, false)
- }
+ end
assert_match /Version is required when updating/, 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) {
+ assert_nothing_raised(OSM::APIBadUserInput) do
Relation.from_xml(zero_id, true)
- }
- message_update = assert_raise(OSM::APIBadUserInput) {
+ end
+ message_update = assert_raise(OSM::APIBadUserInput) do
Relation.from_xml(zero_id, false)
- }
+ end
assert_match /ID of relation 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
Relation.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
Relation.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_k_v
nokv = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Relation.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
Relation.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
Relation.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
Relation.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
Relation.from_xml(dupk, true)
- }
+ end
assert_equal "Element relation/ has duplicate tags with key dup", message_create.message
- message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ message_update = assert_raise(OSM::APIDuplicateTagsError) do
Relation.from_xml(dupk, false)
- }
+ end
assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
end
@@ -131,7 +131,7 @@ class RelationTest < ActiveSupport::TestCase
relation = current_relations(:relation_with_versions)
tags = Relation.find(relation.id).relation_tags.order(:k)
assert_equal 2, tags.count
- assert_equal "testing", tags[0].k
+ assert_equal "testing", tags[0].k
assert_equal "added in relation version 3", tags[0].v
assert_equal "testing two", tags[1].k
assert_equal "modified in relation version 4", tags[1].v
@@ -148,7 +148,7 @@ class RelationTest < ActiveSupport::TestCase
def test_containing_relation_members
relation = current_relations(:used_relation)
crm = Relation.find(relation.id).containing_relation_members.order(:relation_id)
-# assert_equal 1, crm.size
+ # assert_equal 1, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Relation", crm.first.member_type
assert_equal relation.id, crm.first.member_id