X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07ffb4c3f6e20d76a5a9dc476920e42f63b37d8e..be541bcab21487560d4974215bd35be74012c492:/test/models/relation_test.rb
diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index 6b76d82a4..193126df1 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
@@ -193,10 +193,9 @@ class RelationTest < ActiveSupport::TestCase
assert_nil changeset.max_lon
assert_nil changeset.max_lat
assert_nil changeset.min_lat
- new_relation = Relation.new
- new_relation.id = super_relation.id
- new_relation.version = super_relation.version
- new_relation.changeset = changeset
+ new_relation = build(:relation, :id => super_relation.id,
+ :version => super_relation.version,
+ :changeset => changeset)
new_relation.add_member node_member.member_type, node_member.member_id, node_member.member_role
# one member(relation type) was removed, so any_relation flag is expected to be true.
super_relation.update_from(new_relation, user)
@@ -221,10 +220,9 @@ class RelationTest < ActiveSupport::TestCase
assert_nil changeset.max_lat
assert_nil changeset.min_lat
- new_relation = Relation.new
- new_relation.id = orig_relation.id
- new_relation.version = orig_relation.version
- new_relation.changeset_id = changeset.id
+ new_relation = build(:relation, :id => orig_relation.id,
+ :version => orig_relation.version,
+ :changeset_id => changeset.id)
orig_relation.delete_with_history!(new_relation, user)
changeset.reload
assert_equal 39, changeset.min_lon
@@ -232,4 +230,27 @@ class RelationTest < ActiveSupport::TestCase
assert_equal 39, changeset.min_lat
assert_equal 116, changeset.max_lat
end
+
+ # Check that the preconditions fail when you are over the defined limit of
+ # the maximum number of members in a relation.
+ def test_max_members_per_relation_limit
+ # Speed up unit test by using a small relation member limit
+ default_limit = Settings.max_number_of_relation_members
+ Settings.max_number_of_relation_members = 20
+
+ user = create(:user)
+ changeset = create(:changeset, :user => user)
+ relation = create(:relation, :changeset => changeset)
+ node = create(:node, :longitude => 116, :latitude => 39)
+ # Create relation which exceeds the relation member limit by one
+ 0.upto(Settings.max_number_of_relation_members) do |i|
+ create(:relation_member, :relation => relation, :member_type => "Node", :member_id => node.id, :sequence_id => i)
+ end
+
+ assert_raise OSM::APITooManyRelationMembersError do
+ relation.create_with_history user
+ end
+
+ Settings.max_number_of_relation_members = default_limit
+ end
end