From a3aa4da7733f3c9a955f9cfc430624b34f185cf3 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Jan 2017 02:18:45 +0000 Subject: string.c: yield invalid part * string.c (rb_enc_str_scrub): yield the invalid part only with ASCII-incompatible. [ruby-core:79039] [Bug #13120] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_m17n.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/ruby/test_m17n.rb') diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index c610f71216..44f19254dc 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1623,7 +1623,7 @@ class TestM17N < Test::Unit::TestCase assert_raise(ArgumentError){ u("\xE3\x81\x82\xE3\x81\x82\xE3\x81").scrub{u("\x81")} } assert_equal(e("\xA4\xA2\xA2\xAE"), e("\xA4\xA2\xA4").scrub{e("\xA2\xAE")}) - assert_equal(u("\x81"), u("a\x81").scrub {|c| break c}) + assert_equal(u("\x81"), u("a\x81c").scrub {|c| break c}) assert_raise(ArgumentError) {u("a\x81").scrub {|c| c}} end @@ -1641,8 +1641,8 @@ class TestM17N < Test::Unit::TestCase "\xff".force_encoding(Encoding::UTF_32LE). scrub) c = nil - assert_equal("?".encode(Encoding::UTF_16LE), - "\x00\xD8".force_encoding(Encoding::UTF_16LE). + assert_equal("?\u3042".encode(Encoding::UTF_16LE), + "\x00\xD8\x42\x30".force_encoding(Encoding::UTF_16LE). scrub {|e| c = e; "?".encode(Encoding::UTF_16LE)}) assert_equal("\x00\xD8".force_encoding(Encoding::UTF_16LE), c) end -- cgit v1.2.3