From f6144761ec56a481d21d194301f7d6ec59632855 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 13 Aug 2008 05:30:42 +0000 Subject: * enc/trans/newline.trans: new file. * transcode_data.h (rb_trans_t): add last_tc field. * transcode.c (UNIVERSAL_NEWLINE): defined. (CRLF_NEWLINE): defined. (CR_NEWLINE): defined. (rb_trans_open_by_transcoder_entries): initialize last_tc. (trans_open_i): allocate one more room for newline converter. (rb_trans_open): universal newline implemented. (more_output_buffer): take max_output argument instead ts. (output_replacement_character): take tc argument instead of ts. (transcode_loop): use last_tc field. (econv_init): add flags argument for rb_trans_open. (Init_transcode): Encoding::Converter::UNIVERSAL_NEWLINE defined. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_econv.rb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index a4f86d1c9..8a09f1e9b 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -4,7 +4,7 @@ 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) + ec = Encoding::Converter.new(from, to, 0) dst = '' while true ret = ec.primitive_convert(src, dst2="", opt[:obuf_len], 0) @@ -35,7 +35,7 @@ class TestEncodingConverter < Test::Unit::TestCase end def test_errors - ec = Encoding::Converter.new("UTF-16BE", "EUC-JP") + ec = Encoding::Converter.new("UTF-16BE", "EUC-JP", 0) src = "\xFF\xFE\x00A\xDC\x00" ret = ec.primitive_convert(src, dst="", 10, 0) assert_equal("", src) @@ -50,4 +50,18 @@ class TestEncodingConverter < Test::Unit::TestCase assert_equal("", dst) assert_equal(:finished, ret) end + + def test_universal_newline + ec = Encoding::Converter.new("UTF-8", "EUC-JP", Encoding::Converter::UNIVERSAL_NEWLINE) + ret = ec.primitive_convert(src="abc\r\ndef", dst="", 50, Encoding::Converter::PARTIAL_INPUT) + assert_equal([:ibuf_empty, "", "abc\ndef"], [ret, src, dst]) + ret = ec.primitive_convert(src="ghi\njkl", dst="", 50, Encoding::Converter::PARTIAL_INPUT) + assert_equal([:ibuf_empty, "", "ghi\njkl"], [ret, src, dst]) + ret = ec.primitive_convert(src="mno\rpqr", dst="", 50, Encoding::Converter::PARTIAL_INPUT) + assert_equal([:ibuf_empty, "", "mno\npqr"], [ret, src, dst]) + ret = ec.primitive_convert(src="stu\r", dst="", 50, Encoding::Converter::PARTIAL_INPUT) + assert_equal([:ibuf_empty, "", "stu\n"], [ret, src, dst]) + ret = ec.primitive_convert(src="\nvwx", dst="", 50, Encoding::Converter::PARTIAL_INPUT) + assert_equal([:ibuf_empty, "", "vwx"], [ret, src, dst]) + end end -- cgit