From 77ae7b2e8353c963404c31c6d910fe77286cbd81 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 15 Jan 2014 05:03:49 +0000 Subject: string.c: use actual encodings * string.c (get_actual_encoding): get actual encoding according to the BOM if exists. * string.c (rb_str_inspect): use according encoding, instead of pseudo encodings, UTF-{16,32}. [ruby-core:59757] [Bug #8940] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_m17n.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/ruby/test_m17n.rb') diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 4557cd6c3c..f5f23c09f1 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -228,14 +228,18 @@ class TestM17N < Test::Unit::TestCase STR_WITHOUT_BOM = "\u3042".freeze STR_WITH_BOM = "\uFEFF\u3042".freeze + bug8940 = '[ruby-core:59757] [Bug #8940]' %w/UTF-16 UTF-32/.each do |enc| %w/BE LE/.each do |endian| + bom = "\uFEFF".encode("#{enc}#{endian}").force_encoding(enc) + define_method("test_utf_16_32_inspect(#{enc}#{endian})") do s = STR_WITHOUT_BOM.encode(enc + endian) # When a UTF-16/32 string doesn't have a BOM, # inspect as a dummy encoding string. assert_equal(s.dup.force_encoding("ISO-2022-JP").inspect, s.dup.force_encoding(enc).inspect) + assert_normal_exit("#{bom.b.dump}.force_encoding('#{enc}').inspect", bug8940) end define_method("test_utf_16_32_inspect(#{enc}#{endian}-BOM)") do -- cgit v1.2.3