AR adapter helpers are now available only within AR::TestCase class

Author: amatsuda

activerecord/test/cases/adapter_test.rb

@@ -475,8 +475,8 @@ def reset_fixtures(*fixture_names)
       end
   end
 
-  unless in_memory_db?
-    class AdapterConnectionTest < ActiveRecord::TestCase
+  class AdapterConnectionTest < ActiveRecord::TestCase
+    unless in_memory_db?
       self.use_transactional_tests = false
 
       fixtures :posts, :authors, :author_addresses

activerecord/test/cases/adapters/mysql2/optimizer_hints_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "models/post"
 
-if supports_optimizer_hints?
-  class Mysql2OptimizerHintsTest < ActiveRecord::Mysql2TestCase
+class Mysql2OptimizerHintsTest < ActiveRecord::Mysql2TestCase
+  if supports_optimizer_hints?
     fixtures :posts
 
     def test_optimizer_hints

activerecord/test/cases/adapters/postgresql/optimizer_hints_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "models/post"
 
-if supports_optimizer_hints?
-  class PostgresqlOptimizerHintsTest < ActiveRecord::PostgreSQLTestCase
+class PostgresqlOptimizerHintsTest < ActiveRecord::PostgreSQLTestCase
+  if supports_optimizer_hints?
     fixtures :posts
 
     def setup

activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb

@@ -3,10 +3,10 @@
 require "cases/helper"
 require "support/connection_helper"
 
-if current_adapter?(:Mysql2Adapter)
-  module ActiveRecord
-    module ConnectionAdapters
-      class MysqlTypeLookupTest < ActiveRecord::TestCase
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlTypeLookupTest < ActiveRecord::TestCase
+      if current_adapter?(:Mysql2Adapter)
         include ConnectionHelper
 
         setup do

activerecord/test/cases/connection_adapters/type_lookup_test.rb

@@ -2,10 +2,10 @@
 
 require "cases/helper"
 
-unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strings for lookup
-  module ActiveRecord
-    module ConnectionAdapters
-      class TypeLookupTest < ActiveRecord::TestCase
+module ActiveRecord
+  module ConnectionAdapters
+    class TypeLookupTest < ActiveRecord::TestCase
+      unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strings for lookup
         setup do
           @connection = ActiveRecord::Base.connection
         end

activerecord/test/cases/date_time_precision_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "support/schema_dumping_helper"
 
-if supports_datetime_with_precision?
-  class DateTimePrecisionTest < ActiveRecord::TestCase
+class DateTimePrecisionTest < ActiveRecord::TestCase
+  if supports_datetime_with_precision?
     include SchemaDumpingHelper
     self.use_transactional_tests = false
 

activerecord/test/cases/defaults_test.rb

@@ -83,8 +83,8 @@ def test_default_strings_containing_single_quotes
   end
 end
 
-if current_adapter?(:SQLite3Adapter, :PostgreSQLAdapter)
-  class DefaultBinaryTest < ActiveRecord::TestCase
+class DefaultBinaryTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter, :PostgreSQLAdapter)
     class DefaultBinary < ActiveRecord::Base; end
 
     setup do
@@ -116,8 +116,8 @@ def test_default_varbinary_string_that_looks_like_hex
   end
 end
 
-if supports_text_column_with_default?
-  class DefaultTextTest < ActiveRecord::TestCase
+class DefaultTextTest < ActiveRecord::TestCase
+  if supports_text_column_with_default?
     class DefaultText < ActiveRecord::Base; end
 
     setup do
@@ -143,8 +143,8 @@ def test_default_texts_containing_single_quotes
   end
 end
 
-if current_adapter?(:PostgreSQLAdapter)
-  class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
+class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:PostgreSQLAdapter)
     include SchemaDumpingHelper
 
     test "schema dump includes default expression" do
@@ -164,8 +164,8 @@ class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
   end
 end
 
-if current_adapter?(:Mysql2Adapter)
-  class MysqlDefaultExpressionTest < ActiveRecord::TestCase
+class MysqlDefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     include SchemaDumpingHelper
 
     if supports_default_expression?
@@ -212,8 +212,10 @@ class MysqlDefaultExpressionTest < ActiveRecord::TestCase
       end
     end
   end
+end
 
-  class DefaultsTestWithoutTransactionalFixtures < ActiveRecord::TestCase
+class DefaultsTestWithoutTransactionalFixtures < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     # ActiveRecord::Base#create! (and #save and other related methods) will
     # open a new transaction. When in transactional tests mode, this will
     # cause Active Record to create a new savepoint. However, since MySQL doesn't
@@ -298,8 +300,8 @@ def with_mysql_not_null_table
   end
 end
 
-if current_adapter?(:SQLite3Adapter)
-  class Sqlite3DefaultExpressionTest < ActiveRecord::TestCase
+class Sqlite3DefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter)
     include SchemaDumpingHelper
 
     test "schema dump includes default expression" do

activerecord/test/cases/fixtures_test.rb

@@ -1510,8 +1510,8 @@ class PrimaryKeyErrorTest < ActiveRecord::TestCase
   end
 end
 
-if current_adapter?(:SQLite3Adapter) && !in_memory_db?
-  class MultipleFixtureConnectionsTest < ActiveRecord::TestCase
+class MultipleFixtureConnectionsTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter) && !in_memory_db?
     include ActiveRecord::TestFixtures
 
     fixtures :dogs

activerecord/test/cases/invalid_connection_test.rb

@@ -2,8 +2,8 @@
 
 require "cases/helper"
 
-if current_adapter?(:Mysql2Adapter)
-  class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
+class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     self.use_transactional_tests = false
 
     class Bird < ActiveRecord::Base

activerecord/test/cases/locking_test.rb

@@ -666,8 +666,8 @@ def counter_test(model, expected_count)
 # is so cumbersome. Will deadlock Ruby threads if the underlying db.execute
 # blocks, so separate script called by Kernel#system is needed.
 # (See exec vs. async_exec in the PostgreSQL adapter.)
-unless in_memory_db?
-  class PessimisticLockingTest < ActiveRecord::TestCase
+class PessimisticLockingTest < ActiveRecord::TestCase
+  unless in_memory_db?
     self.use_transactional_tests = false
     fixtures :people, :readers