X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6488ebe12fa01f7622eae8a44e52fcb0dfaeb264..ad368d189f4842f18e81fd272c677e5d820a2da4:/test/unit/old_relation_tag_test.rb

diff --git a/test/unit/old_relation_tag_test.rb b/test/unit/old_relation_tag_test.rb
index 77874bcc6..1d0880822 100644
--- a/test/unit/old_relation_tag_test.rb
+++ b/test/unit/old_relation_tag_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class OldRelationTagTest < Test::Unit::TestCase
+class OldRelationTagTest < ActiveSupport::TestCase
   api_fixtures
   
   def test_tag_count
@@ -11,11 +11,11 @@ class OldRelationTagTest < Test::Unit::TestCase
     key = "k"
     (0..255).each do |i|
       tag = OldRelationTag.new
-      tag.id = relation_tags(:t1).id
+      tag.relation_id = relation_tags(:t1).relation_id
       tag.version = 1
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -23,47 +23,47 @@ class OldRelationTagTest < Test::Unit::TestCase
     val = "v"
     (0..255).each do |i|
       tag = OldRelationTag.new
-      tag.id = relation_tags(:t1).id
+      tag.relation_id = relation_tags(:t1).relation_id
       tag.version = 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 = OldRelationTag.new
-      tag.id = relation_tags(:t1).id
+      tag.relation_id = relation_tags(:t1).relation_id
       tag.version = 1
       tag.k = i
       tag.v = "v"
       assert !tag.valid?, "Key should be too long"
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
   def test_length_value_invalid
     ["k"*256].each do |i|
       tag = OldRelationTag.new
-      tag.id = relation_tags(:t1).id
+      tag.relation_id = relation_tags(:t1).relation_id
       tag.version = 1
       tag.k = "k"
       tag.v = i
       assert !tag.valid?, "Value should be too long"
-      assert tag.errors.invalid?(:v)
+      assert tag.errors[:v].any?
     end
   end
   
-  def test_empty_node_tag_invalid
+  def test_empty_tag_invalid
     tag = OldRelationTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
+    assert tag.errors[:old_relation].any?
   end
   
   def test_uniqueness
     tag = OldRelationTag.new
-    tag.id = relation_tags(:t1).id
+    tag.relation_id = relation_tags(:t1).relation_id
     tag.version = relation_tags(:t1).version
     tag.k = relation_tags(:t1).k
     tag.v = relation_tags(:t1).v