From 39814fcce0b429eb06654600e4669f1405ffa7d9 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 21 Jan 2008 17:20:51 +0000
Subject: Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/test/abstract_unit.rb                 | 84 ----------------------
 activerecord/test/all.sh                           |  8 ---
 .../test/association_inheritance_reload.rb         | 14 ----
 activerecord/test/cases/aaa_create_tables_test.rb  | 20 +++---
 .../test/cases/active_schema_test_mysql.rb         |  4 +-
 activerecord/test/cases/adapter_test.rb            |  4 +-
 activerecord/test/cases/adapter_test_sqlserver.rb  |  4 +-
 activerecord/test/cases/aggregations_test.rb       |  6 +-
 activerecord/test/cases/ar_schema_test.rb          |  4 +-
 .../test/cases/associations/callbacks_test.rb      |  4 +-
 .../associations/cascaded_eager_loading_test.rb    |  6 +-
 .../associations/eager_singularization_test.rb     |  4 +-
 activerecord/test/cases/associations/eager_test.rb |  4 +-
 .../test/cases/associations/extension_test.rb      |  4 +-
 .../associations/inner_join_association_test.rb    |  4 +-
 .../test/cases/associations/join_model_test.rb     |  4 +-
 activerecord/test/cases/associations_test.rb       | 16 ++---
 activerecord/test/cases/attribute_methods_test.rb  |  4 +-
 activerecord/test/cases/base_test.rb               |  4 +-
 activerecord/test/cases/binary_test.rb             |  6 +-
 activerecord/test/cases/calculations_test.rb       |  4 +-
 activerecord/test/cases/callbacks_test.rb          |  4 +-
 .../cases/class_inheritable_attributes_test.rb     |  4 +-
 activerecord/test/cases/column_alias_test.rb       |  4 +-
 .../test/cases/connection_test_firebird.rb         |  4 +-
 activerecord/test/cases/connection_test_mysql.rb   |  4 +-
 activerecord/test/cases/copy_table_test_sqlite.rb  |  4 +-
 .../test/cases/datatype_test_postgresql.rb         |  4 +-
 activerecord/test/cases/date_time_test.rb          |  4 +-
 activerecord/test/cases/default_test_firebird.rb   |  4 +-
 activerecord/test/cases/defaults_test.rb           |  4 +-
 activerecord/test/cases/deprecated_finder_test.rb  |  4 +-
 activerecord/test/cases/finder_test.rb             |  4 +-
 activerecord/test/cases/fixtures_test.rb           | 56 +++++++--------
 activerecord/test/cases/helper.rb                  | 46 ++++++++++++
 activerecord/test/cases/inheritance_test.rb        |  6 +-
 activerecord/test/cases/json_serialization_test.rb |  6 +-
 activerecord/test/cases/lifecycle_test.rb          |  4 +-
 activerecord/test/cases/locking_test.rb            |  6 +-
 activerecord/test/cases/method_scoping_test.rb     | 14 ++--
 activerecord/test/cases/migration_test.rb          | 49 ++++++-------
 activerecord/test/cases/migration_test_firebird.rb |  4 +-
 activerecord/test/cases/mixin_test.rb              |  4 +-
 activerecord/test/cases/modules_test.rb            |  4 +-
 activerecord/test/cases/multiple_db_test.rb        |  4 +-
 activerecord/test/cases/pk_test.rb                 |  4 +-
 activerecord/test/cases/query_cache_test.rb        |  6 +-
 activerecord/test/cases/readonly_test.rb           |  4 +-
 activerecord/test/cases/reflection_test.rb         |  4 +-
 .../test/cases/reserved_word_test_mysql.rb         |  7 +-
 .../cases/schema_authorization_test_postgresql.rb  |  4 +-
 activerecord/test/cases/schema_dumper_test.rb      |  4 +-
 activerecord/test/cases/schema_test_postgresql.rb  |  4 +-
 activerecord/test/cases/serialization_test.rb      |  4 +-
 activerecord/test/cases/synonym_test_oracle.rb     |  4 +-
 .../test/cases/table_name_test_sqlserver.rb        |  4 +-
 .../test/cases/threaded_connections_test.rb        |  4 +-
 activerecord/test/cases/transactions_test.rb       |  4 +-
 activerecord/test/cases/unconnected_test.rb        |  4 +-
 activerecord/test/cases/validations_test.rb        |  6 +-
 activerecord/test/cases/xml_serialization_test.rb  | 10 +--
 activerecord/test/config.rb                        |  5 ++
 .../test/connections/native_sqlite/connection.rb   |  2 +-
 .../test/connections/native_sqlite3/connection.rb  |  2 +-
 .../native_sqlite3/in_memory_connection.rb         |  4 +-
 activerecord/test/fixtures/.gitignore              |  1 +
 66 files changed, 247 insertions(+), 307 deletions(-)
 delete mode 100755 activerecord/test/abstract_unit.rb
 delete mode 100755 activerecord/test/all.sh
 delete mode 100644 activerecord/test/association_inheritance_reload.rb
 create mode 100644 activerecord/test/cases/helper.rb
 create mode 100644 activerecord/test/config.rb
 create mode 100644 activerecord/test/fixtures/.gitignore

(limited to 'activerecord/test')

diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb
deleted file mode 100755
index 8bd61da272..0000000000
--- a/activerecord/test/abstract_unit.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-
-require 'test/unit'
-require 'active_record'
-require 'active_record/fixtures'
-require 'active_support/test_case'
-require 'connection'
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-
-QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
-
-class ActiveSupport::TestCase #:nodoc:
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-  self.use_instantiated_fixtures = false
-  self.use_transactional_fixtures = (ENV['AR_NO_TX_FIXTURES'] != "yes")
-
-  def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names, {}, &block)
-  end
-
-  def assert_date_from_db(expected, actual, message = nil)
-    # SQL Server doesn't have a separate column type just for dates,
-    # so the time is in the string and incorrectly formatted
-    if current_adapter?(:SQLServerAdapter)
-      assert_equal expected.strftime("%Y/%m/%d 00:00:00"), actual.strftime("%Y/%m/%d 00:00:00")
-    elsif current_adapter?(:SybaseAdapter)
-      assert_equal expected.to_s, actual.to_date.to_s, message
-    else
-      assert_equal expected.to_s, actual.to_s, message
-    end
-  end
-
-  def assert_queries(num = 1)
-    $query_count = 0
-    yield
-  ensure
-    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-end
-
-def current_adapter?(*types)
-  types.any? do |type|
-    ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
-  end
-end
-
-def uses_mocha(test_name)
-  require 'rubygems'
-  require 'mocha'
-  yield
-rescue LoadError
-  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
-end
-
-ActiveRecord::Base.connection.class.class_eval do
-  unless defined? IGNORED_SQL
-    IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
-
-    def execute_with_counting(sql, name = nil, &block)
-      $query_count ||= 0
-      $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
-      execute_without_counting(sql, name, &block)
-    end
-
-    alias_method_chain :execute, :counting
-  end
-end
-
-# Make with_scope public for tests
-class << ActiveRecord::Base
-  public :with_scope, :with_exclusive_scope
-end
-
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
-#ActiveRecord::Base.colorize_logging = false
diff --git a/activerecord/test/all.sh b/activerecord/test/all.sh
deleted file mode 100755
index 8abd156230..0000000000
--- a/activerecord/test/all.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
-	echo "Usage: $0 <database>" 1>&2
-	exit 1
-fi
-
-ruby -I connections/native_$1 -e 'Dir["**/*_test.rb"].each { |path| require path }'
diff --git a/activerecord/test/association_inheritance_reload.rb b/activerecord/test/association_inheritance_reload.rb
deleted file mode 100644
index 5577f86eb3..0000000000
--- a/activerecord/test/association_inheritance_reload.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'abstract_unit'
-require 'fixtures/company'
-
-class AssociationInheritanceReloadTest < ActiveSupport::TestCase
-  fixtures :companies
-
-  def test_set_attributes
-    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
-    # ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
-    remove_subclass_of(ActiveRecord::Base)
-    load 'fixtures/company.rb'
-    assert_equal ["errors.add_on_empty('name', \"can't be empty\")"], Firm.read_inheritable_attribute("validate"), "Second run"
-  end
-end
\ No newline at end of file
diff --git a/activerecord/test/cases/aaa_create_tables_test.rb b/activerecord/test/cases/aaa_create_tables_test.rb
index f1fae8a469..32e0d2936e 100644
--- a/activerecord/test/cases/aaa_create_tables_test.rb
+++ b/activerecord/test/cases/aaa_create_tables_test.rb
@@ -1,13 +1,9 @@
 # The filename begins with "aaa" to ensure this is the first test.
