From c94f6eaa78dcef4e70262b5e7b7259285e041685 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Sat, 16 Jun 2018 21:01:15 +0300 Subject: [PATCH] small maintanance --- lib/util/logger.rb | 130 ------------------ test/mom/instruction/test_slot_definition.rb | 3 + test/mom/instruction/test_slot_definition1.rb | 3 + test/util/test_logger.rb | 15 ++ 4 files changed, 21 insertions(+), 130 deletions(-) create mode 100644 test/util/test_logger.rb diff --git a/lib/util/logger.rb b/lib/util/logger.rb index 9a85bd77..2c084736 100644 --- a/lib/util/logger.rb +++ b/lib/util/logger.rb @@ -187,12 +187,6 @@ module Util VERSION = "1.2.8" ProgName = "#{File.basename(__FILE__)}/#{VERSION}" - class Error < RuntimeError # :nodoc: - end - # not used after 1.2.7. just for compat. - class ShiftingError < Error # :nodoc: - end - # Logging severity. module Severity # Low-level information, mostly for developers @@ -507,129 +501,5 @@ module Util Time.mktime(t.year, t.month, t.mday, 23, 59, 59) end end - - - # - # == Description - # - # Application -- Add logging support to your application. - # - # == Usage - # - # 1. Define your application class as a sub-class of this class. - # 2. Override 'run' method in your class to do many things. - # 3. Instantiate it and invoke 'start'. - # - # == Example - # - # class FooApp < Application - # def initialize(foo_app, application_specific, arguments) - # super('FooApp') # Name of the application. - # end - # - # def run - # ... - # log(WARN, 'warning', 'my_method1') - # ... - # @log.error('my_method2') { 'Error!' } - # ... - # end - # end - # - # status = FooApp.new(....).start - # - class Application - include Logger::Severity - - # Name of the application given at initialize. - attr_reader :appname - - # - # == Synopsis - # - # Application.new(appname = '') - # - # == Args - # - # +appname+:: Name of the application. - # - # == Description - # - # Create an instance. Log device is +STDERR+ by default. This can be - # changed with #set_log. - # - def initialize(appname = nil) - @appname = appname - @log = Logger.new(STDERR) - @log.progname = @appname - @level = @log.level - end - - # - # Start the application. Return the status code. - # - def start - status = -1 - begin - log(INFO, "Start of #{ @appname }.") - status = run - rescue - log(FATAL, "Detected an exception. Stopping ... #{$!} (#{$!.class})\n" << $@.join("\n")) - ensure - log(INFO, "End of #{ @appname }. (status: #{ status.to_s })") - end - status - end - - # Logger for this application. See the class Logger for an explanation. - def logger - @log - end - - # - # Sets the logger for this application. See the class Logger for an explanation. - # - def logger=(logger) - @log = logger - @log.progname = @appname - @log.level = @level - end - - # - # Sets the log device for this application. See Logger.new for an explanation - # of the arguments. - # - def set_log(logdev) - @log = Logger.new(logdev) - @log.progname = @appname - @log.level = @level - end - - def log=(logdev) - set_log(logdev) - end - - # - # Set the logging threshold, just like Logger#level=. - # - def level=(level) - @level = level - @log.level = @level - end - - # - # See Logger#add. This application's +appname+ is used. - # - def log(severity, message = nil, &block) - @log.add(severity, message, @appname, &block) if @log - end - - private - - def run - # TODO: should be an NotImplementedError - raise RuntimeError.new('Method run must be defined in the derived class.') - end - end end end diff --git a/test/mom/instruction/test_slot_definition.rb b/test/mom/instruction/test_slot_definition.rb index 4a61e557..1b3aab63 100644 --- a/test/mom/instruction/test_slot_definition.rb +++ b/test/mom/instruction/test_slot_definition.rb @@ -13,6 +13,9 @@ module Mom assert_equal Array , slot.slots.class assert_equal :caller , slot.slots.first end + def test_to_s + assert_equal "[message,caller]" , slot.to_s + end def test_create_fail_none assert_raises {slot(nil)} end diff --git a/test/mom/instruction/test_slot_definition1.rb b/test/mom/instruction/test_slot_definition1.rb index 3f92e112..8d826a61 100644 --- a/test/mom/instruction/test_slot_definition1.rb +++ b/test/mom/instruction/test_slot_definition1.rb @@ -18,5 +18,8 @@ module Mom def test_def_const assert_equal "hi" , @instruction.constant.to_string end + def test_to_s + assert_equal "[StringConstant]" , @definition.to_s + end end end diff --git a/test/util/test_logger.rb b/test/util/test_logger.rb new file mode 100644 index 00000000..85e7a4ea --- /dev/null +++ b/test/util/test_logger.rb @@ -0,0 +1,15 @@ +require "util/logging" +module Util + + class LoggerTest < MiniTest::Test + include Util::Logging + log_level :info + + def test_debug + self.log.debug "Just good to know" + end + def test_unknown + self.log.debug "Whats this" + end + end +end