diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-25 12:47:30 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-25 12:47:30 +0000 |
commit | d7dbdef4e503f3ad8f9b00b91cf1b28884051402 (patch) | |
tree | 825845672e7b770bd59e7043e5dd453526f35a91 /test/ruby/test_econv.rb | |
parent | 2c1c462747346b05b00a0a18f28cf098526b0c1f (diff) | |
download | ruby-d7dbdef4e503f3ad8f9b00b91cf1b28884051402.tar.gz |
* transcode.c (rb_eUndefinedConversionError): renamed from
rb_eConversionUndefinedError.
(rb_eConverterNotFoundError): renamed from rb_eNoConverterError.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_econv.rb')
-rw-r--r-- | test/ruby/test_econv.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 57366f3bd8..0f1d18a8e5 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -80,7 +80,7 @@ class TestEncodingConverter < Test::Unit::TestCase name1 = "encoding-which-is-not-exist-1" name2 = "encoding-which-is-not-exist-2" - assert_raise(Encoding::NoConverterError) { + assert_raise(Encoding::ConverterNotFoundError) { Encoding::Converter.new(name1, name2) } @@ -513,7 +513,7 @@ class TestEncodingConverter < Test::Unit::TestCase ec.primitive_convert("", dst, nil, 10, :partial_input=>true) assert_equal("\e$B!!\e(B???\e$B!\"!!!\#$\"".force_encoding("ISO-2022-JP"), dst) - assert_raise(Encoding::ConversionUndefinedError) { + assert_raise(Encoding::UndefinedConversionError) { ec.insert_output("\uFFFD") } @@ -550,7 +550,7 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_exc_undef - err = assert_raise(Encoding::ConversionUndefinedError) { + err = assert_raise(Encoding::UndefinedConversionError) { "abc\xa4\xa2def".encode("ISO-8859-1", "EUC-JP") } assert_equal("UTF-8", err.source_encoding_name) @@ -658,7 +658,7 @@ class TestEncodingConverter < Test::Unit::TestCase def test_convert ec = Encoding::Converter.new("utf-8", "euc-jp") assert_raise(Encoding::InvalidByteSequenceError) { ec.convert("a\x80") } - assert_raise(Encoding::ConversionUndefinedError) { ec.convert("\ufffd") } + assert_raise(Encoding::UndefinedConversionError) { ec.convert("\ufffd") } ret = ec.primitive_convert(nil, "", nil, nil) assert_equal(:finished, ret) assert_raise(ArgumentError) { ec.convert("a") } @@ -695,7 +695,7 @@ class TestEncodingConverter < Test::Unit::TestCase ec = Encoding::Converter.new("UTF-8", "US-ASCII") ec.primitive_convert(src="\u{3042}", dst="") err = ec.last_error - assert_kind_of(Encoding::ConversionUndefinedError, err) + assert_kind_of(Encoding::UndefinedConversionError, err) assert_equal("\u{3042}", err.error_char) end @@ -703,7 +703,7 @@ class TestEncodingConverter < Test::Unit::TestCase ec = Encoding::Converter.new("UTF-8", "ISO-8859-1") ec.primitive_convert(src="\u{3042}", dst="") err = ec.last_error - assert_kind_of(Encoding::ConversionUndefinedError, err) + assert_kind_of(Encoding::UndefinedConversionError, err) assert_equal("\u{3042}", err.error_char) end |