Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8681

Show
Ignore:
Timestamp:
01/21/08 17:20:51 (10 months ago)
Author:
bitsweat
Message:

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/Rakefile

    r8539 r8681  
    55require 'rake/packagetask' 
    66require 'rake/gempackagetask' 
     7 
    78require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version') 
     9require File.expand_path(File.dirname(__FILE__)) + "/test/config" 
    810 
    911PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' 
    …… 
    3234    t.libs << "test" << "test/connections/native_#{adapter}" 
    3335    adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/] 
    34     t.pattern = "test/**/*_test{,_#{adapter_short}}.rb" 
     36    t.pattern = "test/cases/**/*_test{,_#{adapter_short}}.rb" 
    3537    t.verbose = true 
    3638  } 
    …… 
    4042  end 
    4143end 
    42  
    43 SCHEMA_PATH = File.join(File.dirname(__FILE__), *%w(test fixtures db_definitions)) 
    4444 
    4545namespace :mysql do 
    …… 
    7272    %x( createdb -U postgres activerecord_unittest ) 
    7373    %x( createdb -U postgres activerecord_unittest2 ) 
    74     %x( psql activerecord_unittest -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} postgres ) 
    75     %x( psql activerecord_unittest2 -f #{File.join(SCHEMA_PATH, 'postgresql2.sql')}  postgres ) 
     74    %x( psql activerecord_unittest -f #{File.join(SCHEMA_ROOT, 'postgresql.sql')} postgres ) 
     75    %x( psql activerecord_unittest2 -f #{File.join(SCHEMA_ROOT, 'postgresql2.sql')}  postgres ) 
    7676  end 
    7777 
    …… 
    118118      ) 
    119119    end 
    120     create_activerecord_unittest  = build_frontbase_database['activerecord_unittest',  File.join(SCHEMA_PATH, 'frontbase.sql')] 
    121     create_activerecord_unittest2 = build_frontbase_database['activerecord_unittest2', File.join(SCHEMA_PATH, 'frontbase2.sql')] 
     120    create_activerecord_unittest  = build_frontbase_database['activerecord_unittest',  File.join(SCHEMA_ROOT, 'frontbase.sql')] 
     121    create_activerecord_unittest2 = build_frontbase_database['activerecord_unittest2', File.join(SCHEMA_ROOT, 'frontbase2.sql')] 
    122122    execute_frontbase_sql = Proc.new do |sql| 
    123123      system(<<-SHELL) 
    …… 
    175175  s.add_dependency('activesupport', '= 2.0.2' + PKG_BUILD) 
    176176 
    177   s.files.delete "test/fixtures/fixture_database.sqlite" 
    178   s.files.delete "test/fixtures/fixture_database_2.sqlite" 
    179   s.files.delete "test/fixtures/fixture_database.sqlite3" 
    180   s.files.delete "test/fixtures/fixture_database_2.sqlite3" 
     177  s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite" 
     178  s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite" 
     179  s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite3" 
     180  s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite3" 
    181181  s.require_path = 'lib' 
    182182  s.autorequire = 'active_record' 

  • trunk/activerecord/RUNNING_UNIT_TESTS

    r7903 r8681  
    66test/connections/<your database>/connection.rb.  
    77When you have the database online, you can import the fixture tables with  
    8 the test/fixtures/db_definitions/*.sql files. 
     8the test/schema/*.sql files. 
    99 
    1010Make sure that you create database objects with the same user that you specified in  
    …… 
    2323== Running by hand 
    2424 
    25 Unit tests are located in test directory. If you only want to run a single test suite,  
     25Unit tests are located in test/cases directory. If you only want to run a single test suite,  
    2626you can do so with: 
    2727 

  • trunk/activerecord/test/cases/aaa_create_tables_test.rb

    r8661 r8681  
    11# The filename begins with "aaa" to ensure this is the first test. 
    2 require 'abstract_unit' 
     2require "cases/helper" 
    33 
    4 class AAACreateTablesTest < ActiveSupport::TestCase 
     4class AAACreateTablesTest < ActiveRecord::TestCase 
    55  self.use_transactional_fixtures = false 
    6  
    7   def setup 
    8     @base_path = "#{File.dirname(__FILE__)}/../schema" 
    9   end 
    106 
    117  def test_drop_and_create_main_tables 
    …… 
    1612  def test_load_schema 
    1713    if ActiveRecord::Base.connection.supports_migrations? 
    18       eval(File.read("#{File.dirname(__FILE__)}/../schema/schema.rb")) 
     14      eval(File.read(SCHEMA_ROOT + "/schema.rb")) 
    1915    else 
    2016      recreate ActiveRecord::Base, '3' 
    …… 
    2521  def test_drop_and_create_courses_table 
    2622    if Course.connection.supports_migrations? 
    27       eval(File.read("#{File.dirname(__FILE__)}/../schema/schema2.rb")) 
     23      eval(File.read(SCHEMA_ROOT + "/schema2.rb")) 
    2824    end 
    2925    recreate Course, '2' unless use_migrations_for_courses? 
    …… 
    3430    def use_migrations? 
    3531      unittest_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + ".sql" 
    36       not File.exist? "#{@base_path}/#{unittest_sql_filename}" 
     32      not File.exist? SCHEMA_ROOT + "/#{unittest_sql_filename}" 
    3733    end 
    3834 
    3935    def use_migrations_for_courses? 
    4036      unittest2_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + "2.sql" 
    41       not File.exist? "#{@base_path}/#{unittest2_sql_filename}" 
     37      not File.exist? SCHEMA_ROOT + "/#{unittest2_sql_filename}" 
    4238    end 
    4339 
    …… 
    4541      connection = base.connection 
    4642      adapter_name = connection.adapter_name.downcase + suffix.to_s 
    47       execute_sql_file "#{@base_path}/#{adapter_name}.drop.sql", connection 
    48       execute_sql_file "#{@base_path}/#{adapter_name}.sql", connection 
     43      execute_sql_file SCHEMA_ROOT + "/#{adapter_name}.drop.sql", connection 
     44      execute_sql_file SCHEMA_ROOT + "/#{adapter_name}.sql", connection 
    4945    end 
    5046 

  • trunk/activerecord/test/cases/active_schema_test_mysql.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    3 class ActiveSchemaTest < ActiveSupport::TestCase 
     3class ActiveSchemaTest < ActiveRecord::TestCase 
    44  def setup 
    55    ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do 

  • trunk/activerecord/test/cases/adapter_test_sqlserver.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/default' 
    33require 'models/post' 
    44require 'models/task' 
    55 
    6 class SqlServerAdapterTest < ActiveSupport::TestCase 
     6class SqlServerAdapterTest < ActiveRecord::TestCase 
    77  class TableWithRealColumn < ActiveRecord::Base; end 
    88 

  • trunk/activerecord/test/cases/adapter_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    3 class AdapterTest < ActiveSupport::TestCase 
     3class AdapterTest < ActiveRecord::TestCase 
    44  def setup 
    55    @connection = ActiveRecord::Base.connection 

  • trunk/activerecord/test/cases/aggregations_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/customer' 
    33 
    4 class AggregationsTest < ActiveSupport::TestCase 
     4class AggregationsTest < ActiveRecord::TestCase 
    55  fixtures :customers 
    66 
    …… 
    110110end 
    111111 
    112 class OverridingAggregationsTest < ActiveSupport::TestCase 
     112class OverridingAggregationsTest < ActiveRecord::TestCase 
    113113  class Name; end 
    114114  class DifferentName; end 

  • trunk/activerecord/test/cases/ar_schema_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'active_record/schema' 
    33 
    44if ActiveRecord::Base.connection.supports_migrations? 
    55 
    6   class ActiveRecordSchemaTest < ActiveSupport::TestCase 
     6  class ActiveRecordSchemaTest < ActiveRecord::TestCase 
    77    self.use_transactional_fixtures = false 
    88 

  • trunk/activerecord/test/cases/associations_test.rb

    r8675 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/developer' 
    33require 'models/project' 
    …… 
    1818require 'models/reader' 
    1919 
    20 class AssociationsTest < ActiveSupport::TestCase 
     20class AssociationsTest < ActiveRecord::TestCase 
    2121  fixtures :accounts, :companies, :developers, :projects, :developers_projects, 
    2222           :computers 
    …… 
    7979end 
    8080 
    81 class AssociationProxyTest < ActiveSupport::TestCase 
     81class AssociationProxyTest < ActiveRecord::TestCase 
    8282  fixtures :authors, :posts, :categorizations, :categories, :developers, :projects, :developers_projects 
    8383 
    …… 
    172172end 
    173173 
    174 class HasOneAssociationsTest < ActiveSupport::TestCase 
     174class HasOneAssociationsTest < ActiveRecord::TestCase 
    175175  fixtures :accounts, :companies, :developers, :projects, :developers_projects 
    176176 
    …… 
    469469 
    470470 
    471 class HasManyAssociationsTest < ActiveSupport::TestCase 
     471class HasManyAssociationsTest < ActiveRecord::TestCase 
    472472  fixtures :accounts, :companies, :developers, :projects, 
    473473           :developers_projects, :topics, :authors, :comments, :author_addresses 
    …… 
    12191219end 
    12201220 
    1221 class BelongsToAssociationsTest < ActiveSupport::TestCase 
     1221class BelongsToAssociationsTest < ActiveRecord::TestCase 
    12221222  fixtures :accounts, :companies, :developers, :projects, :topics, 
    12231223           :developers_projects, :computers, :authors, :posts, :tags, :taggings 
    …… 
    15951595 
    15961596 
    1597 class HasAndBelongsToManyAssociationsTest < ActiveSupport::TestCase 
     1597class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase 
    15981598  fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects 
    15991599 
    …… 
    21352135 
    21362136 
    2137 class OverridingAssociationsTest < ActiveSupport::TestCase 
     2137class OverridingAssociationsTest < ActiveRecord::TestCase 
    21382138  class Person < ActiveRecord::Base; end 
    21392139  class DifferentPerson < ActiveRecord::Base; end 

  • trunk/activerecord/test/cases/associations/callbacks_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/comment' 
    …… 
    77require 'models/developer' 
    88 
    9 class AssociationCallbacksTest < ActiveSupport::TestCase 
     9class AssociationCallbacksTest < ActiveRecord::TestCase 
    1010  fixtures :posts, :authors, :projects, :developers 
    1111 

  • trunk/activerecord/test/cases/associations/cascaded_eager_loading_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/comment' 
    …… 
    99require 'models/reply' 
    1010 
    11 class CascadedEagerLoadingTest < ActiveSupport::TestCase 
     11class CascadedEagerLoadingTest < ActiveRecord::TestCase 
    1212  fixtures :authors, :mixins, :companies, :posts, :topics 
    1313 
    …… 
    9696require 'models/vertex' 
    9797require 'models/edge' 
    98 class CascadedEagerLoadingTest < ActiveSupport::TestCase 
     98class CascadedEagerLoadingTest < ActiveRecord::TestCase 
    9999  fixtures :edges, :vertices 
    100100 

  • trunk/activerecord/test/cases/associations/eager_singularization_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    33class Virus < ActiveRecord::Base 
    …… 
    4040 
    4141 
    42 class EagerSingularizationTest < ActiveSupport::TestCase 
     42class EagerSingularizationTest < ActiveRecord::TestCase 
    4343 
    4444  def setup 

  • trunk/activerecord/test/cases/associations/eager_test.rb

    r8672 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/tagging' 
    …… 
    99require 'models/reader' 
    1010 
    11 class EagerAssociationTest < ActiveSupport::TestCase 
     11class EagerAssociationTest < ActiveRecord::TestCase 
    1212  fixtures :posts, :comments, :authors, :categories, :categories_posts, 
    1313            :companies, :accounts, :tags, :taggings, :people, :readers 

  • trunk/activerecord/test/cases/associations/extension_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/comment' 
    …… 
    55require 'models/developer' 
    66 
    7 class AssociationsExtensionsTest < ActiveSupport::TestCase 
     7class AssociationsExtensionsTest < ActiveRecord::TestCase 
    88  fixtures :projects, :developers, :developers_projects, :comments, :posts 
    99 

  • trunk/activerecord/test/cases/associations/inner_join_association_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/comment' 
    …… 
    66require 'models/categorization' 
    77 
    8 class InnerJoinAssociationTest < ActiveSupport::TestCase 
     8class InnerJoinAssociationTest < ActiveRecord::TestCase 
    99  fixtures :authors, :posts, :comments, :categories, :categories_posts, :categorizations 
    1010 

  • trunk/activerecord/test/cases/associations/join_model_test.rb

    r8672 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/tag' 
    33require 'models/tagging' 
    …… 
    1313require 'models/citation' 
    1414 
    15 class AssociationsJoinModelTest < ActiveSupport::TestCase 
     15class AssociationsJoinModelTest < ActiveRecord::TestCase 
    1616  self.use_transactional_fixtures = false 
    1717  fixtures :posts, :authors, :categories, :categorizations, :comments, :tags, :taggings, :author_favorites, :vertices, :items, :books 

  • trunk/activerecord/test/cases/attribute_methods_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/topic' 
    33 
    4 class AttributeMethodsTest < ActiveSupport::TestCase 
     4class AttributeMethodsTest < ActiveRecord::TestCase 
    55  fixtures :topics 
    66  def setup 

  • trunk/activerecord/test/cases/base_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/topic' 
    33require 'models/reply' 
    …… 
    7272end 
    7373 
    74 class BasicsTest < ActiveSupport::TestCase 
     74class BasicsTest < ActiveRecord::TestCase 
    7575  fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things' 
    7676 

  • trunk/activerecord/test/cases/binary_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    33# Without using prepared statements, it makes no sense to test 
    …… 
    1111  require 'models/binary' 
    1212 
    13   class BinaryTest < ActiveSupport::TestCase 
     13  class BinaryTest < ActiveRecord::TestCase 
    1414    FIXTURES = %w(flowers.jpg example.log) 
    1515 
    …… 
    1818 
    1919      FIXTURES.each do |filename| 
    20         data = File.read("#{File.dirname(__FILE__)}/../assets/#{filename}").freeze 
     20        data = File.read(ASSETS_ROOT + "/#{filename}").freeze 
    2121 
    2222        bin = Binary.new(:data => data) 

  • trunk/activerecord/test/cases/calculations_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/company' 
    33require 'models/topic' 
    …… 
    99end 
    1010 
    11 class CalculationsTest < ActiveSupport::TestCase 
     11class CalculationsTest < ActiveRecord::TestCase 
    1212  fixtures :companies, :accounts, :topics 
    1313 

  • trunk/activerecord/test/cases/callbacks_test.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    33class CallbackDeveloper < ActiveRecord::Base 
    …… 
    127127end 
    128128 
    129 class CallbacksTest < ActiveSupport::TestCase 
     129class CallbacksTest < ActiveRecord::TestCase 
    130130  fixtures :developers 
    131131 

  • trunk/activerecord/test/cases/class_inheritable_attributes_test.rb

    r8660 r8681  
    11require 'test/unit' 
    2 require 'abstract_unit' 
     2require "cases/helper" 
    33require 'active_support/core_ext/class/inheritable_attributes' 
    44 
    …… 
    2020 
    2121 
    22 class ClassInheritableAttributesTest < ActiveSupport::TestCase 
     22class ClassInheritableAttributesTest < ActiveRecord::TestCase 
    2323  def test_first_level 
    2424    assert_equal [ :one, :two ], B.read_inheritable_attribute("first") 

  • trunk/activerecord/test/cases/column_alias_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/topic' 
    33 
    4 class TestColumnAlias < ActiveSupport::TestCase 
     4class TestColumnAlias < ActiveRecord::TestCase 
    55  fixtures :topics 
    66 

  • trunk/activerecord/test/cases/connection_test_firebird.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    3 class FirebirdConnectionTest < ActiveSupport::TestCase 
     3class FirebirdConnectionTest < ActiveRecord::TestCase 
    44  def test_charset_properly_set 
    55    fb_conn = ActiveRecord::Base.connection.instance_variable_get(:@connection) 

  • trunk/activerecord/test/cases/connection_test_mysql.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    3 class MysqlConnectionTest < ActiveSupport::TestCase 
     3class MysqlConnectionTest < ActiveRecord::TestCase 
    44  def setup 
    55    @connection = ActiveRecord::Base.connection 

  • trunk/activerecord/test/cases/copy_table_test_sqlite.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    3 class CopyTableTest < ActiveSupport::TestCase 
     3class CopyTableTest < ActiveRecord::TestCase 
    44  fixtures :companies, :comments 
    55 

  • trunk/activerecord/test/cases/datatype_test_postgresql.rb

    r8660 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22 
    33class PostgresqlArray < ActiveRecord::Base 
    …… 
    2222end 
    2323 
    24 class PostgresqlDataTypeTest < ActiveSupport::TestCase 
     24class PostgresqlDataTypeTest < ActiveRecord::TestCase 
    2525  self.use_transactional_fixtures = false 
    2626 

  • trunk/activerecord/test/cases/date_time_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/topic' 
    33require 'models/task' 
    44 
    5 class DateTimeTest < ActiveSupport::TestCase 
     5class DateTimeTest < ActiveRecord::TestCase 
    66  def test_saves_both_date_and_time 
    77    time_values = [1807, 2, 10, 15, 30, 45] 

  • trunk/activerecord/test/cases/default_test_firebird.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/default' 
    33 
    4 class DefaultTest < ActiveSupport::TestCase 
     4class DefaultTest < ActiveRecord::TestCase 
    55  def test_default_timestamp 
    66    default = Default.new 

  • trunk/activerecord/test/cases/defaults_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/default' 
    33require 'models/entrant' 
    44 
    5 class DefaultTest < ActiveSupport::TestCase 
     5class DefaultTest < ActiveRecord::TestCase 
    66  def test_nil_defaults_for_not_null_columns 
    77    column_defaults = 

  • trunk/activerecord/test/cases/deprecated_finder_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/entrant' 
    33 
    4 class DeprecatedFinderTest < ActiveSupport::TestCase 
     4class DeprecatedFinderTest < ActiveRecord::TestCase 
    55  fixtures :entrants 
    66 

  • trunk/activerecord/test/cases/finder_test.rb

    r8671 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/author' 
    33require 'models/comment' 
    …… 
    1010require 'models/customer' 
    1111 
    12 class FinderTest < ActiveSupport::TestCase 
     12class FinderTest < ActiveRecord::TestCase 
    1313  fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :comments, :accounts, :authors, :customers 
    1414 

  • trunk/activerecord/test/cases/fixtures_test.rb

    r8661 r8681  
    1 require 'abstract_unit' 
     1require "cases/helper" 
    22require 'models/post' 
    33require 'models/binary' 
    …… 
    1717require 'models/ship' 
    1818 
    19 class FixturesTest < ActiveSupport::TestCase 
     19class FixturesTest < ActiveRecord::TestCase 
    2020  self.use_instantiated_fixtures = true 
    2121  self.use_transactional_fixtures = false 
    …… 
    2727                 movies projects subscribers topics tasks ) 
    2828  MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/ 
    29  
    30   BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/../assets/flowers.jpg' 
    3129 
    3230  def test_clean_fixtures 
    …… 
    141139 
    142140  def test_empty_yaml_fixture 
    143     assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/yml/accounts") 
     141    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/yml/accounts") 
    144142  end 
    145143 
    146144  def test_empty_yaml_fixture_with_a_comment_in_it 
    147     assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', File.dirname(__FILE__) + "/../fixtures/naked/yml/companies") 
     145    assert_not_nil Fixtures.new( Account.connection, "companies", 'Company', FIXTURES_ROOT + "/naked/yml/companies") 
    148146  end 
    149147 
    150148  def test_dirty_dirty_yaml_file 
    151149    assert_raises(Fixture::FormatError) do 
    152       Fixtures.new( Account.connection, "courses", 'Course', File.dirname(__FILE__) + "/../fixtures/naked/yml/courses") 
     150      Fixtures.new( Account.connection, "courses", 'Course', FIXTURES_ROOT + "/naked/yml/courses") 
    153151    end 
    154152  end 
    155153 
    156154  def test_empty_csv_fixtures 
    157     assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', File.dirname(__FILE__) + "/../fixtures/naked/csv/accounts") 
     155    assert_not_nil Fixtures.new( Account.connection, "accounts", 'Account', FIXTURES_ROOT + "/naked/csv/accounts") 
    158156  end 
    159157 
    160158  def test_omap_fixtures 
    161159    assert_nothing_raised do 
    162       fixtures = Fixtures.new(Account.connection, 'categories', 'Category', File.dirname(__FILE__) + '/../fixtures/categories_ordered') 
     160      fixtures = Fixtures.new(Account.connection, 'categories', 'Category', FIXTURES_ROOT + "/categories_ordered") 
    163161 
    164162      i = 0 
    …… 
    183181  def test_binary_in_fixtures 
    184182    assert_equal 1, @binaries.size 
    185     data = File.open(BINARY_FIXTURE_PATH, "rb").read.freeze 
     183    data = File.open(ASSETS_ROOT + "/flowers.jpg", "rb").read.freeze 
    186184    assert_equal data, @flowers.data 
    187185  end 
    …… 
    189187 
    190188if Account.connection.respond_to?(:reset_pk_sequence!) 
    191   class FixturesResetPkSequenceTest < ActiveSupport::TestCase 
     189  class FixturesResetPkSequenceTest < ActiveRecord::TestCase 
    192190    fixtures :accounts 
    193191    fixtures :companies 
    …… 
    235233end 
    236234 
    237 class FixturesWithoutInstantiationTest < ActiveSupport::TestCase 
     235class FixturesWithoutInstantiationTest < ActiveRecord::TestCase 
    238236  self.use_instantiated_fixtures = false 
    239237  fixtures :topics, :developers, :accounts 
    …… 
    270268end 
    271269 
    272 class FixturesWithoutInstanceInstantiationTest < ActiveSupport::TestCase 
     270class FixturesWithoutInstanceInstantiationTest < ActiveRecord::TestCase 
    273271  self.use_instantiated_fixtures = true 
    274272  self.use_instantiated_fixtures = :no_instances 
    …… 
    284282end 
    285283 
    286 class TransactionalFixturesTest < ActiveSupport::TestCase 
     284class TransactionalFixturesTest < ActiveRecord::TestCase 
    287285  self.use_instantiated_fixtures = true 
    288286  self.use_transactional_fixtures = true 
    …… 
    300298end 
    301299 
    302 class MultipleFixturesTest < ActiveSupport::TestCase 
     300class MultipleFixturesTest < ActiveRecord::TestCase 
    303301  fixtures :topics 
    304302  fixtures :developers, :accounts 
    …… 
    309307end 
    310308 
    311 class SetupTest < ActiveSupport::TestCase 
     309class SetupTest < ActiveRecord::TestCase 
    312310  # fixtures :topics 
    313311 
    …… 
    333331 
    334332 
    335 class OverlappingFixturesTest < ActiveSupport::TestCase 
     333class OverlappingFixturesTest < ActiveRecord::TestCase 
    336334  fixtures :topics, :developers 
    337335  fixtures :developers, :accounts 
    …… 
    342340end 
    343341 
    344 class ForeignKeyFixturesTest < ActiveSupport::TestCase 
     342class ForeignKeyFixturesTest < ActiveRecord::TestCase 
    345343  fixtures :fk_test_has_pk, :fk_test_has_fk 
    346344 
    …… 
    358356end 
    359357 
    360 class SetTableNameFixturesTest < ActiveSupport::TestCase 
     358class SetTableNameFixturesTest < ActiveRecord::TestCase 
    361359  set_fixture_class :funny_jokes => 'Joke' 
    362360  fixtures :funny_jokes 
    …… 
    367365end 
    368366 
    369 class CustomConnectionFixturesTest < ActiveSupport::TestCase 
     367class CustomConnectionFixturesTest < ActiveRecord::TestCase 
    370368  set_fixture_class :courses => Course 
    371369  fixtures :courses 
    …… 
    377375end 
    378376 
    379 class InvalidTableNameFixturesTest < ActiveSupport::TestCase 
     377class InvalidTableNameFixturesTest < ActiveRecord::TestCase 
    380378  fixtures :funny_jokes 
    381379 
    …… 
    387385end 
    388386 
    389 class CheckEscapedYamlFixturesTest < ActiveSupport::TestCase 
     387class CheckEscapedYamlFixturesTest < ActiveRecord::TestCase 
    390388  set_fixture_class :funny_jokes => 'Joke' 
    391389  fixtures :funny_jokes 
    …… 
    397395 
    398396class DevelopersProject; end 
    399 class ManyToManyFixturesWithClassDefined < ActiveSupport::TestCase 
     397class ManyToManyFixturesWithClassDefined < ActiveRecord::TestCase 
    400398  fixtures :developers_projects 
    401399 
    …… 
    405403end 
    406404 
    407 class FixturesBrokenRollbackTest < ActiveSupport::TestCase 
     405class FixturesBrokenRollbackTest < ActiveRecord::TestCase 
    408406  def blank_setup; end 
    409407  alias_method :ar_setup_fixtures, :setup_fixtures 
    …… 
    430428end 
    431429 
    432 class LoadAllFixturesTest < ActiveSupport::TestCase 
    433   self.fixture_path= File.join(File.dirname(__FILE__), '/../fixtures/all') 
     430class LoadAllFixturesTest < ActiveRecord::TestCase 
     431  self.fixture_path = FIXTURES_ROOT + "/all" 
    434432  fixtures :all 
    435433 
    ……