* BufferedLogger is deprecated. Use ActiveSupport::Logger, or the logger

  from Ruby stdlib.

4 files changed, 12 insertions, 50 deletions

diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
index 24b5b5bee1..04d4f5e503 100644
--- a/activesupport/test/benchmarkable_test.rb
+++ b/activesupport/test/benchmarkable_test.rb
@@ -19,7 +19,7 @@ class BenchmarkableTest < ActiveSupport::TestCase
 
   def setup
     @buffer = Buffer.new
-    @logger = ActiveSupport::BufferedLogger.new(@buffer)
+    @logger = ActiveSupport::Logger.new(@buffer)
   end
 
   def test_without_block
@@ -42,17 +42,17 @@ 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
+    logger.level = ActiveSupport::Logger::DEBUG
   end
 
   private
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index f975685ca5..1540e8df9b 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -10,7 +10,7 @@ class BufferedLoggerTest < Test::Unit::TestCase
   include MultibyteTestHelpers
   include ActiveSupport::Testing::Deprecation
 
-  Logger = ActiveSupport::BufferedLogger
+  Logger = ActiveSupport::Logger
 
   def setup
     @message = "A debug message"
@@ -113,21 +113,12 @@ class BufferedLoggerTest < Test::Unit::TestCase
 
   def test_should_know_if_its_loglevel_is_below_a_given_level
     Logger::Severity.constants.each do |level|
+      next if level.to_s == 'UNKNOWN'
       @logger.level = Logger::Severity.const_get(level) - 1
       assert @logger.send("#{level.downcase}?"), "didn't know if it was #{level.downcase}? or below"
     end
   end
 
-  def test_should_create_the_log_directory_if_it_doesnt_exist
-    tmp_directory = File.join(File.dirname(__FILE__), "tmp")
-    log_file = File.join(tmp_directory, "development.log")
-    FileUtils.rm_rf(tmp_directory)
-    assert_deprecated do
-      @logger  = Logger.new(log_file)
-    end
-    assert File.exist?(tmp_directory)
-  end
-
   def test_buffer_multibyte
     @logger.info(UNICODE_STRING)
     @logger.info(BYTE_STRING)
diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index 2cc46904b4..178c7c0b23 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -1,11 +1,11 @@
 require 'abstract_unit'
 require 'stringio'
-require 'active_support/core_ext/logger'
+require 'active_support/logger'
 
 class CleanLoggerTest < Test::Unit::TestCase
   def setup
     @out = StringIO.new
-    @logger = Logger.new(@out)
+    @logger = ActiveSupport::Logger.new(@out)
   end
 
   def test_format_message
@@ -13,40 +13,11 @@ class CleanLoggerTest < Test::Unit::TestCase
     assert_equal "error\n", @out.string
   end
 
-  def test_silence
-    # Without yielding self.
-    @logger.silence do
-      @logger.debug  'debug'
-      @logger.info   'info'
-      @logger.warn   'warn'
-      @logger.error  'error'
-      @logger.fatal  'fatal'
-    end
-
-    # Yielding self.
-    @logger.silence do |logger|
-      logger.debug  'debug'
-      logger.info   'info'
-      logger.warn   'warn'
-      logger.error  'error'
-      logger.fatal  'fatal'
-    end
-
-    # Silencer off.
-    Logger.silencer = false
-    @logger.silence do |logger|
-      logger.warn   'unsilenced'
-    end
-    Logger.silencer = true
-
-    assert_equal "error\nfatal\nerror\nfatal\nunsilenced\n", @out.string
-  end
-
   def test_datetime_format
     @logger.formatter = Logger::Formatter.new
-    @logger.datetime_format = "%Y-%m-%d"
+    @logger.formatter.datetime_format = "%Y-%m-%d"
     @logger.debug 'debug'
-    assert_equal "%Y-%m-%d", @logger.datetime_format
+    assert_equal "%Y-%m-%d", @logger.formatter.datetime_format
     assert_match(/D, \[\d\d\d\d-\d\d-\d\d#\d+\] DEBUG -- : debug/, @out.string)
   end
 
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index 17c4214dfc..dd4ae319e5 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -1,9 +1,9 @@
 require 'abstract_unit'
-require 'active_support/core_ext/logger'
+require 'active_support/logger'
 require 'active_support/tagged_logging'
 
 class TaggedLoggingTest < ActiveSupport::TestCase
-  class MyLogger < ::Logger
+  class MyLogger < ::ActiveSupport::Logger
     def flush(*)
       info "[FLUSHED]"
     end