diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-14 09:05:44 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-14 09:05:44 +0000 |
| commit | a9431f9bc8e0650eefb169ae77d93cb8299f49ee (patch) | |
| tree | 252f3d20c484e972b8d249e35b12c7e82bc1a9c5 /test | |
| parent | 0426fe08bac56d188a0aac397b2af8b1b86476c9 (diff) | |
| download | ruby-a9431f9bc8e0650eefb169ae77d93cb8299f49ee.tar.gz ruby-a9431f9bc8e0650eefb169ae77d93cb8299f49ee.tar.xz ruby-a9431f9bc8e0650eefb169ae77d93cb8299f49ee.zip | |
* re.c (rb_reg_preprocess_dregexp): change Exception class to
RegexpError.
* test/ruby/test_m17n.rb (test_regexp_usascii): follow above.
* test/ruby/test_m17n.rb (test_regexp_embed): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_m17n.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 25bb0df3b..78d98ac44 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -442,18 +442,18 @@ class TestM17N < Test::Unit::TestCase def test_regexp_embed r = eval(e("/\xc2\xa1/")) - assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } - assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } + assert_raise(RegexpError) { eval(s("/\xc2\xa1\#{r}/s")) } + assert_raise(RegexpError) { eval(s("/\#{r}\xc2\xa1/s")) } r = /\xc2\xa1/e - assert_raise(ArgumentError) { eval(s("/\xc2\xa1\#{r}/s")) } - assert_raise(ArgumentError) { eval(s("/\#{r}\xc2\xa1/s")) } + assert_raise(RegexpError) { eval(s("/\xc2\xa1\#{r}/s")) } + assert_raise(RegexpError) { eval(s("/\#{r}\xc2\xa1/s")) } r = eval(e("/\xc2\xa1/")) - assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(RegexpError) { /\xc2\xa1#{r}/s } r = /\xc2\xa1/e - assert_raise(ArgumentError) { /\xc2\xa1#{r}/s } + assert_raise(RegexpError) { /\xc2\xa1#{r}/s } r1 = Regexp.new('foo'.force_encoding("ascii-8bit")) r2 = eval('/bar#{r1}/'.force_encoding('ascii-8bit')) @@ -1255,7 +1255,7 @@ class TestM17N < Test::Unit::TestCase assert_regexp_usascii_literal('/\u1234#{%q"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234#{"\x80"}/', nil, SyntaxError) assert_regexp_usascii_literal('/\u1234\x80/', nil, SyntaxError) - assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, ArgumentError) + assert_regexp_usascii_literal('/\u1234#{}\x80/', nil, RegexpError) end def test_gbk |