* Continue evolution toward ActiveSupport::TestCase and friends. #10679 [Josh Peek]

* TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 7 deletions

diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 7773b2bfb0..1749751852 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -17,7 +17,7 @@ require 'fixtures/tagging'
 require 'fixtures/person'
 require 'fixtures/reader'
 
-class AssociationsTest < Test::Unit::TestCase
+class AssociationsTest < ActiveSupport::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects,
            :computers
 
@@ -73,7 +73,7 @@ class AssociationsTest < Test::Unit::TestCase
   end
 end
  
-class AssociationProxyTest < Test::Unit::TestCase
+class AssociationProxyTest < ActiveSupport::TestCase
   fixtures :authors, :posts, :categorizations, :categories, :developers, :projects, :developers_projects
   
   def test_proxy_accessors
@@ -166,7 +166,7 @@ class AssociationProxyTest < Test::Unit::TestCase
   end
 end
 
-class HasOneAssociationsTest < Test::Unit::TestCase
+class HasOneAssociationsTest < ActiveSupport::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects
 
   def setup
@@ -463,7 +463,7 @@ class HasOneAssociationsTest < Test::Unit::TestCase
 end
 
 
-class HasManyAssociationsTest < Test::Unit::TestCase
+class HasManyAssociationsTest < ActiveSupport::TestCase
   fixtures :accounts, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments
 
@@ -1196,7 +1196,7 @@ class HasManyAssociationsTest < Test::Unit::TestCase
 
 end
 
-class BelongsToAssociationsTest < Test::Unit::TestCase
+class BelongsToAssociationsTest < ActiveSupport::TestCase
   fixtures :accounts, :companies, :developers, :projects, :topics,
            :developers_projects, :computers, :authors, :posts, :tags, :taggings
 
@@ -1572,7 +1572,7 @@ class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base
 end
 
 
-class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
+class HasAndBelongsToManyAssociationsTest < ActiveSupport::TestCase
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects
 
   def test_has_and_belongs_to_many
@@ -2112,7 +2112,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
 end
 
 
-class OverridingAssociationsTest < Test::Unit::TestCase
+class OverridingAssociationsTest < ActiveSupport::TestCase
   class Person < ActiveRecord::Base; end
   class DifferentPerson < ActiveRecord::Base; end