From cd06ae6aa0e1b0a536668292823af39770fac4c4 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 25 Feb 2022 20:34:59 +0900
Subject: [PATCH] Use `assert_deprecated_warn`

---
 test/date/test_date_parse.rb | 12 ++++++------
 test/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 746c947..e594bbf 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -864,7 +864,7 @@ def test__iso8601
     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 @@ def test__rfc3339
     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 @@ def test__xmlschema
     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 @@ def test__rfc2822
     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 @@ def test__httpdate
     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 @@ def test__jisx0301
     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/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
index bac3856..04b022d 100644
--- a/test/lib/core_assertions.rb
+++ b/test/lib/core_assertions.rb
@@ -596,14 +596,14 @@ def assert_warn(*args)
 
       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