-require 'abstract_unit'
+require "cases/helper"
 
-class AAACreateTablesTest < ActiveSupport::TestCase
+class AAACreateTablesTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
-  def setup
-    @base_path = "#{File.dirname(__FILE__)}/../schema"
-  end
-
   def test_drop_and_create_main_tables
     recreate ActiveRecord::Base unless use_migrations?
     assert true
@@ -15,7 +11,7 @@ class AAACreateTablesTest < ActiveSupport::TestCase
 
   def test_load_schema
     if ActiveRecord::Base.connection.supports_migrations?
-      eval(File.read("#{File.dirname(__FILE__)}/../schema/schema.rb"))
+      eval(File.read(SCHEMA_ROOT + "/schema.rb"))
     else
       recreate ActiveRecord::Base, '3'
     end
@@ -24,7 +20,7 @@ class AAACreateTablesTest < ActiveSupport::TestCase
 
   def test_drop_and_create_courses_table
     if Course.connection.supports_migrations?
-      eval(File.read("#{File.dirname(__FILE__)}/../schema/schema2.rb"))
+      eval(File.read(SCHEMA_ROOT + "/schema2.rb"))
     end
     recreate Course, '2' unless use_migrations_for_courses?
     assert true
@@ -33,19 +29,19 @@ class AAACreateTablesTest < ActiveSupport::TestCase
   private
     def use_migrations?
       unittest_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + ".sql"
-      not File.exist? "#{@base_path}/#{unittest_sql_filename}"
+      not File.exist? SCHEMA_ROOT + "/#{unittest_sql_filename}"
     end
 
     def use_migrations_for_courses?
       unittest2_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + "2.sql"
-      not File.exist? "#{@base_path}/#{unittest2_sql_filename}"
+      not File.exist? SCHEMA_ROOT + "/#{unittest2_sql_filename}"
     end
 
     def recreate(base, suffix = nil)
       connection = base.connection
       adapter_name = connection.adapter_name.downcase + suffix.to_s
-      execute_sql_file "#{@base_path}/#{adapter_name}.drop.sql", connection
-      execute_sql_file "#{@base_path}/#{adapter_name}.sql", connection
+      execute_sql_file SCHEMA_ROOT + "/#{adapter_name}.drop.sql", connection
+      execute_sql_file SCHEMA_ROOT + "/#{adapter_name}.sql", connection
     end
 
     def execute_sql_file(path, connection)
diff --git a/activerecord/test/cases/active_schema_test_mysql.rb b/activerecord/test/cases/active_schema_test_mysql.rb
index 2611153fda..cf2233eb33 100644
--- a/activerecord/test/cases/active_schema_test_mysql.rb
+++ b/activerecord/test/cases/active_schema_test_mysql.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class ActiveSchemaTest < ActiveSupport::TestCase
+class ActiveSchemaTest < ActiveRecord::TestCase
   def setup
     ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
       alias_method :execute_without_stub, :execute
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index d5993d044a..8a74b6d6f5 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class AdapterTest < ActiveSupport::TestCase
+class AdapterTest < ActiveRecord::TestCase
   def setup
     @connection = ActiveRecord::Base.connection
   end
diff --git a/activerecord/test/cases/adapter_test_sqlserver.rb b/activerecord/test/cases/adapter_test_sqlserver.rb
index 3b66fa44c0..ea270fb7ee 100644
--- a/activerecord/test/cases/adapter_test_sqlserver.rb
+++ b/activerecord/test/cases/adapter_test_sqlserver.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/default'
 require 'models/post'
 require 'models/task'
 
-class SqlServerAdapterTest < ActiveSupport::TestCase
+class SqlServerAdapterTest < ActiveRecord::TestCase
   class TableWithRealColumn < ActiveRecord::Base; end
 
   fixtures :posts, :tasks
diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index 66fa46b3f0..75d1f27e07 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/customer'
 
-class AggregationsTest < ActiveSupport::TestCase
+class AggregationsTest < ActiveRecord::TestCase
   fixtures :customers
 
   def test_find_single_value_object
@@ -109,7 +109,7 @@ class AggregationsTest < ActiveSupport::TestCase
   end
 end
 
-class OverridingAggregationsTest < ActiveSupport::TestCase
+class OverridingAggregationsTest < ActiveRecord::TestCase
   class Name; end
   class DifferentName; end
 
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 3b290333e9..9fdd8398b7 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'active_record/schema'
 
 if ActiveRecord::Base.connection.supports_migrations?
 
-  class ActiveRecordSchemaTest < ActiveSupport::TestCase
+  class ActiveRecordSchemaTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
     def setup
diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb
index 0b510df8d9..17188e0b79 100644
--- a/activerecord/test/cases/associations/callbacks_test.rb
+++ b/activerecord/test/cases/associations/callbacks_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
@@ -6,7 +6,7 @@ require 'models/category'
 require 'models/project'
 require 'models/developer'
 
-class AssociationCallbacksTest < ActiveSupport::TestCase
+class AssociationCallbacksTest < ActiveRecord::TestCase
   fixtures :posts, :authors, :projects, :developers
 
   def setup
diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 0ca0b21084..6349a3a8b2 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
@@ -8,7 +8,7 @@ require 'models/company'
 require 'models/topic'
 require 'models/reply'
 
-class CascadedEagerLoadingTest < ActiveSupport::TestCase
+class CascadedEagerLoadingTest < ActiveRecord::TestCase
   fixtures :authors, :mixins, :companies, :posts, :topics
 
   def test_eager_association_loading_with_cascaded_two_levels
@@ -95,7 +95,7 @@ end
 
 require 'models/vertex'
 require 'models/edge'
-class CascadedEagerLoadingTest < ActiveSupport::TestCase
+class CascadedEagerLoadingTest < ActiveRecord::TestCase
   fixtures :edges, :vertices
 
   def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index c1d89a2484..07d0b24613 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class Virus < ActiveRecord::Base
   belongs_to :octopus
