test/appender/wrapper_test.rb in semantic_logger-3.4.1 vs test/appender/wrapper_test.rb in semantic_logger-4.0.0.beta1

@@ -4,62 +4,61 @@
 #
 module Appender
   class WrapperTest < Minitest::Test
     describe SemanticLogger::Appender::Wrapper do
       before do
-        @time        = Time.new
-        @mock_logger = MockLogger.new
-        @appender    = SemanticLogger::Appender::Wrapper.new(@mock_logger)
-        @hash        = {session_id: 'HSSKLEU@JDK767', tracking_number: 12345}
-        @hash_str    = @hash.inspect.sub("{", "\\{").sub("}", "\\}")
+        SemanticLogger.default_level   = :trace
+        SemanticLogger.backtrace_level = :trace
+
+        @time              = Time.new
+        @mock_logger       = MockLogger.new
+        @appender          = SemanticLogger::Appender::Wrapper.new(@mock_logger)
+        @hash              = {session_id: 'HSSKLEU@JDK767', tracking_number: 12345}
+        @hash_str          = @hash.inspect.sub("{", "\\{").sub("}", "\\}")
+        @thread_name       = Thread.current.name
+        @file_name_reg_exp = ' wrapper_test.rb:\d+'
       end
 
       describe 'format logs into text form' do
-        it 'handle nil name, message and payload' do
-          log       = SemanticLogger::Log.new
-          log.time  = Time.now
-          log.level = :debug
-          @appender.log(log)
-          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:\] /, @mock_logger.message)
+        it 'logs blank data' do
+          @appender.debug
+          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:#{@thread_name}#{@file_name_reg_exp}\] SemanticLogger::Appender::Wrapper/, @mock_logger.message)
         end
 
-        it 'handle nil message and payload' do
-          log       = SemanticLogger::Log.new
-          log.time  = Time.now
-          log.level = :debug
-          log.name  = 'class'
-          @appender.log(log)
-          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:\] class/, @mock_logger.message)
+        it 'logs message' do
+          @appender.debug('hello world')
+          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:#{@thread_name}#{@file_name_reg_exp}\] SemanticLogger::Appender::Wrapper -- hello world/, @mock_logger.message)
         end
 
-        it 'handle nil payload' do
-          log         = SemanticLogger::Log.new
-          log.time    = Time.now
-          log.level   = :debug
-          log.name    = 'class'
-          log.message = 'hello world'
-          @appender.log(log)
-          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:\] class -- hello world/, @mock_logger.message)
+        it 'logs message and payload' do
+          @appender.debug('hello world', @hash)
+          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:#{@thread_name}#{@file_name_reg_exp}\] SemanticLogger::Appender::Wrapper -- hello world -- #{@hash_str}/, @mock_logger.message)
         end
 
-        it 'handle payload' do
-          log         = SemanticLogger::Log.new
-          log.time    = Time.now
-          log.level   = :debug
-          log.name    = 'class'
-          log.message = 'hello world'
-          log.payload = @hash
-          @appender.log(log)
-          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:\] class -- hello world -- #{@hash_str}/, @mock_logger.message)
+        it 'logs named parameters' do
+          @appender.debug(message: 'hello world', payload: @hash)
+          assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ D \[\d+:#{@thread_name}#{@file_name_reg_exp}\] SemanticLogger::Appender::Wrapper -- hello world -- #{@hash_str}/, @mock_logger.message)
         end
       end
 
       describe 'for each log level' do
+        before do
+          @appender = SemanticLogger.add_appender(logger: @mock_logger)
+          @logger   = SemanticLogger[WrapperTest]
+        end
+
+        after do
+          SemanticLogger.remove_appender(@appender)
+        end
+
         # Ensure that any log level can be logged
         Logger::Severity.constants.each do |level|
-          it "log #{level.downcase.to_sym} info" do
-            @appender.log SemanticLogger::Log.new(level.downcase.to_sym, 'thread', 'class', 'hello world', @hash, Time.now)
-            assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ \w \[\d+:thread\] class -- hello world -- #{@hash_str}/, @mock_logger.message)
+          it "log #{level.downcase.to_sym}" do
+            level_char = level[0].upcase
+            level_char = 'E' if level_char == 'U'
+            @logger.send(level.downcase.to_sym, 'hello world', @hash)
+            SemanticLogger.flush
+            assert_match(/\d+-\d+-\d+ \d+:\d+:\d+.\d+ #{level_char} \[\d+:#{@thread_name}#{@file_name_reg_exp}\] Appender::WrapperTest -- hello world -- #{@hash_str}/, @mock_logger.message)
           end
         end
       end
 
     end