diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 08:57:33 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 08:57:33 +0000 |
commit | d5ec36c486762ea99a443e76af39edb81d91b479 (patch) | |
tree | 0e4dbf1eae65fee50966c921f1907cabd6c93ac3 /test/ruby/enc/test_utf16.rb | |
parent | 45ee7d2e780e7c1f86cf20a1b83aaf67b0571135 (diff) | |
download | ruby-d5ec36c486762ea99a443e76af39edb81d91b479.tar.gz |
* transcode.c: add "Error" suffix for Encoding exception classes.
a patch from Tadashi Saito <shiba at mail2.accsnet.ne.jp> in
[ruby-dev:36346].
* encoding.c (Init_Encoding): rename EncodingCompatibilityError to
Encoding::CompatibilityError. [ruby-dev:36366]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/enc/test_utf16.rb')
-rw-r--r-- | test/ruby/enc/test_utf16.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/ruby/enc/test_utf16.rb b/test/ruby/enc/test_utf16.rb index 33ca45f90a..64c1dede75 100644 --- a/test/ruby/enc/test_utf16.rb +++ b/test/ruby/enc/test_utf16.rb @@ -144,19 +144,19 @@ EOT end def test_hex - assert_raise(EncodingCompatibilityError) { + assert_raise(Encoding::CompatibilityError) { "ff".encode("utf-16le").hex } - assert_raise(EncodingCompatibilityError) { + assert_raise(Encoding::CompatibilityError) { "ff".encode("utf-16be").hex } end def test_oct - assert_raise(EncodingCompatibilityError) { + assert_raise(Encoding::CompatibilityError) { "77".encode("utf-16le").oct } - assert_raise(EncodingCompatibilityError) { + assert_raise(Encoding::CompatibilityError) { "77".encode("utf-16be").oct } end @@ -164,7 +164,7 @@ EOT def test_count s1 = "aa".force_encoding("utf-16be") s2 = "aa" - assert_raise(EncodingCompatibilityError, "#{encdump s1}.count(#{encdump s2})") { + assert_raise(Encoding::CompatibilityError, "#{encdump s1}.count(#{encdump s2})") { s1.count(s2) } end @@ -172,7 +172,7 @@ EOT def test_plus s1 = "a".force_encoding("us-ascii") s2 = "aa".force_encoding("utf-16be") - assert_raise(EncodingCompatibilityError, "#{encdump s1} + #{encdump s2}") { + assert_raise(Encoding::CompatibilityError, "#{encdump s1} + #{encdump s2}") { s1 + s2 } end @@ -185,7 +185,7 @@ EOT def test_interpolation s = "aa".force_encoding("utf-16be") - assert_raise(EncodingCompatibilityError, "\"a\#{#{encdump s}}\"") { + assert_raise(Encoding::CompatibilityError, "\"a\#{#{encdump s}}\"") { "a#{s}" } end @@ -213,7 +213,7 @@ EOT def test_plus_nonempty s1 = "aa" s2 = "bb".force_encoding("utf-16be") - assert_raise(EncodingCompatibilityError, "#{encdump s1} << #{encdump s2}") { + assert_raise(Encoding::CompatibilityError, "#{encdump s1} << #{encdump s2}") { s1 + s2 } end @@ -237,7 +237,7 @@ EOT def test_concat_nonempty s1 = "aa" s2 = "bb".force_encoding("utf-16be") - assert_raise(EncodingCompatibilityError, "#{encdump s1} << #{encdump s2}") { + assert_raise(Encoding::CompatibilityError, "#{encdump s1} << #{encdump s2}") { s1 << s2 } end @@ -279,7 +279,7 @@ EOT s.gsub(Regexp.new(".".encode("utf-16be")), "xy") } s = "ab\0\ncd".force_encoding("utf-16be") - assert_raise(EncodingCompatibilityError) { + assert_raise(Encoding::CompatibilityError) { s.gsub(Regexp.new(".".encode("utf-16be")), "xy") } end |