@@ -39,7 +39,7 @@ class Compress < ActiveRecord::Base
 end
 
 
-class EagerSingularizationTest < ActiveSupport::TestCase
+class EagerSingularizationTest < ActiveRecord::TestCase
 
   def setup
     if ActiveRecord::Base.connection.supports_migrations?
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 9ceb507e91..9c258b574f 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/tagging'
 require 'models/comment'
@@ -8,7 +8,7 @@ require 'models/company'
 require 'models/person'
 require 'models/reader'
 
-class EagerAssociationTest < ActiveSupport::TestCase
+class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers
 
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index a34f1bf2bf..5c01c3c1f5 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -1,10 +1,10 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/project'
 require 'models/developer'
 
-class AssociationsExtensionsTest < ActiveSupport::TestCase
+class AssociationsExtensionsTest < ActiveRecord::TestCase
   fixtures :projects, :developers, :developers_projects, :comments, :posts
 
   def test_extension_on_has_many
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index 3f3cc4f167..f87c914125 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
 require 'models/category'
 require 'models/categorization'
 
-class InnerJoinAssociationTest < ActiveSupport::TestCase
+class InnerJoinAssociationTest < ActiveRecord::TestCase
   fixtures :authors, :posts, :comments, :categories, :categories_posts, :categorizations
 
   def test_construct_finder_sql_creates_inner_joins
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index c8ae42d78c..f59fe70654 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/tag'
 require 'models/tagging'
 require 'models/post'
@@ -12,7 +12,7 @@ require 'models/edge'
 require 'models/book'
 require 'models/citation'
 
-class AssociationsJoinModelTest < ActiveSupport::TestCase
+class AssociationsJoinModelTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
   fixtures :posts, :authors, :categories, :categorizations, :comments, :tags, :taggings, :author_favorites, :vertices, :items, :books
 
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 301f8a6e2c..a15abf90a6 100755
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/company'
@@ -17,7 +17,7 @@ require 'models/tagging'
 require 'models/person'
 require 'models/reader'
 
-class AssociationsTest < ActiveSupport::TestCase
+class AssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects,
            :computers
 
@@ -78,7 +78,7 @@ class AssociationsTest < ActiveSupport::TestCase
   end
 end
 
-class AssociationProxyTest < ActiveSupport::TestCase
+class AssociationProxyTest < ActiveRecord::TestCase
   fixtures :authors, :posts, :categorizations, :categories, :developers, :projects, :developers_projects
 
   def test_proxy_accessors
@@ -171,7 +171,7 @@ class AssociationProxyTest < ActiveSupport::TestCase
   end
 end
 
-class HasOneAssociationsTest < ActiveSupport::TestCase
+class HasOneAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :developers_projects
 
   def setup
@@ -468,7 +468,7 @@ class HasOneAssociationsTest < ActiveSupport::TestCase
 end
 
 
-class HasManyAssociationsTest < ActiveSupport::TestCase
+class HasManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects,
            :developers_projects, :topics, :authors, :comments, :author_addresses
 
@@ -1218,7 +1218,7 @@ class HasManyAssociationsTest < ActiveSupport::TestCase
 
 end
 
-class BelongsToAssociationsTest < ActiveSupport::TestCase
+class BelongsToAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :topics,
            :developers_projects, :computers, :authors, :posts, :tags, :taggings
 
@@ -1594,7 +1594,7 @@ class DeveloperForProjectWithAfterCreateHook < ActiveRecord::Base
 end
 
 
-class HasAndBelongsToManyAssociationsTest < ActiveSupport::TestCase
+class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects
 
   def test_has_and_belongs_to_many
@@ -2134,7 +2134,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveSupport::TestCase
 end
 
 
-class OverridingAssociationsTest < ActiveSupport::TestCase
+class OverridingAssociationsTest < ActiveRecord::TestCase
   class Person < ActiveRecord::Base; end
   class DifferentPerson < ActiveRecord::Base; end
 
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 05737d1d15..d2bfb02846 100755
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 
-class AttributeMethodsTest < ActiveSupport::TestCase
+class AttributeMethodsTest < ActiveRecord::TestCase
   fixtures :topics
   def setup
     @old_suffixes = ActiveRecord::Base.send(:attribute_method_suffixes).dup
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 7c141ab5f6..4339b725c8 100755
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/company'
@@ -71,7 +71,7 @@ class TopicWithProtectedContentAndAccessibleAuthorName < ActiveRecord::Base
   attr_protected  :content
 end
 
-class BasicsTest < ActiveSupport::TestCase
+class BasicsTest < ActiveRecord::TestCase
   fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things'
 
   def test_table_exists
diff --git a/activerecord/test/cases/binary_test.rb b/activerecord/test/cases/binary_test.rb
index e18a44f27e..2effa5736f 100644
--- a/activerecord/test/cases/binary_test.rb
+++ b/activerecord/test/cases/binary_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 # Without using prepared statements, it makes no sense to test
 # BLOB data with SQL Server, because the length of a statement is
@@ -10,14 +10,14 @@ require 'abstract_unit'
 unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :DB2Adapter, :FirebirdAdapter)
   require 'models/binary'
 
-  class BinaryTest < ActiveSupport::TestCase
+  class BinaryTest < ActiveRecord::TestCase
     FIXTURES = %w(flowers.jpg example.log)
 
     def test_load_save
       Binary.delete_all
 
       FIXTURES.each do |filename|
-        data = File.read("#{File.dirname(__FILE__)}/../assets/#{filename}").freeze
+        data = File.read(ASSETS_ROOT + "/#{filename}").freeze
 
         bin = Binary.new(:data => data)
         assert_equal data, bin.data, 'Newly assigned data differs from original'
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 4acd85ea08..7e7beefb77 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/company'
 require 'models/topic'
 
@@ -8,7 +8,7 @@ class NumericData < ActiveRecord::Base
   self.table_name = 'numeric_data'
 end
 
-class CalculationsTest < ActiveSupport::TestCase
+class CalculationsTest < ActiveRecord::TestCase
   fixtures :companies, :accounts, :topics
 
   def test_should_sum_field
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 50c5d4ea62..11830a2ef6 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class CallbackDeveloper < ActiveRecord::Base
   set_table_name 'developers'
@@ -126,7 +126,7 @@ class CallbackCancellationDeveloper < ActiveRecord::Base
   end
 end
 
-class CallbacksTest < ActiveSupport::TestCase
+class CallbacksTest < ActiveRecord::TestCase
   fixtures :developers
 
   def test_initialize
diff --git a/activerecord/test/cases/class_inheritable_attributes_test.rb b/activerecord/test/cases/class_inheritable_attributes_test.rb
index 4f04f41e76..abeb63c591 100644
--- a/activerecord/test/cases/class_inheritable_attributes_test.rb
+++ b/activerecord/test/cases/class_inheritable_attributes_test.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'abstract_unit'
+require "cases/helper"
 require 'active_support/core_ext/class/inheritable_attributes'
 
 class A
@@ -19,7 +19,7 @@ class D < B
 end
 
 
