3 files changed, 25 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 404b492288..f9149c1819 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -164,14 +164,16 @@ module ActiveRecord
   class AdapterTestWithoutTransaction < ActiveRecord::TestCase
     self.use_transactional_fixtures = false
 
+    class Klass < ActiveRecord::Base
+    end
+
     def setup
-      @klass = Class.new(ActiveRecord::Base)
-      @klass.establish_connection 'arunit'
-      @connection = @klass.connection
+      Klass.establish_connection 'arunit'
+      @connection = Klass.connection
     end
 
     def teardown
-      @klass.remove_connection
+      Klass.remove_connection
     end
 
     test "transaction state is reset after a reconnect" do
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index ffd6904aec..b67d70ede7 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,6 +1,9 @@
 require "cases/helper"
 
 class MysqlConnectionTest < ActiveRecord::TestCase
+  class Klass < ActiveRecord::Base
+  end
+
   def setup
     super
     @connection = ActiveRecord::Base.connection
@@ -17,9 +20,8 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     run_without_connection do |orig|
       ar_config = ARTest.connection_config['arunit']
       url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}"
-      klass = Class.new(ActiveRecord::Base)
-      klass.establish_connection(url)
-      assert_equal ar_config['database'], klass.connection.current_database
+      Klass.establish_connection(url)
+      assert_equal ar_config['database'], Klass.connection.current_database
     end
   end
 
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 0718d0886f..ea344e992b 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -327,6 +327,20 @@ module ActiveRecord
       def test_pool_sets_connection_visitor
         assert @pool.connection.visitor.is_a?(Arel::Visitors::ToSql)
       end
+
+
+      #make sure exceptions are thrown when establish_connection
+      #is called with a anonymous class
+      def test_anonymous_class_exception
+        anonymous = Class.new(ActiveRecord::Base)
+        handler = ActiveRecord::Base.connection_handler
+        
+        assert_raises(RuntimeError){
+          handler.establish_connection anonymous, nil
+        }
+      end
+
+
     end
   end
 end