Initial conversion to connection pool

So far so good, tests still run clean. Next steps: synchronize connection pool access
and modification, and change allow_concurrency to simply switch a real lock for a
null lock.

1 files changed, 15 insertions, 24 deletions

diff --git a/activerecord/test/cases/threaded_connections_test.rb b/activerecord/test/cases/threaded_connections_test.rb
index 28f8302367..fedcab98e3 100644
--- a/activerecord/test/cases/threaded_connections_test.rb
+++ b/activerecord/test/cases/threaded_connections_test.rb
@@ -8,41 +8,32 @@ unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name
 
     fixtures :topics
 
-  def setup
-    @connection = ActiveRecord::Base.remove_connection
-    @connections = []
-    @allow_concurrency = ActiveRecord::Base.allow_concurrency
-  end
+    def setup
+      @connection = ActiveRecord::Base.remove_connection
+      @connections = []
+    end
 
-  def teardown
-    # clear the connection cache
-    ActiveRecord::Base.send(:clear_all_cached_connections!)
-    # set allow_concurrency to saved value
-    ActiveRecord::Base.allow_concurrency = @allow_concurrency
-    # reestablish old connection
-    ActiveRecord::Base.establish_connection(@connection)
-  end
+    def teardown
+      # clear the connection cache
+      ActiveRecord::Base.clear_active_connections!
+      # reestablish old connection
+      ActiveRecord::Base.establish_connection(@connection)
+    end
 
-  def gather_connections(use_threaded_connections)
-    ActiveRecord::Base.allow_concurrency = use_threaded_connections
-    ActiveRecord::Base.establish_connection(@connection)
+    def gather_connections
+      ActiveRecord::Base.establish_connection(@connection)
 
       5.times do
         Thread.new do
           Topic.find :first
-          @connections << ActiveRecord::Base.active_connections.values.first
+          @connections << ActiveRecord::Base.active_connections.first
         end.join
       end
     end
 
     def test_threaded_connections
-      gather_connections(true)
-      assert_equal @connections.uniq.length, 5
-    end
-
-    def test_unthreaded_connections
-      gather_connections(false)
-      assert_equal @connections.uniq.length, 1
+      gather_connections
+      assert_equal @connections.length, 5
     end
   end
 end