diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 22:34:12 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 22:34:12 +0000 |
| commit | e0f8351d5528cd01ab71855eae87ef067de55626 (patch) | |
| tree | 3b259c3c1fb9703175ad43836cc4ef3210035797 /test | |
| parent | 2bd2ea829f360bdae74281230aa3377b0c81fa14 (diff) | |
merge revision(s) 34236: [Backport #5890]
* numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
is invalid. [Feature #5855] [Bug #5863] [Bug #5864]
* string.c (rb_str_concat): ditto.
* string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
is US-ASCII and the argument is an integer greater than 127.
* regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.
* enc/euc_jp.c (code_to_mbclen): ditto.
* enc/shift_jis.c (code_to_mbclen): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/enc/test_shift_jis.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_m17n.rb | 9 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/test/ruby/enc/test_shift_jis.rb b/test/ruby/enc/test_shift_jis.rb index f81cb7801c..54ef67dd44 100644 --- a/test/ruby/enc/test_shift_jis.rb +++ b/test/ruby/enc/test_shift_jis.rb @@ -22,6 +22,6 @@ class TestShiftJIS < Test::Unit::TestCase s = "あいうえお" s << 0x82a9 assert_equal("あいうえおか", s) - assert_raise(ArgumentError) { s << 0x82 } + assert_raise(RangeError) { s << 0x82 } end end diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index f4d3dcbdad..3553f3a0a4 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1137,6 +1137,7 @@ class TestM17N < Test::Unit::TestCase def test_str_concat assert_equal(1, "".concat(0xA2).size) + assert_equal(Encoding::ASCII_8BIT, "".force_encoding("US-ASCII").concat(0xA2).encoding) assert_equal("A\x84\x31\xA4\x39".force_encoding("GB18030"), "A".force_encoding("GB18030") << 0x8431A439) end @@ -1196,6 +1197,14 @@ class TestM17N < Test::Unit::TestCase 2206368128.chr(Encoding::UTF_8) } assert_not_match(/-\d+ out of char range/, e.message) + + assert_raise(RangeError){ 0x80.chr("US-ASCII") } + assert_raise(RangeError){ 0x80.chr("SHIFT_JIS") } + assert_raise(RangeError){ 0xE0.chr("SHIFT_JIS") } + assert_raise(RangeError){ 0x100.chr("SHIFT_JIS") } + assert_raise(RangeError){ 0xA0.chr("EUC-JP") } + assert_raise(RangeError){ 0x100.chr("EUC-JP") } + assert_raise(RangeError){ 0xA1A0.chr("EUC-JP") } end def test_marshal diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 1bc2d0a79f..9626f61eb3 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -803,8 +803,6 @@ class TestRegexp < Test::Unit::TestCase #assert_match(/^(\ufb05)\1\1$/i, "\ufb05\ufb06st") # this must be bug... assert_match(/^\ufb05{3}$/i, "\ufb05\ufb06st") assert_match(/^\u03b9\u0308\u0301$/i, "\u0390") - assert_nothing_raised { 0x03ffffff.chr("utf-8").size } - assert_nothing_raised { 0x7fffffff.chr("utf-8").size } end def test_unicode_age |