X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..47498efcc3f35ac0cd656cbb2f3e621e1ba3f123:/test/models/relation_test.rb?ds=inline
diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index f21a8d029..6b76d82a4 100644
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -1,21 +1,15 @@
-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) do
+ assert_nothing_raised do
Relation.from_xml(noid, true)
end
message = assert_raise(OSM::APIBadXMLError) do
Relation.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_changeset_id
@@ -23,35 +17,35 @@ class RelationTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.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
Relation.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
Relation.from_xml(no_version, true)
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
+ 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) do
+ assert_nothing_raised do
Relation.from_xml(zero_id, true)
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
+ assert_match(/ID of relation cannot be zero when updating/, message_update.message)
end
end
@@ -60,11 +54,11 @@ class RelationTest < ActiveSupport::TestCase
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
+ 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)
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_k_v
@@ -72,11 +66,11 @@ class RelationTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.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
Relation.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
@@ -84,11 +78,11 @@ class RelationTest < ActiveSupport::TestCase
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.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
Relation.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
@@ -104,61 +98,138 @@ class RelationTest < ActiveSupport::TestCase
end
def test_relation_members
- relation = current_relations(:relation_with_versions)
+ relation = create(:relation)
+ node = create(:node)
+ way = create(:way)
+ other_relation = create(:relation)
+ create(:relation_member, :relation => relation, :member => node, :member_role => "some node")
+ create(:relation_member, :relation => relation, :member => way, :member_role => "some way")
+ create(:relation_member, :relation => relation, :member => other_relation, :member_role => "some relation")
+
members = Relation.find(relation.id).relation_members
assert_equal 3, members.count
assert_equal "some node", members[0].member_role
assert_equal "Node", members[0].member_type
- assert_equal 15, members[0].member_id
+ assert_equal node.id, members[0].member_id
assert_equal "some way", members[1].member_role
assert_equal "Way", members[1].member_type
- assert_equal 4, members[1].member_id
+ assert_equal way.id, members[1].member_id
assert_equal "some relation", members[2].member_role
assert_equal "Relation", members[2].member_type
- assert_equal 7, members[2].member_id
+ assert_equal other_relation.id, members[2].member_id
end
def test_relations
- relation = current_relations(:relation_with_versions)
+ relation = create(:relation)
+ node = create(:node)
+ way = create(:way)
+ other_relation = create(:relation)
+ create(:relation_member, :relation => relation, :member => node, :member_role => "some node")
+ create(:relation_member, :relation => relation, :member => way, :member_role => "some way")
+ create(:relation_member, :relation => relation, :member => other_relation, :member_role => "some relation")
+
members = Relation.find(relation.id).members
assert_equal 3, members.count
- assert_equal ["Node", 15, "some node"], members[0]
- assert_equal ["Way", 4, "some way"], members[1]
- assert_equal ["Relation", 7, "some relation"], members[2]
+ assert_equal ["Node", node.id, "some node"], members[0]
+ assert_equal ["Way", way.id, "some way"], members[1]
+ assert_equal ["Relation", other_relation.id, "some relation"], members[2]
end
def test_relation_tags
- relation = current_relations(:relation_with_versions)
+ relation = create(:relation)
+ taglist = create_list(:relation_tag, 2, :relation => relation)
+
tags = Relation.find(relation.id).relation_tags.order(:k)
- assert_equal 2, tags.count
- 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
+ assert_equal taglist.count, tags.count
+ taglist.sort_by!(&:k).each_index do |i|
+ assert_equal taglist[i].k, tags[i].k
+ assert_equal taglist[i].v, tags[i].v
+ end
end
def test_tags
- relation = current_relations(:relation_with_versions)
+ relation = create(:relation)
+ taglist = create_list(:relation_tag, 2, :relation => relation)
+
tags = Relation.find(relation.id).tags
- assert_equal 2, tags.size
- assert_equal "added in relation version 3", tags["testing"]
- assert_equal "modified in relation version 4", tags["testing two"]
+ assert_equal taglist.count, tags.count
+ taglist.each do |tag|
+ assert_equal tag.v, tags[tag.k]
+ end
end
def test_containing_relation_members
- relation = current_relations(:used_relation)
+ relation = create(:relation)
+ super_relation = create(:relation)
+ create(:relation_member, :relation => super_relation, :member => relation)
+
crm = Relation.find(relation.id).containing_relation_members.order(:relation_id)
# assert_equal 1, crm.size
- assert_equal 1, crm.first.relation_id
+ assert_equal super_relation.id, crm.first.relation_id
assert_equal "Relation", crm.first.member_type
assert_equal relation.id, crm.first.member_id
- assert_equal 1, crm.first.relation.id
+ assert_equal super_relation.id, crm.first.relation.id
end
def test_containing_relations
- relation = current_relations(:used_relation)
+ relation = create(:relation)
+ super_relation = create(:relation)
+ create(:relation_member, :relation => super_relation, :member => relation)
+
cr = Relation.find(relation.id).containing_relations.order(:id)
assert_equal 1, cr.size
- assert_equal 1, cr.first.id
+ assert_equal super_relation.id, cr.first.id
+ end
+
+ def test_update_changeset_bbox_any_relation
+ relation = create(:relation)
+ super_relation = create(:relation)
+ node = create(:node, :longitude => 116, :latitude => 39)
+ create(:relation_member, :relation => super_relation, :member_type => "Relation", :member_id => relation.id)
+ node_member = create(:relation_member, :relation => super_relation, :member_type => "Node", :member_id => node.id)
+ user = create(:user)
+ changeset = create(:changeset, :user => user)
+ assert_nil changeset.min_lon
+ 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.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)
+
+ # changeset updated by node member, representing any_relation flag true.
+ assert_equal 116, changeset.min_lon
+ assert_equal 116, changeset.max_lon
+ assert_equal 39, changeset.min_lat
+ assert_equal 39, changeset.max_lat
+ end
+
+ def test_changeset_bbox_delete_relation
+ orig_relation = create(:relation)
+ node1 = create(:node, :longitude => 116, :latitude => 39)
+ node2 = create(:node, :longitude => 39, :latitude => 116)
+ create(:relation_member, :relation => orig_relation, :member_type => "Node", :member_id => node1.id)
+ create(:relation_member, :relation => orig_relation, :member_type => "Node", :member_id => node2.id)
+ user = create(:user)
+ changeset = create(:changeset, :user => user)
+ assert_nil changeset.min_lon
+ assert_nil changeset.max_lon
+ 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
+ orig_relation.delete_with_history!(new_relation, user)
+ changeset.reload
+ assert_equal 39, changeset.min_lon
+ assert_equal 116, changeset.max_lon
+ assert_equal 39, changeset.min_lat
+ assert_equal 116, changeset.max_lat
end
end