X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ffbc4d5cb278c1afeafea5cfe904ec48d9f4d237..21855aa355ed66bea0ae21acb3d675aeaccc963b:/test/unit/old_node_tag_test.rb

diff --git a/test/unit/old_node_tag_test.rb b/test/unit/old_node_tag_test.rb
index 497184348..064b5f198 100644
--- a/test/unit/old_node_tag_test.rb
+++ b/test/unit/old_node_tag_test.rb
@@ -1,23 +1,21 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class OldNodeTest < Test::Unit::TestCase
-  set_fixture_class :nodes => OldNode
-  set_fixture_class :node_tags => OldNodeTag
-  fixtures  :users, :nodes, :node_tags
-  
+class OldNodeTest < ActiveSupport::TestCase
+  api_fixtures
+
   def test_old_node_tag_count
-    assert_equal 8, OldNodeTag.count, "Unexpected number of fixtures loaded."
+    assert_equal 9, OldNodeTag.count, "Unexpected number of fixtures loaded."
   end
   
   def test_length_key_valid
     key = "k"
     (0..255).each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -25,48 +23,47 @@ class OldNodeTest < Test::Unit::TestCase
     val = "v"
     (0..255).each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       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 = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       tag.k = i
       tag.v = "v", "Key should be too long"
       assert !tag.valid?
-      assert tag.errors.invalid?(:k)
+      assert tag.errors[:k].any?
     end
   end
   
   def test_length_value_invalid
     ["k"*256].each do |i|
       tag = OldNodeTag.new
-      tag.id = node_tags(:t1).id
+      tag.node_id = node_tags(:t1).node_id
       tag.version = node_tags(:t1).version
       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_old_node_tag_invalid
+  def test_empty_tag_invalid
     tag = OldNodeTag.new
     assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors.invalid?(:id)
-    assert tag.errors.invalid?(:version)
+    assert tag.errors[:old_node].any?
   end
   
   def test_uniqueness
     tag = OldNodeTag.new
-    tag.id = node_tags(:t1).id
+    tag.node_id = node_tags(:t1).node_id
     tag.version = node_tags(:t1).version
     tag.k = node_tags(:t1).k
     tag.v = node_tags(:t1).v