-class ClassInheritableAttributesTest < ActiveSupport::TestCase
+class ClassInheritableAttributesTest < ActiveRecord::TestCase
   def test_first_level
     assert_equal [ :one, :two ], B.read_inheritable_attribute("first")
     assert_equal [ :three ], C.read_inheritable_attribute("first")
diff --git a/activerecord/test/cases/column_alias_test.rb b/activerecord/test/cases/column_alias_test.rb
index 5b41ba677b..40707d9cb2 100644
--- a/activerecord/test/cases/column_alias_test.rb
+++ b/activerecord/test/cases/column_alias_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 
-class TestColumnAlias < ActiveSupport::TestCase
+class TestColumnAlias < ActiveRecord::TestCase
   fixtures :topics
 
   QUERY = if 'Oracle' == ActiveRecord::Base.connection.adapter_name
diff --git a/activerecord/test/cases/connection_test_firebird.rb b/activerecord/test/cases/connection_test_firebird.rb
index 1280025e1f..f57ea686a5 100644
--- a/activerecord/test/cases/connection_test_firebird.rb
+++ b/activerecord/test/cases/connection_test_firebird.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class FirebirdConnectionTest < ActiveSupport::TestCase
+class FirebirdConnectionTest < ActiveRecord::TestCase
   def test_charset_properly_set
     fb_conn = ActiveRecord::Base.connection.instance_variable_get(:@connection)
     assert_equal 'UTF8', fb_conn.database.character_set
diff --git a/activerecord/test/cases/connection_test_mysql.rb b/activerecord/test/cases/connection_test_mysql.rb
index 4a1e6cdfc4..1adbf18e73 100644
--- a/activerecord/test/cases/connection_test_mysql.rb
+++ b/activerecord/test/cases/connection_test_mysql.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class MysqlConnectionTest < ActiveSupport::TestCase
+class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     @connection = ActiveRecord::Base.connection
   end
diff --git a/activerecord/test/cases/copy_table_test_sqlite.rb b/activerecord/test/cases/copy_table_test_sqlite.rb
index ec58295cd1..f0cfb67866 100644
--- a/activerecord/test/cases/copy_table_test_sqlite.rb
+++ b/activerecord/test/cases/copy_table_test_sqlite.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class CopyTableTest < ActiveSupport::TestCase
+class CopyTableTest < ActiveRecord::TestCase
   fixtures :companies, :comments
 
   def setup
diff --git a/activerecord/test/cases/datatype_test_postgresql.rb b/activerecord/test/cases/datatype_test_postgresql.rb
index 5b882f7a2b..41726ce518 100644
--- a/activerecord/test/cases/datatype_test_postgresql.rb
+++ b/activerecord/test/cases/datatype_test_postgresql.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class PostgresqlArray < ActiveRecord::Base
 end
@@ -21,7 +21,7 @@ end
 class PostgresqlOid < ActiveRecord::Base
 end
 
-class PostgresqlDataTypeTest < ActiveSupport::TestCase
+class PostgresqlDataTypeTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
diff --git a/activerecord/test/cases/date_time_test.rb b/activerecord/test/cases/date_time_test.rb
index 46078fc8d6..36e1caa0b6 100644
--- a/activerecord/test/cases/date_time_test.rb
+++ b/activerecord/test/cases/date_time_test.rb
@@ -1,8 +1,8 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/task'
 
-class DateTimeTest < ActiveSupport::TestCase
+class DateTimeTest < ActiveRecord::TestCase
   def test_saves_both_date_and_time
     time_values = [1807, 2, 10, 15, 30, 45]
     now = DateTime.civil(*time_values)
diff --git a/activerecord/test/cases/default_test_firebird.rb b/activerecord/test/cases/default_test_firebird.rb
index cc30c7f986..713c7e11bf 100644
--- a/activerecord/test/cases/default_test_firebird.rb
+++ b/activerecord/test/cases/default_test_firebird.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/default'
 
-class DefaultTest < ActiveSupport::TestCase
+class DefaultTest < ActiveRecord::TestCase
   def test_default_timestamp
     default = Default.new
     assert_instance_of(Time, default.default_timestamp)
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 187161d993..ac133da47a 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -1,8 +1,8 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/default'
 require 'models/entrant'
 
-class DefaultTest < ActiveSupport::TestCase
+class DefaultTest < ActiveRecord::TestCase
   def test_nil_defaults_for_not_null_columns
     column_defaults =
       if current_adapter?(:MysqlAdapter)
diff --git a/activerecord/test/cases/deprecated_finder_test.rb b/activerecord/test/cases/deprecated_finder_test.rb
index a105c701dc..2afc91b769 100755
--- a/activerecord/test/cases/deprecated_finder_test.rb
+++ b/activerecord/test/cases/deprecated_finder_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/entrant'
 
-class DeprecatedFinderTest < ActiveSupport::TestCase
+class DeprecatedFinderTest < ActiveRecord::TestCase
   fixtures :entrants
 
   def test_deprecated_find_all_was_removed
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 73b604c708..d17712e1bf 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/author'
 require 'models/comment'
 require 'models/company'
@@ -9,7 +9,7 @@ require 'models/developer'
 require 'models/post'
 require 'models/customer'
 
-class FinderTest < ActiveSupport::TestCase
+class FinderTest < ActiveRecord::TestCase
   fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers
 
   def test_find
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 3219c12dcf..8dbccbba98 100755
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/binary'
 require 'models/topic'
@@ -16,7 +16,7 @@ require 'models/treasure'
 require 'models/matey'
 require 'models/ship'
 
-class FixturesTest < ActiveSupport::TestCase
+class FixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = false
 
@@ -27,8 +27,6 @@ class FixturesTest < ActiveSupport::TestCase
                  movies projects subscribers topics tasks )
   MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/
 
-  BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/../assets/flowers.jpg'
-
   def test_clean_fixtures
     FIXTURES.each do |name|
       fixtures = nil
@@ -140,26 +138,26 @@ class FixturesTest < ActiveSupport::TestCase
   end
 
   def test_empty_yaml_fixture
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/yml/accounts")
+    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts")
   end
 
   def test_empty_yaml_fixture_with_a_comment_in_it
-    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/../fixtures/naked/yml/companies")
+    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies")
   end
 
   def test_dirty_dirty_yaml_file
     assert_raises(Fixture::FormatError) do
-      Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/../fixtures/naked/yml/courses")
+      Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses")
     end
   end
 
   def test_empty_csv_fixtures
-    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/csv/accounts")
+    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/csv/accounts")
   end
 
   def test_omap_fixtures
     assert_nothing_raised do
-      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/../fixtures/categories_ordered')
+      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered")
 
       i = 0
       fixtures.each do |name, fixture|
@@ -182,13 +180,13 @@ class FixturesTest < ActiveSupport::TestCase
 
   def test_binary_in_fixtures
     assert_equal 1, @binaries.size
-    data = File.open(BINARY_FIXTURE_PATH, "rb").read.freeze
+    data = File.open(ASSETS_ROOT + "/flowers.jpg", "rb").read.freeze
     assert_equal data, @flowers.data
   end
 end
 
 if Account.connection.respond_to?(:reset_pk_sequence!)
-  class FixturesResetPkSequenceTest < ActiveSupport::TestCase
+  class FixturesResetPkSequenceTest < ActiveRecord::TestCase
     fixtures :accounts
     fixtures :companies
 
