ruby-changes:71280
From: Nobuyoshi <ko1@a...>
Date: Fri, 25 Feb 2022 20:40:03 +0900 (JST)
Subject: [ruby-changes:71280] 8780f15fd7 (master): [ruby/date] Use `assert_deprecated_warn`
https://git.ruby-lang.org/ruby.git/commit/?id=8780f15fd7 From 8780f15fd740a893095e749ef65f5f957fee37e3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Fri, 25 Feb 2022 20:34:59 +0900 Subject: [ruby/date] Use `assert_deprecated_warn` https://github.com/ruby/date/commit/c55004715a --- test/date/test_date_parse.rb | 12 ++++++------ tool/lib/core_assertions.rb | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb index 746c947617..e594bbf297 100644 --- a/test/date/test_date_parse.rb +++ b/test/date/test_date_parse.rb @@ -864,7 +864,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L864 h = Date._iso8601(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._iso8601('01-02-03T04:05:06Z'.to_sym)} + h = assert_deprecated_warn {Date._iso8601('01-02-03T04:05:06Z'.to_sym)} assert_equal([2001, 2, 3, 4, 5, 6, 0], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end @@ -886,7 +886,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L886 h = Date._rfc3339(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)} + h = assert_deprecated_warn {Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)} assert_equal([2001, 2, 3, 4, 5, 6, 0], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end @@ -975,7 +975,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L975 h = Date._xmlschema(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._xmlschema('2001-02-03'.to_sym)} + h = assert_deprecated_warn {Date._xmlschema('2001-02-03'.to_sym)} assert_equal([2001, 2, 3, nil, nil, nil, nil], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end @@ -1014,7 +1014,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L1014 h = Date._rfc2822(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)} + h = assert_deprecated_warn {Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)} assert_equal([2001, 2, 3, 4, 5, 6, 0], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end @@ -1041,7 +1041,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L1041 h = Date._httpdate(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)} + h = assert_deprecated_warn {Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)} assert_equal([2001, 2, 3, 4, 5, 6, 0], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end @@ -1124,7 +1124,7 @@ class TestDateParse < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/date/test_date_parse.rb#L1124 h = Date._jisx0301(nil) assert_equal({}, h) - h = assert_warn(/deprecated/) {Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)} + h = assert_deprecated_warn {Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)} assert_equal([2001, 2, 3, 4, 5, 6, 3600], h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset)) end diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index e9c586f910..723a1742c5 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -592,14 +592,14 @@ eom https://github.com/ruby/ruby/blob/trunk/tool/lib/core_assertions.rb#L592 def assert_deprecated_warning(mesg = /deprecated/) assert_warning(mesg) do - Warning[:deprecated] = true + Warning[:deprecated] = true if Warning.respond_to?(:[]=) yield end end def assert_deprecated_warn(mesg = /deprecated/) assert_warn(mesg) do - Warning[:deprecated] = true + Warning[:deprecated] = true if Warning.respond_to?(:[]=) yield end end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/