ruby-changes:22349
From: nobu <ko1@a...>
Date: Mon, 30 Jan 2012 14:37:39 +0900 (JST)
Subject: [ruby-changes:22349] nobu:r34398 (trunk): * test/readline/test_readline.rb (test_completion_encoding): test on more locales.
nobu 2012-01-30 14:37:28 +0900 (Mon, 30 Jan 2012) New Revision: 34398 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34398 Log: * test/readline/test_readline.rb (test_completion_encoding): test on more locales. Modified files: trunk/test/readline/test_readline.rb Index: test/readline/test_readline.rb =================================================================== --- test/readline/test_readline.rb (revision 34397) +++ test/readline/test_readline.rb (revision 34398) @@ -283,27 +283,43 @@ 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 - case locale = Encoding.find("locale") - when Encoding::UTF_8 + locale = Encoding.find("locale") + if locale == Encoding::UTF_8 enc1 = Encoding::EUC_JP - when Encoding::EUC_JP, Encoding::Windows_31J + else enc1 = Encoding::UTF_8 - else - skip end 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/