@@ -234,7 +232,7 @@ if Account.connection.respond_to?(:reset_pk_sequence!)
   end
 end
 
-class FixturesWithoutInstantiationTest < ActiveSupport::TestCase
+class FixturesWithoutInstantiationTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = false
   fixtures :topics, :developers, :accounts
 
@@ -269,7 +267,7 @@ class FixturesWithoutInstantiationTest < ActiveSupport::TestCase
   end
 end
 
-class FixturesWithoutInstanceInstantiationTest < ActiveSupport::TestCase
+class FixturesWithoutInstanceInstantiationTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_instantiated_fixtures = :no_instances
 
@@ -283,7 +281,7 @@ class FixturesWithoutInstanceInstantiationTest < ActiveSupport::TestCase
   end
 end
 
-class TransactionalFixturesTest < ActiveSupport::TestCase
+class TransactionalFixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = true
 
@@ -299,7 +297,7 @@ class TransactionalFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class MultipleFixturesTest < ActiveSupport::TestCase
+class MultipleFixturesTest < ActiveRecord::TestCase
   fixtures :topics
   fixtures :developers, :accounts
 
@@ -308,7 +306,7 @@ class MultipleFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class SetupTest < ActiveSupport::TestCase
+class SetupTest < ActiveRecord::TestCase
   # fixtures :topics
 
   def setup
@@ -332,7 +330,7 @@ class SetupSubclassTest < SetupTest
 end
 
 
-class OverlappingFixturesTest < ActiveSupport::TestCase
+class OverlappingFixturesTest < ActiveRecord::TestCase
   fixtures :topics, :developers
   fixtures :developers, :accounts
 
@@ -341,7 +339,7 @@ class OverlappingFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class ForeignKeyFixturesTest < ActiveSupport::TestCase
+class ForeignKeyFixturesTest < ActiveRecord::TestCase
   fixtures :fk_test_has_pk, :fk_test_has_fk
 
   # if foreign keys are implemented and fixtures
@@ -357,7 +355,7 @@ class ForeignKeyFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class SetTableNameFixturesTest < ActiveSupport::TestCase
+class SetTableNameFixturesTest < ActiveRecord::TestCase
   set_fixture_class :funny_jokes => 'Joke'
   fixtures :funny_jokes
 
@@ -366,7 +364,7 @@ class SetTableNameFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class CustomConnectionFixturesTest < ActiveSupport::TestCase
+class CustomConnectionFixturesTest < ActiveRecord::TestCase
   set_fixture_class :courses => Course
   fixtures :courses
 
@@ -376,7 +374,7 @@ class CustomConnectionFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class InvalidTableNameFixturesTest < ActiveSupport::TestCase
+class InvalidTableNameFixturesTest < ActiveRecord::TestCase
   fixtures :funny_jokes
 
   def test_raises_error
@@ -386,7 +384,7 @@ class InvalidTableNameFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class CheckEscapedYamlFixturesTest < ActiveSupport::TestCase
+class CheckEscapedYamlFixturesTest < ActiveRecord::TestCase
   set_fixture_class :funny_jokes => 'Joke'
   fixtures :funny_jokes
 
@@ -396,7 +394,7 @@ class CheckEscapedYamlFixturesTest < ActiveSupport::TestCase
 end
 
 class DevelopersProject; end
-class ManyToManyFixturesWithClassDefined < ActiveSupport::TestCase
+class ManyToManyFixturesWithClassDefined < ActiveRecord::TestCase
   fixtures :developers_projects
 
   def test_this_should_run_cleanly
@@ -404,7 +402,7 @@ class ManyToManyFixturesWithClassDefined < ActiveSupport::TestCase
   end
 end
 
-class FixturesBrokenRollbackTest < ActiveSupport::TestCase
+class FixturesBrokenRollbackTest < ActiveRecord::TestCase
   def blank_setup; end
   alias_method :ar_setup_fixtures, :setup_fixtures
   alias_method :setup_fixtures, :blank_setup
@@ -429,8 +427,8 @@ class FixturesBrokenRollbackTest < ActiveSupport::TestCase
     end
 end
 
-class LoadAllFixturesTest < ActiveSupport::TestCase
-  self.fixture_path= File.join(File.dirname(__FILE__), '/../fixtures/all')
+class LoadAllFixturesTest < ActiveRecord::TestCase
+  self.fixture_path = FIXTURES_ROOT + "/all"
   fixtures :all
 
   def test_all_there
@@ -438,7 +436,7 @@ class LoadAllFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class FasterFixturesTest < ActiveSupport::TestCase
+class FasterFixturesTest < ActiveRecord::TestCase
   fixtures :categories, :authors
 
   def load_extra_fixture(name)
@@ -463,7 +461,7 @@ class FasterFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class FoxyFixturesTest < ActiveSupport::TestCase
+class FoxyFixturesTest < ActiveRecord::TestCase
   fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers, :developers
 
   def test_identifies_strings
@@ -583,7 +581,7 @@ class FoxyFixturesTest < ActiveSupport::TestCase
   end
 end
 
-class ActiveSupportSubclassWithFixturesTest < ActiveSupport::TestCase
+class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
   fixtures :parrots
 
   # This seemingly useless assertion catches a bug that caused the fixtures
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
new file mode 100644
index 0000000000..992da58499
--- /dev/null
+++ b/activerecord/test/cases/helper.rb
@@ -0,0 +1,46 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'config'
+
+require 'active_record'
+require 'active_record/fixtures'
+require 'active_record/test_case'
+require 'connection'
+
+# Show backtraces for deprecated behavior for quicker cleanup.
+ActiveSupport::Deprecation.debug = true
+
+# Quote "type" if it's a reserved word for the current connection.
+QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type')
+
+def current_adapter?(*types)
+  types.any? do |type|
+    ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
+  end
+end
+
+def uses_mocha(description)
+  require 'rubygems'
+  require 'mocha'
+  yield
+rescue LoadError
+  $stderr.puts "Skipping #{description} tests. `gem install mocha` and try again."
+end
+
+ActiveRecord::Base.connection.class.class_eval do
+  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
+
+  def execute_with_counting(sql, name = nil, &block)
+    $query_count ||= 0
+    $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
+    execute_without_counting(sql, name, &block)
+  end
+
+  alias_method_chain :execute, :counting
+end
+
+# Make with_scope public for tests
+class << ActiveRecord::Base
+  public :with_scope, :with_exclusive_scope
+end
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 5e23142b8a..c9eb83e371 100755
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/company'
 require 'models/project'
 require 'models/subscriber'
 
-class InheritanceTest < ActiveSupport::TestCase
+class InheritanceTest < ActiveRecord::TestCase
   fixtures :companies, :projects, :subscribers, :accounts
 
   def test_company_descends_from_active_record
@@ -175,7 +175,7 @@ class InheritanceTest < ActiveSupport::TestCase
 end
 
 
-class InheritanceComputeTypeTest < ActiveSupport::TestCase
+class InheritanceComputeTypeTest < ActiveRecord::TestCase
   fixtures :companies
 
   def setup
diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb
index 779b8e02ad..c4597a110d 100644
--- a/activerecord/test/cases/json_serialization_test.rb
+++ b/activerecord/test/cases/json_serialization_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/contact'
 require 'models/post'
 require 'models/author'
