test/tc_logger.rb in copland-0.8.0 vs test/tc_logger.rb in copland-1.0.0

@@ -60,25 +60,25 @@
   end
 
   def test_log_config
     factory = Copland::LogFactory.new
     assert_equal "./sample.log", factory.device.filename
-    assert_equal "%Y-%m-%d %H:%M:%S", factory.default_format
+    assert_equal "%Y-%m-%d %H:%M:%S", factory.default_date_format
     assert_equal Logger::INFO, factory.default_level
     factory.close
 
     factory = Copland::LogFactory.new :config_file => 'custom-logger.yml'
     assert_equal "./custom.log", factory.device.filename
-    assert_equal "date %Y-%m-%d %H:%M:%S", factory.default_format
+    assert_equal "date %Y-%m-%d %H:%M:%S", factory.default_date_format
     assert_equal Logger::FATAL, factory.default_level
     factory.close
   end
 
   def test_log_options
-    factory = Copland::LogFactory.new :default_format => "%Y",
+    factory = Copland::LogFactory.new :default_date_format => "%Y",
                                       :default_level => Logger::FATAL
-    assert_equal "%Y", factory.default_format
+    assert_equal "%Y", factory.default_date_format
     assert_equal Logger::FATAL, factory.default_level
     factory.close
   end
 
   def test_log_get
@@ -103,11 +103,11 @@
     # the config file has DEBUG turned off...
     log.debug "test"
     assert_equal "", io.message
 
     log.info "test"
-    assert_match( /INFO -- test.log1: test/, io.message )
+    assert_match( /\[INFO \] .* -- test.log1: test/, io.message )
 
     factory.close
     assert_equal "<closed>", io.message
   end
 
@@ -121,11 +121,24 @@
     assert_equal "", io.message
 
     log = factory.get( "level.test.log1" )
 
     log.debug "test"
-    assert_match( /DEBUG -- level.test.log1: test/, io.message )
+    assert_match( /\[DEBUG\] .* -- level.test.log1: test/, io.message )
 
     factory.close
+  end
+
+  def test_message_format
+    io = MockLogIO.new
+    factory = Copland::LogFactory.new :device => io,
+                :default_message_format => "%c %C [%-5p] %F %m %M %t %% %$"
+
+    log = factory.get( "message.log1" )
+    log.info "test"
+    assert_match(
+      /log1 message.log1 \[INFO \] \S*tc_logger.rb test test_message_format #{Thread.current.__id__} % #{$$}\n/,
+      io.message
+    )
   end
 
 end