diff options
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/test_array.rb | 30 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 6 |
4 files changed, 21 insertions, 21 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index f2abb3d5bc..522b58e214 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1112,40 +1112,40 @@ class TestArray < Test::Unit::TestCase def test_join assert_deprecated_warning {$, = ""} a = @cls[] - assert_equal("", assert_warn(/non-nil value/) {a.join}) + assert_equal("", assert_deprecated_warn(/non-nil value/) {a.join}) assert_equal("", a.join(',')) - assert_equal(Encoding::US_ASCII, assert_warn(/non-nil value/) {a.join}.encoding) + assert_equal(Encoding::US_ASCII, assert_deprecated_warn(/non-nil value/) {a.join}.encoding) assert_deprecated_warning {$, = ""} a = @cls[1, 2] - assert_equal("12", assert_warn(/non-nil value/) {a.join}) - assert_equal("12", assert_warn(/non-nil value/) {a.join(nil)}) + assert_equal("12", assert_deprecated_warn(/non-nil value/) {a.join}) + assert_equal("12", assert_deprecated_warn(/non-nil value/) {a.join(nil)}) assert_equal("1,2", a.join(',')) assert_deprecated_warning {$, = ""} a = @cls[1, 2, 3] - assert_equal("123", assert_warn(/non-nil value/) {a.join}) - assert_equal("123", assert_warn(/non-nil value/) {a.join(nil)}) + assert_equal("123", assert_deprecated_warn(/non-nil value/) {a.join}) + assert_equal("123", assert_deprecated_warn(/non-nil value/) {a.join(nil)}) assert_equal("1,2,3", a.join(',')) assert_deprecated_warning {$, = ":"} a = @cls[1, 2, 3] - assert_equal("1:2:3", assert_warn(/non-nil value/) {a.join}) - assert_equal("1:2:3", assert_warn(/non-nil value/) {a.join(nil)}) + assert_equal("1:2:3", assert_deprecated_warn(/non-nil value/) {a.join}) + assert_equal("1:2:3", assert_deprecated_warn(/non-nil value/) {a.join(nil)}) assert_equal("1,2,3", a.join(',')) assert_deprecated_warning {$, = ""} e = ''.force_encoding('EUC-JP') u = ''.force_encoding('UTF-8') - assert_equal(Encoding::US_ASCII, assert_warn(/non-nil value/) {[[]].join}.encoding) - assert_equal(Encoding::US_ASCII, assert_warn(/non-nil value/) {[1, [u]].join}.encoding) - assert_equal(Encoding::UTF_8, assert_warn(/non-nil value/) {[u, [e]].join}.encoding) - assert_equal(Encoding::UTF_8, assert_warn(/non-nil value/) {[u, [1]].join}.encoding) - assert_equal(Encoding::UTF_8, assert_warn(/non-nil value/) {[Struct.new(:to_str).new(u)].join}.encoding) + assert_equal(Encoding::US_ASCII, assert_deprecated_warn(/non-nil value/) {[[]].join}.encoding) + assert_equal(Encoding::US_ASCII, assert_deprecated_warn(/non-nil value/) {[1, [u]].join}.encoding) + assert_equal(Encoding::UTF_8, assert_deprecated_warn(/non-nil value/) {[u, [e]].join}.encoding) + assert_equal(Encoding::UTF_8, assert_deprecated_warn(/non-nil value/) {[u, [1]].join}.encoding) + assert_equal(Encoding::UTF_8, assert_deprecated_warn(/non-nil value/) {[Struct.new(:to_str).new(u)].join}.encoding) bug5379 = '[ruby-core:39776]' - assert_equal(Encoding::US_ASCII, assert_warn(/non-nil value/) {[[], u, nil].join}.encoding, bug5379) - assert_equal(Encoding::UTF_8, assert_warn(/non-nil value/) {[[], "\u3042", nil].join}.encoding, bug5379) + assert_equal(Encoding::US_ASCII, assert_deprecated_warn(/non-nil value/) {[[], u, nil].join}.encoding, bug5379) + assert_equal(Encoding::UTF_8, assert_deprecated_warn(/non-nil value/) {[[], "\u3042", nil].join}.encoding, bug5379) ensure $, = nil end diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 9b409af319..9f9318eaf7 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2621,7 +2621,7 @@ class TestIO < Test::Unit::TestCase end capture.clear - assert_warning(/[.#]write is outdated/) do + assert_deprecated_warning(/[.#]write is outdated/) do stdout, $stdout = $stdout, capture puts "hey" ensure diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 55755a61a6..c45b88490a 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -906,10 +906,10 @@ class TestModule < Test::Unit::TestCase @foo = :foo @bar = :bar end - assert_warning(/optional boolean argument/) do + assert_deprecated_warning(/optional boolean argument/) do attr :foo, true end - assert_warning(/optional boolean argument/) do + assert_deprecated_warning(/optional boolean argument/) do attr :bar, false end end diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 6daae50718..194b8c355d 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -42,7 +42,7 @@ class TestRegexp < Test::Unit::TestCase def test_yoshidam_net_20041111_1 s = "[\xC2\xA0-\xC3\xBE]" - r = assert_warning(/ignored/) {Regexp.new(s, nil, "u")} + r = assert_deprecated_warning(/ignored/) {Regexp.new(s, nil, "u")} assert_match(r, "\xC3\xBE") end @@ -665,9 +665,9 @@ class TestRegexp < Test::Unit::TestCase end def test_ignorecase - v = assert_warning(/variable \$= is no longer effective/) { $= } + v = assert_deprecated_warning(/variable \$= is no longer effective/) { $= } assert_equal(false, v) - assert_warning(/variable \$= is no longer effective; ignored/) { $= = nil } + assert_deprecated_warning(/variable \$= is no longer effective; ignored/) { $= = nil } end def test_match_setter |