@@ -6,7 +6,7 @@ require 'models/tagging'
 require 'models/tag'
 require 'models/comment'
 
-class JsonSerializationTest < ActiveSupport::TestCase
+class JsonSerializationTest < ActiveRecord::TestCase
   def setup
     @contact = Contact.new(
       :name        => 'Konata Izumi',
@@ -63,7 +63,7 @@ class JsonSerializationTest < ActiveSupport::TestCase
   end
 end
 
-class DatabaseConnectedJsonEncodingTest < ActiveSupport::TestCase
+class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase
   fixtures :authors, :posts, :comments, :tags, :taggings
 
   def setup
diff --git a/activerecord/test/cases/lifecycle_test.rb b/activerecord/test/cases/lifecycle_test.rb
index 8d7b0eb3d2..7660254528 100755
--- a/activerecord/test/cases/lifecycle_test.rb
+++ b/activerecord/test/cases/lifecycle_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/developer'
 require 'models/reply'
@@ -64,7 +64,7 @@ class MultiObserver < ActiveRecord::Observer
   end
 end
 
-class LifecycleTest < ActiveSupport::TestCase
+class LifecycleTest < ActiveRecord::TestCase
   fixtures :topics, :developers
 
   def test_before_destroy
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index eb82b13e19..e80f902d0d 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/person'
 require 'models/reader'
 require 'models/legacy_thing'
@@ -14,7 +14,7 @@ class ReadonlyFirstNamePerson < Person
   attr_readonly :first_name
 end
 
-class OptimisticLockingTest < ActiveSupport::TestCase
+class OptimisticLockingTest < ActiveRecord::TestCase
   fixtures :people, :legacy_things
 
   # need to disable transactional fixtures, because otherwise the sqlite3
@@ -176,7 +176,7 @@ end
 # TODO: The SQL Server, Sybase, and OpenBase adapters currently have no support for pessimistic locking
 
 unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :OpenBaseAdapter)
-  class PessimisticLockingTest < ActiveSupport::TestCase
+  class PessimisticLockingTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
     fixtures :people, :readers
 
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index e8e053a311..478050f207 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/developer'
 require 'models/project'
 require 'models/comment'
 require 'models/post'
 require 'models/category'
 
-class MethodScopingTest < ActiveSupport::TestCase
+class MethodScopingTest < ActiveRecord::TestCase
   fixtures :developers, :projects, :comments, :posts
 
   def test_set_conditions
@@ -125,7 +125,7 @@ class MethodScopingTest < ActiveSupport::TestCase
   end
 end
 
-class NestedScopingTest < ActiveSupport::TestCase
+class NestedScopingTest < ActiveRecord::TestCase
   fixtures :developers, :projects, :comments, :posts
 
   def test_merge_options
@@ -313,7 +313,7 @@ class NestedScopingTest < ActiveSupport::TestCase
   end
 end
 
-class HasManyScopingTest< ActiveSupport::TestCase
+class HasManyScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
   def setup
@@ -343,7 +343,7 @@ class HasManyScopingTest< ActiveSupport::TestCase
 end
 
 
-class HasAndBelongsToManyScopingTest< ActiveSupport::TestCase
+class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
   fixtures :posts, :categories, :categories_posts
 
   def setup
@@ -373,7 +373,7 @@ end
 # We disabled the scoping for has_one and belongs_to as we can't think of a proper use case
 
 
-class BelongsToScopingTest< ActiveSupport::TestCase
+class BelongsToScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
   def setup
@@ -393,7 +393,7 @@ class BelongsToScopingTest< ActiveSupport::TestCase
 end
 
 
-class HasOneScopingTest< ActiveSupport::TestCase
+class HasOneScopingTest< ActiveRecord::TestCase
   fixtures :comments, :posts
 
   def setup
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index af34fd47bf..59cb6c1fe7 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1,11 +1,12 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'bigdecimal/util'
 
 require 'models/person'
 require 'models/topic'
-require 'migrations/valid/1_people_have_last_names'
-require 'migrations/valid/2_we_need_reminders'
-require 'migrations/decimal/1_give_me_big_numbers'
+
+require MIGRATIONS_ROOT + "/valid/1_people_have_last_names"
+require MIGRATIONS_ROOT + "/valid/2_we_need_reminders"
+require MIGRATIONS_ROOT + "/decimal/1_give_me_big_numbers"
 
 if ActiveRecord::Base.connection.supports_migrations?
   class BigNumber < ActiveRecord::Base; end
@@ -22,7 +23,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
-  class MigrationTest < ActiveSupport::TestCase
+  class MigrationTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
     fixtures :people
@@ -695,7 +696,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid')
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
 
       assert_equal 3, ActiveRecord::Migrator.current_version
       Person.reset_column_information
@@ -703,7 +704,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
 
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid')
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid")
 
       assert_equal 0, ActiveRecord::Migrator.current_version
       Person.reset_column_information
@@ -715,22 +716,22 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 2)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 2)
 
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
     end
 
     def test_migrator_one_down
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid')
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid")
 
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 1)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 1)
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
@@ -738,39 +739,39 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
 
     def test_migrator_one_up_one_down
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1)
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
 
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
     end
 
     def test_migrator_verbosity
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
       assert PeopleHaveLastNames.message_count > 0
       PeopleHaveLastNames.message_count = 0
 
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
       assert PeopleHaveLastNames.message_count > 0
       PeopleHaveLastNames.message_count = 0
     end
 
     def test_migrator_verbosity_off
       PeopleHaveLastNames.verbose = false
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
       assert PeopleHaveLastNames.message_count.zero?
-      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/../migrations/valid', 0)
+      ActiveRecord::Migrator.down(MIGRATIONS_ROOT + "/valid", 0)
       assert PeopleHaveLastNames.message_count.zero?
     end
 
     def test_migrator_going_down_due_to_version_target
-      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/../migrations/valid', 1)
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/valid', 0)
+      ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/valid", 1)
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid", 0)
 
       assert !Person.column_methods_hash.include?(:last_name)
       assert !Reminder.table_exists?
 
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/valid')
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/valid")
 
       Person.reset_column_information
       assert Person.column_methods_hash.include?(:last_name)
@@ -863,16 +864,16 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_migrator_with_duplicates
       assert_raises(ActiveRecord::DuplicateMigrationVersionError) do
-        ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/duplicate', nil)
+        ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/duplicate", nil)
       end
     end
 
     def test_migrator_with_missing_version_numbers
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/missing', 500)
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/missing", 500)
       assert !Person.column_methods_hash.include?(:middle_name)
       assert_equal 4, ActiveRecord::Migrator.current_version
 
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/../migrations/missing', 2)
+      ActiveRecord::Migrator.migrate(MIGRATIONS_ROOT + "/missing", 2)
       Person.reset_column_information
       assert !Reminder.table_exists?
       assert Person.column_methods_hash.include?(:last_name)
@@ -918,7 +919,7 @@ if ActiveRecord::Base.connection.supports_migrations?
   end
 
   uses_mocha 'Sexy migration tests' do
-    class SexyMigrationsTest < ActiveSupport::TestCase
+    class SexyMigrationsTest < ActiveRecord::TestCase
       def test_references_column_type_adds_id
         with_new_table do |t|
           t.expects(:column).with('customer_id', :integer, {})
