X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/535bc8f1d87fe9aa5388006da463b667cb553339..b76bfe379e6527c9cfc2ced97aa615f8c2c45dd7:/test/unit/relation_tag_test.rb

diff --git a/test/unit/relation_tag_test.rb b/test/unit/relation_tag_test.rb
index de31c8da8..0833c572d 100644
--- a/test/unit/relation_tag_test.rb
+++ b/test/unit/relation_tag_test.rb
@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class RelationTagTest < Test::Unit::TestCase
+class RelationTagTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_relation_tag_count
-    assert_equal 7, RelationTag.count
+    assert_equal 9, RelationTag.count
   end
   
   def test_length_key_valid
     key = "k"
     (0..255).each do |i|
       tag = RelationTag.new
-      tag.id = 1
+      tag.relation_id = 1
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -22,44 +22,44 @@ class RelationTagTest < Test::Unit::TestCase
     val = "v"
     (0..255).each do |i|
       tag = RelationTag.new
-      tag.id = 1
+      tag.relation_id = 1
       tag.k = "k"
       tag.v = val*i
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
   def test_length_key_invalid
     ["k"*256].each do |i|
       tag = RelationTag.new
-      tag.id = 1
+      tag.relation_id = 1
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key #{i} should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
   def test_length_value_invalid
     ["v"*256].each do |i|
       tag = RelationTag.new
-      tag.id = 1
+      tag.relation_id = 1
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value #{i} should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
   def test_empty_tag_invalid
     tag = RelationTag.new
     assert !tag.valid?, "Empty relation tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:relation].any?
   end
   
   def test_uniquness
     tag = RelationTag.new
-    tag.id = current_relation_tags(:t1).id
+    tag.relation_id = current_relation_tags(:t1).relation_id
     tag.k = current_relation_tags(:t1).k
     tag.v = current_relation_tags(:t1).v
     assert tag.new_record?
@@ -84,7 +84,7 @@ class RelationTagTest < Test::Unit::TestCase
   #   assert_equal 0, RelationTag.count(:conditions => ['v=?', v])
 
   #   # make sure we select a tag on a relation which has more than one tag
-  #   id = current_relations(:multi_tag_relation).id
+  #   id = current_relations(:multi_tag_relation).relation_id
   #   tag = RelationTag.find(:first, :conditions => ["id = ?", id])
   #   tag.v = v
   #   tag.save!