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/test_econv.rb | |
parent | 45ee7d2e780e7c1f86cf20a1b83aaf67b0571135 (diff) |
* 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/test_econv.rb')
-rw-r--r-- | test/ruby/test_econv.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index a26647627a..57366f3bd8 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::NoConverter) { + assert_raise(Encoding::NoConverterError) { 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::ConversionUndefined) { + assert_raise(Encoding::ConversionUndefinedError) { ec.insert_output("\uFFFD") } @@ -524,7 +524,7 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_exc_invalid - err = assert_raise(Encoding::InvalidByteSequence) { + err = assert_raise(Encoding::InvalidByteSequenceError) { "abc\xa4def".encode("ISO-8859-1", "EUC-JP") } assert_equal("EUC-JP", err.source_encoding_name) @@ -537,7 +537,7 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_exc_incomplete - err = assert_raise(Encoding::InvalidByteSequence) { + err = assert_raise(Encoding::InvalidByteSequenceError) { "abc\xa4".encode("ISO-8859-1", "EUC-JP") } assert_equal("EUC-JP", err.source_encoding_name) @@ -550,7 +550,7 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_exc_undef - err = assert_raise(Encoding::ConversionUndefined) { + err = assert_raise(Encoding::ConversionUndefinedError) { "abc\xa4\xa2def".encode("ISO-8859-1", "EUC-JP") } assert_equal("UTF-8", err.source_encoding_name) @@ -657,8 +657,8 @@ class TestEncodingConverter < Test::Unit::TestCase def test_convert ec = Encoding::Converter.new("utf-8", "euc-jp") - assert_raise(Encoding::InvalidByteSequence) { ec.convert("a\x80") } - assert_raise(Encoding::ConversionUndefined) { ec.convert("\ufffd") } + assert_raise(Encoding::InvalidByteSequenceError) { ec.convert("a\x80") } + assert_raise(Encoding::ConversionUndefinedError) { ec.convert("\ufffd") } ret = ec.primitive_convert(nil, "", nil, nil) assert_equal(:finished, ret) assert_raise(ArgumentError) { ec.convert("a") } @@ -674,28 +674,28 @@ class TestEncodingConverter < Test::Unit::TestCase def test_finish_incomplete_error ec = Encoding::Converter.new("utf-8", "euc-jp") ec.convert("\xEF") - assert_raise(Encoding::InvalidByteSequence) { ec.finish } + assert_raise(Encoding::InvalidByteSequenceError) { ec.finish } end def test_last_error1 ec = Encoding::Converter.new("sjis", "euc-jp") assert_equal(nil, ec.last_error) assert_equal(:incomplete_input, ec.primitive_convert(src="fo\x81", dst="", nil, nil)) - assert_kind_of(Encoding::InvalidByteSequence, ec.last_error) + assert_kind_of(Encoding::InvalidByteSequenceError, ec.last_error) end def test_last_error2 ec = Encoding::Converter.new("sjis", "euc-jp") assert_equal("fo", ec.convert(src="fo\x81")) - assert_raise(Encoding::InvalidByteSequence) { ec.finish } - assert_kind_of(Encoding::InvalidByteSequence, ec.last_error) + assert_raise(Encoding::InvalidByteSequenceError) { ec.finish } + assert_kind_of(Encoding::InvalidByteSequenceError, ec.last_error) end def test_us_ascii ec = Encoding::Converter.new("UTF-8", "US-ASCII") ec.primitive_convert(src="\u{3042}", dst="") err = ec.last_error - assert_kind_of(Encoding::ConversionUndefined, err) + assert_kind_of(Encoding::ConversionUndefinedError, 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::ConversionUndefined, err) + assert_kind_of(Encoding::ConversionUndefinedError, err) assert_equal("\u{3042}", err.error_char) end |