diff --git a/activerecord/test/cases/migration_test_firebird.rb b/activerecord/test/cases/migration_test_firebird.rb
index bf8166bcee..710661b9bd 100644
--- a/activerecord/test/cases/migration_test_firebird.rb
+++ b/activerecord/test/cases/migration_test_firebird.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/course'
 
-class FirebirdMigrationTest < ActiveSupport::TestCase
+class FirebirdMigrationTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb
index 0823ffddd6..ffd1812212 100644
--- a/activerecord/test/cases/mixin_test.rb
+++ b/activerecord/test/cases/mixin_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class Mixin < ActiveRecord::Base
 end
@@ -21,7 +21,7 @@ class Time
 end
 
 
-class TouchTest < ActiveSupport::TestCase
+class TouchTest < ActiveRecord::TestCase
   fixtures :mixins
 
   def setup
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index 4686aad44e..c433da71f2 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/company_in_module'
 
-class ModulesTest < ActiveSupport::TestCase
+class ModulesTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :projects, :developers
 
   def test_module_spanning_associations
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index 79477f5150..236e4710a4 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -1,10 +1,10 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/entrant'
 
 # So we can test whether Course.connection survives a reload.
 require_dependency 'models/course'
 
-class MultipleDbTest < ActiveSupport::TestCase
+class MultipleDbTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
diff --git a/activerecord/test/cases/pk_test.rb b/activerecord/test/cases/pk_test.rb
index f5f2eb3409..948a570b93 100644
--- a/activerecord/test/cases/pk_test.rb
+++ b/activerecord/test/cases/pk_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/subscriber'
@@ -6,7 +6,7 @@ require 'models/movie'
 require 'models/keyboard'
 require 'models/mixed_case_monkey'
 
-class PrimaryKeysTest < ActiveSupport::TestCase
+class PrimaryKeysTest < ActiveRecord::TestCase
   fixtures :topics, :subscribers, :movies, :mixed_case_monkeys
 
   def test_integer_key
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 969a407c95..e50cb32c65 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/task'
@@ -7,7 +7,7 @@ require 'models/category'
 require 'models/post'
 
 
-class QueryCacheTest < ActiveSupport::TestCase
+class QueryCacheTest < ActiveRecord::TestCase
   fixtures :tasks, :topics, :categories, :posts, :categories_posts
 
   def test_find_queries
@@ -57,7 +57,7 @@ end
 
 uses_mocha 'QueryCacheExpiryTest' do
 
-class QueryCacheExpiryTest < ActiveSupport::TestCase
+class QueryCacheExpiryTest < ActiveRecord::TestCase
   fixtures :tasks
 
   def test_find
diff --git a/activerecord/test/cases/readonly_test.rb b/activerecord/test/cases/readonly_test.rb
index aea5463aa1..b921cbdc9c 100755
--- a/activerecord/test/cases/readonly_test.rb
+++ b/activerecord/test/cases/readonly_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/developer'
@@ -11,7 +11,7 @@ def Comment.foo() find :first end
 def Project.foo() find :first end
 
 
-class ReadOnlyTest < ActiveSupport::TestCase
+class ReadOnlyTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :developers, :projects, :developers_projects
 
   def test_cant_save_readonly_record
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 3f742491f3..c2dedec3ef 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/customer'
 require 'models/company'
 require 'models/company_in_module'
 require 'models/subscriber'
 
-class ReflectionTest < ActiveSupport::TestCase
+class ReflectionTest < ActiveRecord::TestCase
   fixtures :topics, :customers, :companies, :subscribers
 
   def setup
diff --git a/activerecord/test/cases/reserved_word_test_mysql.rb b/activerecord/test/cases/reserved_word_test_mysql.rb
index 0087a0e8c6..ce1622bb20 100644
--- a/activerecord/test/cases/reserved_word_test_mysql.rb
+++ b/activerecord/test/cases/reserved_word_test_mysql.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class Group < ActiveRecord::Base
   Group.table_name = 'group'
@@ -23,7 +23,7 @@ end
 
 # a suite of tests to ensure the ConnectionAdapters#MysqlAdapter can handle tables with
 # reserved word names (ie: group, order, values, etc...)
-class MysqlReservedWordTest < ActiveSupport::TestCase
+class MysqlReservedWordTest < ActiveRecord::TestCase
   def setup
     @connection = ActiveRecord::Base.connection
 
@@ -156,8 +156,7 @@ class MysqlReservedWordTest < ActiveSupport::TestCase
   private
   # custom fixture loader, uses Fixtures#create_fixtures and appends base_path to the current file's path
   def create_test_fixtures(*fixture_names)
-    fixture_path = "./test/fixtures/reserved_words"
-    Fixtures.create_fixtures(fixture_path, fixture_names)
+    Fixtures.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
   end
 
   # custom drop table, uses execute on connection to drop a table if it exists. note: escapes table_name
diff --git a/activerecord/test/cases/schema_authorization_test_postgresql.rb b/activerecord/test/cases/schema_authorization_test_postgresql.rb
index d42611b515..61838d4bf7 100644
--- a/activerecord/test/cases/schema_authorization_test_postgresql.rb
+++ b/activerecord/test/cases/schema_authorization_test_postgresql.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class SchemaThing < ActiveRecord::Base
 end
 
-class SchemaAuthorizationTest < ActiveSupport::TestCase
+class SchemaAuthorizationTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   TABLE_NAME = 'schema_things'
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index b247412411..08f4a9b421 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -1,10 +1,10 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'active_record/schema_dumper'
 require 'stringio'
 
 if ActiveRecord::Base.connection.respond_to?(:tables)
 
-  class SchemaDumperTest < ActiveSupport::TestCase
+  class SchemaDumperTest < ActiveRecord::TestCase
     def standard_dump
       stream = StringIO.new
       ActiveRecord::SchemaDumper.ignore_tables = []
diff --git a/activerecord/test/cases/schema_test_postgresql.rb b/activerecord/test/cases/schema_test_postgresql.rb
index c38d6c9253..b5716cac4c 100644
--- a/activerecord/test/cases/schema_test_postgresql.rb
+++ b/activerecord/test/cases/schema_test_postgresql.rb
@@ -1,6 +1,6 @@
-require 'abstract_unit'
+require "cases/helper"
 
-class SchemaTest < ActiveSupport::TestCase
+class SchemaTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   SCHEMA_NAME = 'test_schema'
diff --git a/activerecord/test/cases/serialization_test.rb b/activerecord/test/cases/serialization_test.rb
index cb35c52397..8841694271 100644
--- a/activerecord/test/cases/serialization_test.rb
+++ b/activerecord/test/cases/serialization_test.rb
@@ -1,7 +1,7 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/contact'
 
-class SerializationTest < ActiveSupport::TestCase
+class SerializationTest < ActiveRecord::TestCase
   FORMATS = [ :xml, :json ]
 
   def setup
diff --git a/activerecord/test/cases/synonym_test_oracle.rb b/activerecord/test/cases/synonym_test_oracle.rb
index e8f1e8a4bd..b9a422a6ca 100644
--- a/activerecord/test/cases/synonym_test_oracle.rb
+++ b/activerecord/test/cases/synonym_test_oracle.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/subject'
 
