test/appenders/test_io.rb in logging-0.9.8 vs test/appenders/test_io.rb in logging-1.0.0

@@ -7,20 +7,19 @@
   class TestIO < Test::Unit::TestCase
     include LoggingTestCase
 
     def setup
       super
-      ::Logging.init
-      @levels = ::Logging::LEVELS
 
-      @appender = ::Logging::Appenders::StringIo.new 'test_appender'
+      @appender = Logging.appenders.string_io('test_appender')
       @sio = @appender.sio
+      @levels = Logging::LEVELS
     end
 
     def test_append
-      event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
-                                      [1, 2, 3, 4], false)
+      event = Logging::LogEvent.new('TestLogger', @levels['warn'],
+                                    [1, 2, 3, 4], false)
       @appender.append event
       assert_equal " WARN  TestLogger : <Array> #{[1, 2, 3, 4]}\n", readline
       assert_nil(readline)
 
       event.level = @levels['debug']
@@ -34,18 +33,18 @@
     end
 
     def test_append_error
       # setup an internal logger to capture error messages from the IO
       # appender
-      log = Logging::Appenders::StringIo.new('__internal_io')
-      Logging::Logger[Logging].add_appenders(log)
-      Logging::Logger[Logging].level = 'all'
+      log = Logging.appenders.string_io('__internal_io')
+      Logging.logger[Logging].add_appenders(log)
+      Logging.logger[Logging].level = 'all'
 
       # close the string IO object so we get an error
       @sio.close
-      event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
-                                      [1, 2, 3, 4], false)
+      event = Logging::LogEvent.new('TestLogger', @levels['warn'],
+                                    [1, 2, 3, 4], false)
       @appender.append event
 
       assert_equal "INFO  Logging : appender \"test_appender\" has been disabled", log.readline.strip
       assert_equal "ERROR  Logging : <IOError> not opened for writing", log.readline.strip
 
@@ -60,11 +59,11 @@
       @appender.close
       assert_equal true, @sio.closed?
       assert_equal true, @appender.closed?
 
       [STDIN, STDERR, STDOUT].each do |io|
-        @appender = ::Logging::Appenders::IO.new 'test', io
+        @appender = Logging.appenders.io('test', io)
         @appender.close
         assert_equal false, io.closed?
         assert_equal true, @appender.closed?
       end
     end
@@ -85,13 +84,13 @@
     end
 
     def test_concat_error
       # setup an internal logger to capture error messages from the IO
       # appender
-      log = Logging::Appenders::StringIo.new('__internal_io')
-      Logging::Logger[Logging].add_appenders(log)
-      Logging::Logger[Logging].level = 'all'
+      log = Logging.appenders.string_io('__internal_io')
+      Logging.logger[Logging].add_appenders(log)
+      Logging.logger[Logging].level = 'all'
 
       # close the string IO object so we get an error
       @sio.close
       @appender << 'oopsy'
 
@@ -112,10 +111,10 @@
       assert_equal :flush, ary.pop
     end
 
     def test_initialize
       assert_raise(EOFError) {@sio.readline}
-      assert_raise(TypeError) {::Logging::Appenders::IO.new 'test', []}
+      assert_raise(TypeError) {Logging.appenders.io('test', [])}
     end
 
     private
     def readline
       @appender.readline