1 files changed, 4 insertions, 33 deletions
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