diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:42:37 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:42:37 +0000 |
| commit | 52d0de429600e818f6ab3ef6ddb0ce181d9efca5 (patch) | |
| tree | bf7a5e1bc43174638aaedac2b0eb8efe926248b2 /test/ruby/test_transcode.rb | |
| parent | 472b348d6e10242c1730561abca8c76410e13d64 (diff) | |
| download | ruby-52d0de429600e818f6ab3ef6ddb0ce181d9efca5.tar.gz ruby-52d0de429600e818f6ab3ef6ddb0ce181d9efca5.tar.xz ruby-52d0de429600e818f6ab3ef6ddb0ce181d9efca5.zip | |
* include/ruby/encoding.h (rb_econv_open_exc): declared.
* transcode.c (rb_eNoConverter): new exception.
(rb_econv_open_exc): new function.
(transcode_loop): use rb_econv_open_exc.
* io.c (make_writeconv): use rb_econv_open_exc.
(make_readconv): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_transcode.rb')
| -rw-r--r-- | test/ruby/test_transcode.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index b88b4d561..fd673a96c 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -21,10 +21,10 @@ class TestTranscode < Test::Unit::TestCase def test_errors assert_raise(ArgumentError) { 'abc'.encode } assert_raise(ArgumentError) { 'abc'.encode! } - assert_raise(ArgumentError) { 'abc'.encode('foo', 'bar') } - assert_raise(ArgumentError) { 'abc'.encode!('foo', 'bar') } - assert_raise(ArgumentError) { 'abc'.force_encoding('utf-8').encode('foo') } - assert_raise(ArgumentError) { 'abc'.force_encoding('utf-8').encode!('foo') } + assert_raise(Encoding::NoConverter) { 'abc'.encode('foo', 'bar') } + assert_raise(Encoding::NoConverter) { 'abc'.encode!('foo', 'bar') } + assert_raise(Encoding::NoConverter) { 'abc'.force_encoding('utf-8').encode('foo') } + assert_raise(Encoding::NoConverter) { 'abc'.force_encoding('utf-8').encode!('foo') } assert_raise(Encoding::ConversionUndefined) { "\x80".encode('utf-8','ASCII-8BIT') } assert_raise(Encoding::InvalidByteSequence) { "\x80".encode('utf-8','US-ASCII') } assert_raise(Encoding::ConversionUndefined) { "\xA5".encode('utf-8','iso-8859-3') } |