1 files changed, 20 insertions, 33 deletions
diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
index 06f5172e1f..04d4f5e503 100644
--- a/activesupport/test/benchmarkable_test.rb
+++ b/activesupport/test/benchmarkable_test.rb
@@ -3,8 +3,23 @@ require 'abstract_unit'
 class BenchmarkableTest < ActiveSupport::TestCase
   include ActiveSupport::Benchmarkable
 
-  def teardown
-    logger.send(:clear_buffer)
+  attr_reader :buffer, :logger
+
+  class Buffer
+    include Enumerable
+
+    def initialize; @lines = []; end
+    def each(&block); @lines.each(&block); end
+    def write(x); @lines << x; end
+    def close; end
+    def last; @lines.last; end
+    def size; @lines.size; end
+    def empty?; @lines.empty?; end
+  end
+
+  def setup
+    @buffer = Buffer.new
+    @logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def test_without_block
@@ -27,48 +42,20 @@ class BenchmarkableTest < ActiveSupport::TestCase
   end
 
   def test_within_level
-    logger.level = ActiveSupport::BufferedLogger::DEBUG
+    logger.level = ActiveSupport::Logger::DEBUG
     benchmark('included_debug_run', :level => :debug) { }
     assert_last_logged 'included_debug_run'
   end
 
   def test_outside_level
-    logger.level = ActiveSupport::BufferedLogger::ERROR
+    logger.level = ActiveSupport::Logger::ERROR
     benchmark('skipped_debug_run', :level => :debug) { }
     assert_no_match(/skipped_debug_run/, buffer.last)
   ensure
-    logger.level = ActiveSupport::BufferedLogger::DEBUG
-  end
-
-  def test_without_silencing
-    benchmark('debug_run', :silence => false) do
-      logger.info "not silenced!"
-    end
-
-    assert_equal 2, buffer.size
-  end
-
-  def test_with_silencing
-    benchmark('debug_run', :silence => true) do
-      logger.info "silenced!"
-    end
-
-    assert_equal 1, buffer.size
+    logger.level = ActiveSupport::Logger::DEBUG
   end
 
   private
-    def logger
-      @logger ||= begin
-        logger = ActiveSupport::BufferedLogger.new(StringIO.new)
-        logger.auto_flushing = false
-        logger
-      end
-    end
-
-    def buffer
-      logger.send(:buffer)
-    end
-
     def assert_last_logged(message = 'Benchmarking')
       assert_match(/^#{message} \(.*\)$/, buffer.last)
     end