@@ -6,7 +6,7 @@ require 'models/subject'
 # the "subjects" table in Oracle (defined in oci.sql) is just
 # a synonym to the "topics" table
 
-class TestOracleSynonym < ActiveSupport::TestCase
+class TestOracleSynonym < ActiveRecord::TestCase
 
   def test_oracle_synonym
     topic = Topic.new
diff --git a/activerecord/test/cases/table_name_test_sqlserver.rb b/activerecord/test/cases/table_name_test_sqlserver.rb
index af88a63371..fbf38a130e 100644
--- a/activerecord/test/cases/table_name_test_sqlserver.rb
+++ b/activerecord/test/cases/table_name_test_sqlserver.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'active_record/schema'
 
 if ActiveRecord::Base.connection.supports_migrations?
@@ -6,7 +6,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     self.table_name = '[order]'
   end
 
-  class TableNameTest < ActiveSupport::TestCase
+  class TableNameTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
     # Ensures Model.columns works when using SQLServer escape characters.
diff --git a/activerecord/test/cases/threaded_connections_test.rb b/activerecord/test/cases/threaded_connections_test.rb
index 247f4c8e68..28f8302367 100644
--- a/activerecord/test/cases/threaded_connections_test.rb
+++ b/activerecord/test/cases/threaded_connections_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 
 unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name
-  class ThreadedConnectionsTest < ActiveSupport::TestCase
+  class ThreadedConnectionsTest < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
     fixtures :topics
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index d9bcc88349..63f04e3014 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/developer'
 
-class TransactionTest < ActiveSupport::TestCase
+class TransactionTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
   fixtures :topics, :developers
 
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
index 6f475f8364..23ad10f3f9 100755
--- a/activerecord/test/cases/unconnected_test.rb
+++ b/activerecord/test/cases/unconnected_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class TestRecord < ActiveRecord::Base
 end
 
-class TestUnconnectedAdapter < ActiveSupport::TestCase
+class TestUnconnectedAdapter < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
diff --git a/activerecord/test/cases/validations_test.rb b/activerecord/test/cases/validations_test.rb
index 07936a783d..34caf0e67e 100755
--- a/activerecord/test/cases/validations_test.rb
+++ b/activerecord/test/cases/validations_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/topic'
 require 'models/reply'
 require 'models/person'
@@ -54,7 +54,7 @@ end
 class Thaumaturgist < IneptWizard
 end
 
-class ValidationsTest < ActiveSupport::TestCase
+class ValidationsTest < ActiveRecord::TestCase
   fixtures :topics, :developers, 'warehouse-things'
 
   def setup
@@ -1281,7 +1281,7 @@ class ValidationsTest < ActiveSupport::TestCase
 end
 
 
-class ValidatesNumericalityTest < ActiveSupport::TestCase
+class ValidatesNumericalityTest < ActiveRecord::TestCase
   NIL = [nil]
   BLANK = ["", " ", " \t \r \n"]
   BIGDECIMAL_STRINGS = %w(12345678901234567890.1234567890) # 30 significent digits
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index 95185bb743..63f48865cc 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/contact'
 require 'models/post'
 require 'models/author'
 require 'models/tagging'
 require 'models/comment'
 
-class XmlSerializationTest < ActiveSupport::TestCase
+class XmlSerializationTest < ActiveRecord::TestCase
   def test_should_serialize_default_root
     @xml = Contact.new.to_xml
     assert_match %r{^<contact>},  @xml
@@ -40,7 +40,7 @@ class XmlSerializationTest < ActiveSupport::TestCase
   end
 end
 
-class DefaultXmlSerializationTest < ActiveSupport::TestCase
+class DefaultXmlSerializationTest < ActiveRecord::TestCase
   def setup
     @xml = Contact.new(:name => 'aaron stack', :age => 25, :avatar => 'binarydata', :created_at => Time.utc(2006, 8, 1), :awesome => false, :preferences => { :gem => 'ruby' }).to_xml
   end
@@ -72,7 +72,7 @@ class DefaultXmlSerializationTest < ActiveSupport::TestCase
   end
 end
 
-class NilXmlSerializationTest < ActiveSupport::TestCase
+class NilXmlSerializationTest < ActiveRecord::TestCase
   def setup
     @xml = Contact.new.to_xml(:root => 'xml_contact')
   end
@@ -118,7 +118,7 @@ class NilXmlSerializationTest < ActiveSupport::TestCase
   end
 end
 
-class DatabaseConnectedXmlSerializationTest < ActiveSupport::TestCase
+class DatabaseConnectedXmlSerializationTest < ActiveRecord::TestCase
   fixtures :authors, :posts
   # to_xml used to mess with the hash the user provided which
   # caused the builder to be reused.  This meant the document kept
diff --git a/activerecord/test/config.rb b/activerecord/test/config.rb
new file mode 100644
index 0000000000..6e2e8b2145
--- /dev/null
+++ b/activerecord/test/config.rb
@@ -0,0 +1,5 @@
+TEST_ROOT       = File.expand_path(File.dirname(__FILE__))
+ASSETS_ROOT     = TEST_ROOT + "/assets"
+FIXTURES_ROOT   = TEST_ROOT + "/fixtures"
+MIGRATIONS_ROOT = TEST_ROOT + "/migrations"
+SCHEMA_ROOT     = TEST_ROOT + "/schema"
diff --git a/activerecord/test/connections/native_sqlite/connection.rb b/activerecord/test/connections/native_sqlite/connection.rb
index 124cae43b9..fea985d8a3 100644
--- a/activerecord/test/connections/native_sqlite/connection.rb
+++ b/activerecord/test/connections/native_sqlite/connection.rb
@@ -6,7 +6,7 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 class SqliteError < StandardError
 end
 
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+BASE_DIR = FIXTURES_ROOT
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite"
 
diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb
index c0cfaadcfa..c517c2375e 100644
--- a/activerecord/test/connections/native_sqlite3/connection.rb
+++ b/activerecord/test/connections/native_sqlite3/connection.rb
@@ -6,7 +6,7 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 class SqliteError < StandardError
 end
 
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+BASE_DIR = FIXTURES_ROOT
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
 
diff --git a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
index 2adf8b37af..6aba9719bb 100644
--- a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
+++ b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
@@ -8,11 +8,11 @@ end
 
 def make_connection(clazz, db_definitions_file)
   clazz.establish_connection(:adapter => 'sqlite3', :database  => ':memory:')
-  File.read("#{File.dirname(__FILE__)}/../../schema/#{db_definitions_file}").split(';').each do |command|
+  File.read(SCHEMA_ROOT + "/#{db_definitions_file}").split(';').each do |command|
     clazz.connection.execute(command) unless command.strip.empty?
   end
 end
 
 make_connection(ActiveRecord::Base, 'sqlite.sql')
 make_connection(Course, 'sqlite2.sql')
-load("#{File.dirname(__FILE__)}/../../schema/schema.rb")
+load(SCHEMA_ROOT + "/schema.rb")
diff --git a/activerecord/test/fixtures/.gitignore b/activerecord/test/fixtures/.gitignore
new file mode 100644
index 0000000000..885029a512
--- /dev/null
+++ b/activerecord/test/fixtures/.gitignore
@@ -0,0 +1 @@
+*.sqlite*
\ No newline at end of file
-- 
cgit v1.2.3