Ensure that all floated elements in the header stay within it

[rails.git] / test / models / relation_test.rb

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index e6d0c0abdcdaa99e2a3112c4ca6b0a7c0c30952d..e3ad13dc71ee4975cce25cbfb9beb7c1fb64ac58 100644 (file)
--- 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 = "<osm><relation version='12' changeset='23' /></osm>"
     assert_nothing_raised do
   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
     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
     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 = "<osm><relation id='123' version='12' /></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   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)
     message_update = assert_raise(OSM::APIBadXMLError) do
     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
     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 = "<osm><relation id='123' changeset='23' /></osm>"
     assert_nothing_raised do
   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
     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
     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 = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"
       assert_nothing_raised do
     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
       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
       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
   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
     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
     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 = "<osm><relation id='23' changeset='23' version='23'><tag /></relation></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   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)
     message_update = assert_raise(OSM::APIBadXMLError) do
     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
     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 = "<osm><relation id='23' changeset='23' version='23'><tag k='key' /></relation></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   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)
     message_update = assert_raise(OSM::APIBadXMLError) do
     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
     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 = "<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
   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
     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
     end
     assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
   end


@@ -207,4 +207,29 @@ class RelationTest < ActiveSupport::TestCase
     assert_equal 39, changeset.min_lat
     assert_equal 39, changeset.max_lat
   end
     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
 end