diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 06:42:39 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 06:42:39 +0000 |
commit | 9e2e9208f7fdc9fc915eebf279ad56b0182fe654 (patch) | |
tree | 933d5c10cdb917bafdd6a642b7098c5625a3c801 /test | |
parent | d66b539d88f52cd14338b233b470b19e32770425 (diff) |
merge revision(s) 34394,34398:
------------------------------------------------------------------------
r34394 | naruse | 2012-01-29 23:24:05 +0900 (Sun, 29 Jan 2012) | 1 line
Skip test if locale is not Japanese nor UTF-8.
------------------------------------------------------------------------
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/readline/test_readline.rb | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 141d34ac38..2737b2134a 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -255,8 +255,9 @@ class TestReadline < Test::Unit::TestCase def test_completion_encoding bug5941 = '[Bug #5941]' + append_character = Readline.completion_append_character + Readline.completion_append_character = "" completion_case_fold = Readline.completion_case_fold - Readline.completion_case_fold = false locale = Encoding.find("locale") if locale == Encoding::UTF_8 enc1 = Encoding::EUC_JP @@ -266,14 +267,31 @@ class TestReadline < Test::Unit::TestCase results = nil Readline.completion_proc = ->(text) {results} - results = ["\u{3042 3042}", "\u{3042 3044}"].map {|s| s.encode(locale)} - assert_equal("\u{3042}", with_pipe {|r, w| w << "\t"}, bug5941) + [%W"\u{3042 3042} \u{3042 3044}", %W"\u{fe5b fe5b} \u{fe5b fe5c}"].any? do |w| + begin + results = w.map {|s| s.encode(locale)} + rescue Encoding::UndefinedConversionError + end + end or + begin + "\xa1\xa2".encode(Encoding::UTF_8, locale) + rescue + else + results = %W"\xa1\xa1 \xa1\xa2".map {|s| s.force_encoding(locale)} + end or + skip("missing test for locale #{locale.name}") + expected = results[0][0...1] Readline.completion_case_fold = false - assert_equal("\u{3042}", with_pipe {|r, w| w << "\t"}, bug5941) - results = ["\u{3042 3042}", "\u{3042 3044}"].map {|s| s.encode(enc1)} - assert_raise(Encoding::CompatibilityError, bug5941) {with_pipe {|r, w| w << "\t"}} + assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941) + Readline.completion_case_fold = true + assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941) + results.map! {|s| s.encode(enc1)} + assert_raise(Encoding::CompatibilityError, bug5941) do + with_pipe {|r, w| w << "\t"} + end ensure Readline.completion_case_fold = completion_case_fold + Readline.completion_append_character = append_character end # basic_word_break_characters |