From 19924842e6c4ce6cd2d236dd10c8c7451a8ea297 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 13 Aug 2008 06:08:56 +0000 Subject: * transcode.c (econv_init): make flags argument optional. (econv_primitive_convert): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_econv.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 3b3241985..e9669aec1 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -4,10 +4,10 @@ class TestEncodingConverter < Test::Unit::TestCase def assert_econv(ret_expected, dst_expected, src_expected, to, from, src, opt={}) opt[:obuf_len] ||= 100 src = src.dup - ec = Encoding::Converter.new(from, to, 0) + ec = Encoding::Converter.new(from, to) dst = '' while true - ret = ec.primitive_convert(src, dst2="", opt[:obuf_len], 0) + ret = ec.primitive_convert(src, dst2="", opt[:obuf_len]) dst << dst2 #p [ret, dst, src] break if ret != :obuf_full @@ -35,17 +35,17 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_errors - ec = Encoding::Converter.new("UTF-16BE", "EUC-JP", 0) + ec = Encoding::Converter.new("UTF-16BE", "EUC-JP") src = "\xFF\xFE\x00A\xDC\x00" - ret = ec.primitive_convert(src, dst="", 10, 0) + ret = ec.primitive_convert(src, dst="", 10) assert_equal("", src) assert_equal("", dst) assert_equal(:undefined_conversion, ret) # \xFF\xFE is not representable in EUC-JP - ret = ec.primitive_convert(src, dst="", 10, 0) + ret = ec.primitive_convert(src, dst="", 10) assert_equal("", src) assert_equal("A", dst) assert_equal(:invalid_input, ret) # \xDC\x00 is invalid as UTF-16BE - ret = ec.primitive_convert(src, dst="", 10, 0) + ret = ec.primitive_convert(src, dst="", 10) assert_equal("", src) assert_equal("", dst) assert_equal(:finished, ret) @@ -67,13 +67,13 @@ class TestEncodingConverter < Test::Unit::TestCase def test_crlf_newline ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::CRLF_NEWLINE) - ret = ec.primitive_convert(src="abc\ndef", dst="", 50, 0) + ret = ec.primitive_convert(src="abc\ndef", dst="", 50) assert_equal([:finished, "", "abc\r\ndef"], [ret, src, dst]) end def test_cr_newline ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::CR_NEWLINE) - ret = ec.primitive_convert(src="abc\ndef", dst="", 50, 0) + ret = ec.primitive_convert(src="abc\ndef", dst="", 50) assert_equal([:finished, "", "abc\rdef"], [ret, src, dst]) end end -- cgit