From 78f5b54f1b2cdacfc4fab9b37cc71a1d195d9424 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 12 Jun 2010 17:13:54 +0000 Subject: * enc/trans/utf8_mac.trans (buf_apply): fix for patterns whose result is 2 bytes. [ruby-core:30751] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_econv.rb | 8 -------- test/ruby/test_transcode.rb | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index cc03eaf218..00682f69cd 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -892,12 +892,4 @@ class TestEncodingConverter < Test::Unit::TestCase "".encode("euc-jp", :undef => :replace, :replace => broken) } end - - def test_utf8_mac - assert_equal("\u{fb4d}", "\u05DB\u05BF".encode("UTF-8", "UTF8-MAC")) - assert_equal("\u{1ff7}", "\u03C9\u0345\u0342".encode("UTF-8", "UTF8-MAC")) - - assert_equal("\u05DB\u05BF", "\u{fb4d}".encode("UTF8-MAC").force_encoding("UTF-8")) - assert_equal("\u03C9\u0345\u0342", "\u{1ff7}".encode("UTF8-MAC").force_encoding("UTF-8")) - end end diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb index 6349d3b29b..1b15a5b556 100644 --- a/test/ruby/test_transcode.rb +++ b/test/ruby/test_transcode.rb @@ -1912,6 +1912,16 @@ class TestTranscode < Test::Unit::TestCase assert_equal(Encoding::Shift_JIS, b.encoding) end + def test_utf8_mac + assert_equal("\u{fb4d}", "\u05DB\u05BF".encode("UTF-8", "UTF8-MAC")) + assert_equal("\u{1ff7}", "\u03C9\u0345\u0342".encode("UTF-8", "UTF8-MAC")) + + assert_equal("\u05DB\u05BF", "\u{fb4d}".encode("UTF8-MAC").force_encoding("UTF-8")) + assert_equal("\u03C9\u0345\u0342", "\u{1ff7}".encode("UTF8-MAC").force_encoding("UTF-8")) + + check_both_ways("\u{e9 74 e8}", "e\u0301te\u0300", 'UTF8-MAC') + end + def test_fallback assert_equal("\u3042".encode("EUC-JP"), "\u{20000}".encode("EUC-JP", fallback: {"\u{20000}" => "\u3042".encode("EUC-JP")})) -- cgit v1.2.3