Changing trunk around to run tests similar to what rails3 branch has.

Author: metaskills

RUNNING_UNIT_TESTS

@@ -11,55 +11,13 @@ assumes you have a DSN setup that matches the name of the default database names
 
 == Requirements
 
-The following gems need to be installed. Make sure you have gems.github.com as a
-source. Info here. http://gems.github.com/
-
-We use echoe for packagemanagement to rubyforge. Not needed really for the tests 
-but since we need it... you need to install it.
-
-  * gem install echoe
-  * gem install thoughtbot-shoulda -s http://gems.github.com
+  * gem install shoulda
   * gem install mocha
 
-The tests of this adapter depend on the existence of rails checkout. All the tests
-defined by rails are re-used. For this to work the following directory structure 
-is assumed to exist:
-
-#{RAILS_ROOT}/vendor/plugins/adapters/sqlserver
-#{RAILS_ROOT}/vendor/rails/activerecord/test
+The tests of this adapter depend on the existence of rails checkout. Make sure 
+to checkout remotes/origin/2-3-stable, then make sure to export RAILS_SOURCE to 
+the full path of that repo.
 
 Define a user named 'rails' in SQL Server with all privileges granted for the 
 test databases. Use an empty password for said user.
 
-
-== Running with Rake
-
-The easiest way to run the unit tests is through Rake. Either run "rake test" which 
-defaults to ODBC mode or being mode specific using either "rake sqlserver:test:adonet" 
-or "rake sqlserver:test:odbc". For more information, checkout the full array of rake tasks 
-with "rake -T"
-
-Rake can be found at http://rake.rubyforge.org
-
-
-== Running with Autotest
-
-Using autotest is easy, just run "autotest" and the tests will run continually in the 
-same order as the rake test command. By default autotest will use ODBC connection. If 
-you want to change this you can edit the autotest/sqlserver.rb file and set odbc_mode 
-to false.
-
-Lastly, you can run autotest on just the adapter specific tests with "autotest sqlserver". 
-This will continuously run ONLY the SQL Sever specific behavior tests which are much 
-quicker to run than the entire active record test suite.
-
-
-== Running by hand
-
-Unit tests are located in test directory. If you only want to run a single test suite, 
-you can do so with:
-
-   rake test_sqlserver TEST=base_test.rb
-   
-That'll run the base suite using the SQLServer-Ruby adapter.
-

Rakefile

@@ -12,10 +12,10 @@ namespace :sqlserver do
       Rake::TestTask.new(mode) do |t|
         t.libs << "test"
         t.libs << "test/connections/native_sqlserver#{mode == 'adonet' ? '' : "_#{mode}"}"
-        t.libs << "../../../rails/activerecord/test/"
-        t.test_files = (
+        t.libs << "#{ENV['RAILS_SOURCE']}/activerecord/test"
+        t.test_files = \
           Dir.glob("test/cases/**/*_test_sqlserver.rb").sort + 
-          Dir.glob("../../../rails/activerecord/test/**/*_test.rb").sort )
+          Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/**/*_test.rb").sort
         t.verbose = true
       end
 

test/cases/sqlserver_helper.rb

@@ -1,21 +1,22 @@
+
+SQLSERVER_TEST_ROOT       = File.expand_path(File.join(File.dirname(__FILE__),'..'))
+SQLSERVER_ASSETS_ROOT     = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'assets'))
+SQLSERVER_FIXTURES_ROOT   = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'fixtures'))
+SQLSERVER_MIGRATIONS_ROOT = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'migrations'))
+SQLSERVER_SCHEMA_ROOT     = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'schema'))
+ACTIVERECORD_TEST_ROOT    = File.expand_path(File.join(ENV['RAILS_SOURCE'],'activerecord','test'))
+
 require 'rubygems'
 require 'shoulda'
 require 'mocha'
 [ File.expand_path(File.join(File.dirname(__FILE__),'..','..','test')),
   File.expand_path(File.join(File.dirname(__FILE__),'..','..','test','connections','native_sqlserver_odbc')),
-  File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','..','rails','activerecord','test'))
+  File.expand_path(File.join(ENV['RAILS_SOURCE'],'activerecord','test'))
 ].each{ |lib| $:.unshift(lib) unless $:.include?(lib) } if ENV['TM_DIRECTORY']
 require 'cases/helper'
 require 'models/topic'
 require 'active_record/version'
 
-SQLSERVER_TEST_ROOT       = File.expand_path(File.join(File.dirname(__FILE__),'..'))
-SQLSERVER_ASSETS_ROOT     = SQLSERVER_TEST_ROOT + "/assets"
-SQLSERVER_FIXTURES_ROOT   = SQLSERVER_TEST_ROOT + "/fixtures"
-SQLSERVER_MIGRATIONS_ROOT = SQLSERVER_TEST_ROOT + "/migrations"
-SQLSERVER_SCHEMA_ROOT     = SQLSERVER_TEST_ROOT + "/schema"
-ACTIVERECORD_TEST_ROOT    = File.expand_path(SQLSERVER_TEST_ROOT + "/../../../../rails/activerecord/test/")
-
 ActiveRecord::Migration.verbose = false
 
 # Defining our classes in one place as well as soem core tests that need coercing date/time types.