diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2019-12-04 01:26:29 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2019-12-04 06:40:54 +0900 |
commit | 8852fa876039ed177fd5e867f36177d8a9ff411c (patch) | |
tree | 56dd2c368bfe7cc694bf333c3ef987e2fee1b727 /test | |
parent | 08074eb71229b4c9f669f7bfb215bbb43525bfc0 (diff) |
Revert "Regexp#match{?} with nil raises TypeError as String, Symbol (#1506)"
This reverts commit 2a22a6b2d8465934e75520a7fdcf522d50890caf.
Revert [Feature #13083]
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_regexp.rb | 4 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 5 | ||||
-rw-r--r-- | test/ruby/test_symbol.rb | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index d48eef5366..a1d49c595a 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -539,7 +539,7 @@ class TestRegexp < Test::Unit::TestCase end def test_match - assert_raise(TypeError) { //.match(nil) } + assert_nil(//.match(nil)) assert_equal("abc", /.../.match(:abc)[0]) assert_raise(TypeError) { /.../.match(Object.new)[0] } assert_equal("bc", /../.match('abc', 1)[0]) @@ -561,10 +561,10 @@ class TestRegexp < Test::Unit::TestCase /backref/ =~ 'backref' # must match here, but not in a separate method, e.g., assert_send, # to check if $~ is affected or not. + assert_equal(false, //.match?(nil)) assert_equal(true, //.match?("")) assert_equal(true, /.../.match?(:abc)) assert_raise(TypeError) { /.../.match?(Object.new) } - assert_raise(TypeError) { //.match?(nil) } assert_equal(true, /b/.match?('abc')) assert_equal(true, /b/.match?('abc', 1)) assert_equal(true, /../.match?('abc', 1)) diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index a86e26c774..0276d6a14d 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -2469,7 +2469,6 @@ CODE def test_match_method assert_equal("bar", "foobarbaz".match(/bar/).to_s) - assert_raise(TypeError) { "".match(nil) } o = Regexp.new('foo') def o.match(x, y, z); x + y + z; end @@ -2525,10 +2524,6 @@ CODE assert_equal('backref', $&) end - def test_match_p_nil - assert_raise(TypeError) { ''.match?(nil) } - end - def test_clear s = "foo" * 100 s.clear diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 75335f180d..660f2e1574 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -367,7 +367,6 @@ class TestSymbol < Test::Unit::TestCase def test_match_method assert_equal("bar", :"foobarbaz".match(/bar/).to_s) - assert_raise(TypeError) { :"".match(nil) } o = Regexp.new('foo') def o.match(x, y, z); x + y + z; end @@ -421,10 +420,6 @@ class TestSymbol < Test::Unit::TestCase assert_equal('backref', $&) end - def test_match_p_nil - assert_raise(TypeError) { :''.match?(nil) } - end - def test_symbol_popped assert_nothing_raised { eval('a = 1; :"#{ a }"; 1') } end |