X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..84f6029ead0aef7a85b9690d7c6dec65782d94b1:/test/models/relation_test.rb?ds=inline

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index b06cbd9b8..e3ad13dc7 100644
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -4,35 +4,35 @@ class RelationTest < ActiveSupport::TestCase
   def test_from_xml_no_id
     noid = "<osm><relation version='12' changeset='23' /></osm>"
     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
+    assert_match(/ID is required when updating/, message.message)
   end
 
   def test_from_xml_no_changeset_id
     nocs = "<osm><relation id='123' version='12' /></osm>"
     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
+    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
+    assert_match(/Changeset id is missing/, message_update.message)
   end
 
   def test_from_xml_no_version
     no_version = "<osm><relation id='123' changeset='23' /></osm>"
     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
+    assert_match(/Version is required when updating/, message_update.message)
   end
 
   def test_from_xml_id_zero
@@ -40,59 +40,59 @@ class RelationTest < ActiveSupport::TestCase
     id_list.each do |id|
       zero_id = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"
       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
+      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) 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
+    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
+    assert_match(/Must specify a string with one or more characters/, message_update.message)
   end
 
   def test_from_xml_no_k_v
     nokv = "<osm><relation id='23' changeset='23' version='23'><tag /></relation></osm>"
     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
+    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
+    assert_match(/tag is missing key/, message_update.message)
   end
 
   def test_from_xml_no_v
     no_v = "<osm><relation id='23' changeset='23' version='23'><tag k='key' /></relation></osm>"
     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
+    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
+    assert_match(/tag is missing value/, message_update.message)
   end
 
   def test_from_xml_duplicate_k
     dupk = "<osm><relation id='23' changeset='23' version='23'><tag k='dup' v='test'/><tag k='dup' v='tester'/></relation></osm>"
     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
@@ -180,4 +180,56 @@ class RelationTest < ActiveSupport::TestCase
     assert_equal 1, cr.size
     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