From 52d0de429600e818f6ab3ef6ddb0ce181d9efca5 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 24 Aug 2008 02:42:37 +0000 Subject: * 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 --- test/ruby/test_econv.rb | 2 +- test/ruby/test_transcode.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 025887f1c..5ba6b7c44 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 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') } -- cgit