Merge 16817:16819 from trunk.

[rails.git] / 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 4971843489a88853d9f534d671702f4455f1a7fd..9acf32bf70837bb132b615b39bcaf79e8570c6ba 100644 (file)
--- a/test/unit/old_node_tag_test.rb
+++ b/test/unit/old_node_tag_test.rb
@@ -1,12 +1,10 @@
 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
@@ -17,7 +15,7 @@ class OldNodeTest < Test::Unit::TestCase
       tag.version = node_tags(:t1).version
       tag.k = key*i
       tag.v = "v"
-      assert_valid tag
+      assert tag.valid?
     end
   end
   
@@ -29,7 +27,7 @@ class OldNodeTest < Test::Unit::TestCase
       tag.version = node_tags(:t1).version
       tag.k = "k"
       tag.v = val*i
-      assert_valid tag
+      assert tag.valid?
     end
   end