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 | 8f9ed3c464fea371855792758b9e9d31ba99c0ec (patch) | |
| tree | bf7a5e1bc43174638aaedac2b0eb8efe926248b2 /test | |
| parent | 55742dce2d30534faa95551c7904bbf660b4835b (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@18803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_econv.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_transcode.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 025887f1c6..5ba6b7c447 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -37,7 +37,7 @@ class TestEncodingConverter < Test::Unit::TestCase name1 = "encoding-which-is-not-exist-1" name2 = "encoding-which-is-not-exist-2" - assert_raise(ArgumentError) { + assert_raise(Encoding::NoConverter) { Encoding::Converter.new(name1, name2) } diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index b88b4d561d..fd673a96c0 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') } |