test/unit/slf4j/logger_test.rb in loggr-1.0.0 vs test/unit/slf4j/logger_test.rb in loggr-1.1.0

@@ -7,19 +7,19 @@
     if_jruby do
       require 'loggr/slf4j/logger'
       @logger = Loggr::SLF4J::Logger.new('test')
     end
   end
-  
+
   def test_setting_logger_name
     skip_unless_jruby
     assert_equal 'test', @logger.java_logger.getName()
-    assert_equal 'test', Loggr::SLF4J::Logger.new(:test).java_logger.getName()    
-    assert_equal 'test/fancy::Logger', Loggr::SLF4J::Logger.new(:'test/fancy::Logger').java_logger.getName()    
+    assert_equal 'test', Loggr::SLF4J::Logger.new(:test).java_logger.getName()
+    assert_equal 'test/fancy::Logger', Loggr::SLF4J::Logger.new(:'test/fancy::Logger').java_logger.getName()
     assert_equal 'test.Logger', Loggr::SLF4J::Logger.new('test.Logger').java_logger.getName()
     assert_equal 'Loggr::SLF4J', Loggr::SLF4J::Logger.new('Loggr::SLF4J').java_logger.getName()
-    assert_equal 'Loggr::SLF4J/basic', Loggr::SLF4J::Logger.new('Loggr::SLF4J/basic').java_logger.getName()        
+    assert_equal 'Loggr::SLF4J/basic', Loggr::SLF4J::Logger.new('Loggr::SLF4J/basic').java_logger.getName()
     assert_equal 'loggr.slf4j.LoggerTest', Loggr::SLF4J::Logger.new(self).java_logger.getName()
     assert_equal 'loggr.slf4j.LoggerTest', Loggr::SLF4J::Logger.new(self.class).java_logger.getName()
     assert_equal 'loggr.SLF4J', Loggr::SLF4J::Logger.new(Loggr::SLF4J).java_logger.getName()
   end
 
@@ -28,110 +28,146 @@
     %w{debug info warn error fatal}.each do |level|
       assert_respond_to @logger, level
       assert_respond_to @logger, "#{level}?"
     end
   end
-  
+
   def test_should_respond_to_close_and_flush
     skip_unless_jruby
     assert_respond_to @logger, :close
-    assert_respond_to @logger, :flush    
-  end  
-  
+    assert_respond_to @logger, :flush
+  end
+
   def test_trace_message
     skip_unless_jruby
     @logger.trace "a trace message"
     assert_log_event 5000, "a trace message", @appender.last
   end
-  
+
   def test_debug_message
     skip_unless_jruby
     @logger.debug "a debug message"
     assert_log_event 10000, "a debug message", @appender.last
   end
 
   def test_info_message
     skip_unless_jruby
     @logger.info "an info message"
-    assert_log_event 20000, "an info message", @appender.last    
+    assert_log_event 20000, "an info message", @appender.last
   end
-  
+
   def test_warn_message
     skip_unless_jruby
     @logger.warn "a warn message"
-    assert_log_event 30000, "a warn message", @appender.last    
+    assert_log_event 30000, "a warn message", @appender.last
   end
 
   def test_error_message
     skip_unless_jruby
     @logger.error "an error message"
-    assert_log_event 40000, "an error message", @appender.last    
+    assert_log_event 40000, "an error message", @appender.last
   end
 
   def test_fatal_message
     skip_unless_jruby
     @logger.fatal "a fatal message"
-    assert_log_event 40000, "a fatal message", @appender.last    
+    assert_log_event 40000, "a fatal message", @appender.last
   end
 
   def test_logging_message_using_block
     skip_unless_jruby
     @logger.info { "block info message" }
     assert_log_event 20000, "block info message", @appender.last
   end
-  
+
   def test_default_logger_has_no_marker
     skip_unless_jruby
     @logger.info "no marker"
     assert_equal nil, @appender.last.getMarker()
   end
-  
+
   def test_use_progname_as_marker
     skip_unless_jruby
     @logger.info "with marker", "MARK"
     assert_equal "MARK", @appender.last.getMarker().to_s
-    
+
     @logger.debug "other marker", "KRAM"
     assert_equal "KRAM", @appender.last.getMarker().to_s
   end
-  
+
   def test_ability_to_provide_default_marker
     skip_unless_jruby
     @other = Loggr::SLF4J::Logger.new('test.marker', :marker => "MARK")
 
     @other.info "no marker"
     assert_equal "MARK", @appender.last.getMarker().to_s
-    
+
     @other.debug "other marker", "KRAM"
     assert_equal "KRAM", @appender.last.getMarker().to_s
   end
-  
+
   def test_level_should_be_unknown
     skip_unless_jruby
     assert_equal Loggr::SLF4J::Logger::UNKNOWN, @logger.level
   end
-  
+
+  def test_support_for_nested_tagged_calls
+    skip_unless_jruby
+    assert_nil @logger.java_mdc[:tags]
+    @logger.tagged("demo") do
+      assert_equal "demo", @logger.java_mdc[:tags]
+      @logger.tagged("action", "test") do
+        assert_equal "demo, action, test", @logger.java_mdc[:tags]
+      end
+      assert_equal "demo", @logger.java_mdc[:tags]
+    end
+    assert_nil @logger.java_mdc[:tags]
+  end
+
+  def test_that_tagged_also_accepts_array
+    skip_unless_jruby
+    @logger.tagged(%w{a b c}) do
+      assert_equal "a, b, c", @logger.java_mdc[:tags]
+    end
+  end
+
+  def test_support_for_nested_mapped_calls
+    skip_unless_jruby
+    @logger.mapped(:user => "demo") do
+      assert_equal({ "user" => "demo" }, @logger.java_mdc.to_hash)
+      @logger.mapped(:request_id => "123456", :auth => "secure") do
+        assert_equal({ "user" => "demo", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+        @logger.mapped(:user => "system") do
+          assert_equal({ "user" => "system", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+        end
+        assert_equal({ "user" => "demo", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+      end
+      assert_equal({ "user" => "demo" }, @logger.java_mdc.to_hash)
+    end
+    assert_equal Hash.new, @logger.java_mdc.to_hash
+  end
+
   def test_java_logger
     skip_unless_jruby
     refute_nil @logger.java_logger
     assert_kind_of Java::OrgSlf4j::Logger, @logger.java_logger
   end
-  
+
   def test_java_marker
     skip_unless_jruby
     assert_nil @logger.java_marker
-    
+
     @other = Loggr::SLF4J::Logger.new('test.marker', :marker => 'APP')
     refute_nil @other.java_marker
-    assert_kind_of Java::OrgSlf4j::Marker, @other.java_marker    
+    assert_kind_of Java::OrgSlf4j::Marker, @other.java_marker
   end
-  
+
   def test_internal_marker_factory
     skip_unless_jruby
     assert_nil Loggr::SLF4J::MarkerFactory[nil]
     assert_nil Loggr::SLF4J::MarkerFactory[' ']
     assert_nil Loggr::SLF4J::MarkerFactory[""]
-    
+
     @marker = Loggr::SLF4J::MarkerFactory["MARK"]
     refute_nil @marker
     assert_kind_of Java::OrgSlf4j::Marker, @marker
     assert_same @marker, Loggr::SLF4J::MarkerFactory["MARK"]
   end
\ No newline at end of file