Load api fixtures in tag model tests

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

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index 5d60ebb52c853813c9a7ee0c8a6e960fd9bed5c8..b095024a64b8c23a771b7fa1a5132b2d0d905ef4 100644 (file)
--- 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
 
 class RelationTest < ActiveSupport::TestCase
   api_fixtures

-  
+

   def test_relation_count
     assert_equal 8, Relation.count
   end
   def test_relation_count
     assert_equal 8, Relation.count
   end

-  
+

   def test_from_xml_no_id
     noid = "<osm><relation version='12' changeset='23' /></osm>"
   def test_from_xml_no_id
     noid = "<osm><relation version='12' changeset='23' /></osm>"

-    assert_nothing_raised(OSM::APIBadXMLError) {
+    assert_nothing_raised(OSM::APIBadXMLError) do

       Relation.from_xml(noid, true)
       Relation.from_xml(noid, true)

-    }
-    message = assert_raise(OSM::APIBadXMLError) {
+    end
+    message = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(noid, false)
       Relation.from_xml(noid, false)

-    }
+    end

     assert_match /ID is required when updating/, message.message
   end
     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>"
   def test_from_xml_no_changeset_id
     nocs = "<osm><relation id='123' version='12' /></osm>"

-    message_create = assert_raise(OSM::APIBadXMLError) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(nocs, true)
       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) {
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(nocs, false)
       Relation.from_xml(nocs, false)

-    }
+    end

     assert_match /Changeset id is missing/, message_update.message
   end
     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>"
   def test_from_xml_no_version
     no_version = "<osm><relation id='123' changeset='23' /></osm>"

-    assert_nothing_raised(OSM::APIBadXMLError) {
+    assert_nothing_raised(OSM::APIBadXMLError) do

       Relation.from_xml(no_version, true)
       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)
       Relation.from_xml(no_version, false)

-    }
+    end

     assert_match /Version is required when updating/, message_update.message
   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 = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     id_list.each do |id|
       zero_id = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"

-      assert_nothing_raised(OSM::APIBadUserInput) {
+      assert_nothing_raised(OSM::APIBadUserInput) do

         Relation.from_xml(zero_id, true)
         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)
         Relation.from_xml(zero_id, 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
   end

-  
+

   def test_from_xml_no_text
     no_text = ""
   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)
       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) {
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(no_text, false)
       Relation.from_xml(no_text, false)

-    }
+    end

     assert_match /Must specify a string with one or more characters/, message_update.message
   end
     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>"
   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) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(nokv, true)
       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) {
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(nokv, false)
       Relation.from_xml(nokv, false)

-    }
+    end

     assert_match /tag is missing key/, message_update.message
   end
     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>"
   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) {
+    message_create = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(no_v, true)
       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) {
+    message_update = assert_raise(OSM::APIBadXMLError) do

       Relation.from_xml(no_v, false)
       Relation.from_xml(no_v, false)

-    }
+    end

     assert_match /tag is missing value/, message_update.message
   end
     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>"
   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) {
+    message_create = assert_raise(OSM::APIDuplicateTagsError) do

       Relation.from_xml(dupk, true)
       Relation.from_xml(dupk, true)

-    }
+    end

     assert_equal "Element relation/ has duplicate tags with key dup", message_create.message
     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)
       Relation.from_xml(dupk, false)

-    }
+    end

     assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
   end
 
     assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
   end
 


@@ -129,26 +129,31 @@ class RelationTest < ActiveSupport::TestCase
 
   def test_relation_tags
     relation = current_relations(:relation_with_versions)
 
   def test_relation_tags
     relation = current_relations(:relation_with_versions)

+    taglist = create_list(:relation_tag, 2, :relation => relation)
+

     tags = Relation.find(relation.id).relation_tags.order(:k)
     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)
   end
 
   def test_tags
     relation = current_relations(:relation_with_versions)

+    taglist = create_list(:relation_tag, 2, :relation => relation)
+

     tags = Relation.find(relation.id).tags
     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)
     crm = Relation.find(relation.id).containing_relation_members.order(:relation_id)
   end
 
   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
     assert_equal 1, crm.first.relation_id
     assert_equal "Relation", crm.first.member_type
     assert_equal relation.id, crm.first.member_id