summaryrefslogtreecommitdiff
path: root/test/logger
diff options
context:
space:
mode:
Diffstat (limited to 'test/logger')
-rw-r--r--test/logger/test_logperiod.rb83
-rw-r--r--test/logger/test_severity.rb32
2 files changed, 67 insertions, 48 deletions
diff --git a/test/logger/test_logperiod.rb b/test/logger/test_logperiod.rb
index 6e6e5e9533..ee38d877c6 100644
--- a/test/logger/test_logperiod.rb
+++ b/test/logger/test_logperiod.rb
@@ -1,80 +1,67 @@
# coding: US-ASCII
# frozen_string_literal: false
-require 'logger'
-require 'time'
+require "logger"
+require "time"
class TestLogPeriod < Test::Unit::TestCase
def test_next_rotate_time
time = Time.parse("2019-07-18 13:52:02")
- daily_result = Logger::Period.next_rotate_time(time, 'daily')
- next_day = Time.parse("2019-07-19 00:00:00")
- assert_equal(next_day, daily_result)
+ assert_next_rotate_time_words(time, "2019-07-19 00:00:00", ["daily", :daily])
+ assert_next_rotate_time_words(time, "2019-07-21 00:00:00", ["weekly", :weekly])
+ assert_next_rotate_time_words(time, "2019-08-01 00:00:00", ["monthly", :monthly])
- weekly_result = Logger::Period.next_rotate_time(time, 'weekly')
- next_week = Time.parse("2019-07-21 00:00:00")
- assert_equal(next_week, weekly_result)
-
- monthly_result = Logger::Period.next_rotate_time(time, 'monthly')
- next_month = Time.parse("2019-08-1 00:00:00")
- assert_equal(next_month, monthly_result)
-
- assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
+ assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, "invalid") }
end
def test_next_rotate_time_extreme_cases
# First day of Month and Saturday
time = Time.parse("2018-07-01 00:00:00")
- daily_result = Logger::Period.next_rotate_time(time, 'daily')
- next_day = Time.parse("2018-07-02 00:00:00")
- assert_equal(next_day, daily_result)
-
- weekly_result = Logger::Period.next_rotate_time(time, 'weekly')
- next_week = Time.parse("2018-07-08 00:00:00")
- assert_equal(next_week, weekly_result)
+ assert_next_rotate_time_words(time, "2018-07-02 00:00:00", ["daily", :daily])
+ assert_next_rotate_time_words(time, "2018-07-08 00:00:00", ["weekly", :weekly])
+ assert_next_rotate_time_words(time, "2018-08-01 00:00:00", ["monthly", :monthly])
- monthly_result = Logger::Period.next_rotate_time(time, 'monthly')
- next_month = Time.parse("2018-08-1 00:00:00")
- assert_equal(next_month, monthly_result)
-
- assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
+ assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, "invalid") }
end
def test_previous_period_end
time = Time.parse("2019-07-18 13:52:02")
- daily_result = Logger::Period.previous_period_end(time, 'daily')
- day_ago = Time.parse("2019-07-17 23:59:59")
- assert_equal(day_ago, daily_result)
-
- weekly_result = Logger::Period.previous_period_end(time, 'weekly')
- week_ago = Time.parse("2019-07-13 23:59:59")
- assert_equal(week_ago, weekly_result)
-
- monthly_result = Logger::Period.previous_period_end(time, 'monthly')
- month_ago = Time.parse("2019-06-30 23:59:59")
- assert_equal(month_ago, monthly_result)
+ assert_previous_period_end_words(time, "2019-07-17 23:59:59", ["daily", :daily])
+ assert_previous_period_end_words(time, "2019-07-13 23:59:59", ["weekly", :weekly])
+ assert_previous_period_end_words(time, "2019-06-30 23:59:59", ["monthly", :monthly])
- assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
+ assert_raise(ArgumentError) { Logger::Period.previous_period_end(time, "invalid") }
end
def test_previous_period_end_extreme_cases
# First day of Month and Saturday
time = Time.parse("2018-07-01 00:00:00")
+ previous_date = "2018-06-30 23:59:59"
- daily_result = Logger::Period.previous_period_end(time, 'daily')
- day_ago = Time.parse("2018-06-30 23:59:59")
- assert_equal(day_ago, daily_result)
+ assert_previous_period_end_words(time, previous_date, ["daily", :daily])
+ assert_previous_period_end_words(time, previous_date, ["weekly", :weekly])
+ assert_previous_period_end_words(time, previous_date, ["monthly", :monthly])
- weekly_result = Logger::Period.previous_period_end(time, 'weekly')
- week_ago = Time.parse("2018-06-30 23:59:59")
- assert_equal(week_ago, weekly_result)
+ assert_raise(ArgumentError) { Logger::Period.previous_period_end(time, "invalid") }
+ end
+
+ private
- monthly_result = Logger::Period.previous_period_end(time, 'monthly')
- month_ago = Time.parse("2018-06-30 23:59:59")
- assert_equal(month_ago, monthly_result)
+ def assert_next_rotate_time_words(time, next_date, words)
+ assert_time_words(:next_rotate_time, time, next_date, words)
+ end
+
+ def assert_previous_period_end_words(time, previous_date, words)
+ assert_time_words(:previous_period_end, time, previous_date, words)
+ end
- assert_raise(ArgumentError) { Logger::Period.next_rotate_time(time, 'invalid') }
+ def assert_time_words(method, time, date, words)
+ words.each do |word|
+ daily_result = Logger::Period.public_send(method, time, word)
+ expected_result = Time.parse(date)
+ assert_equal(expected_result, daily_result)
+ end
end
end
diff --git a/test/logger/test_severity.rb b/test/logger/test_severity.rb
index dad63472a6..e1069c8262 100644
--- a/test/logger/test_severity.rb
+++ b/test/logger/test_severity.rb
@@ -3,6 +3,8 @@
require 'logger'
class TestLoggerSeverity < Test::Unit::TestCase
+ include Logger::Severity
+
def test_enum
logger_levels = Logger.constants
levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
@@ -23,4 +25,34 @@ class TestLoggerSeverity < Test::Unit::TestCase
assert(logger.level) == Logger::Severity.const_get(level)
end
end
+
+ def test_thread_local_level
+ logger = Logger.new(nil)
+ logger.level = INFO # default level
+ other = Logger.new(nil)
+ other.level = ERROR # default level
+
+ assert_equal(other.level, ERROR)
+ logger.with_level(:WARN) do
+ assert_equal(other.level, ERROR)
+ assert_equal(logger.level, WARN)
+
+ logger.with_level(DEBUG) do # verify reentrancy
+ assert_equal(logger.level, DEBUG)
+
+ Thread.new do
+ assert_equal(logger.level, INFO)
+ logger.with_level(:WARN) do
+ assert_equal(other.level, ERROR)
+ assert_equal(logger.level, WARN)
+ end
+ assert_equal(logger.level, INFO)
+ end.join
+
+ assert_equal(logger.level, DEBUG)
+ end
+ assert_equal(logger.level, WARN)
+ end
+ assert_equal(logger.level, INFO)
+ end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 18:14:22 +0000