X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/17a1e22df96e76d9f863fc82e4d8fcb0487f6ac7..822496fd9f4c4b193cd85475f5a4552e25fb491b:/test/unit/relation_test.rb

diff --git a/test/unit/relation_test.rb b/test/unit/relation_test.rb
index a878be8cb..4caa6ce41 100644
--- a/test/unit/relation_test.rb
+++ b/test/unit/relation_test.rb
@@ -4,7 +4,7 @@ class RelationTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_relation_count
-    assert_equal 6, Relation.count
+    assert_equal 8, Relation.count
   end
   
   def test_from_xml_no_id
@@ -69,14 +69,30 @@ class RelationTest < ActiveSupport::TestCase
   
   def test_from_xml_no_k_v
     nokv = "<osm><relation id='23' changeset='23' version='23'><tag /></relation></osm>"
-    assert_nothing_raised(OSM::APIBadUserInput, OSM::APIBadXMLError) {
+    message_create = assert_raise(OSM::APIBadXMLError) {
       Relation.from_xml(nokv, true)
+    }
+    assert_match /tag is missing key/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
       Relation.from_xml(nokv, false)
     }
+    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) {
+      Relation.from_xml(no_v, true)
+    }
+    assert_match /tag is missing value/, message_create.message
+    message_update = assert_raise(OSM::APIBadXMLError) {
+      Relation.from_xml(no_v, false)
+    }
+    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='test'/></relation></osm>"
+    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) {
       Relation.from_xml(dupk, true)
     }
@@ -86,4 +102,46 @@ class RelationTest < ActiveSupport::TestCase
     }
     assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
   end
+
+  def test_relation_members
+    relation = current_relations(:relation_with_versions)
+    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 "some way", members[1].member_role
+    assert_equal "Way", members[1].member_type
+    assert_equal 4, 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
+  end
+
+  def test_relations
+    relation = current_relations(:relation_with_versions)
+    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]
+  end
+
+  def test_relation_tags
+    relation = current_relations(:relation_with_versions)
+    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
+  end
+
+  def test_tags
+    relation = current_relations(:relation_with_versions)
+    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"]
+  end
 end