summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/readline/test_readline.rb11
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eaeda90654..92a17ea970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 21 13:50:37 2008 TAKAO Kouji <kouji@takao7.net>
+
+ * test/readline/test_readline.rb
+ (TestReadline#test_some_characters_methods): checked encoding.
+
Sun Dec 21 12:23:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (SPLAT_PROC): fix for regexp. [ruby-dev:37514]
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index cf809e20d7..20229535b4 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -166,7 +166,7 @@ class TestReadline < Test::Unit::TestCase
def test_completion_append_character
begin
- enc = Encoding.default_internal || Encoding.find("locale")
+ enc = get_default_internal_encoding
data_expected = [
["x", "x"],
["xyx", "x"],
@@ -200,11 +200,14 @@ class TestReadline < Test::Unit::TestCase
method_names.each do |method_name|
begin
begin
+ enc = get_default_internal_encoding
saved = Readline.send(method_name.to_sym)
expecteds = [" ", " .,|\t", ""]
expecteds.each do |e|
Readline.send((method_name + "=").to_sym, e)
- assert_equal(e, Readline.send(method_name.to_sym))
+ res = Readline.send(method_name.to_sym)
+ assert_equal(e, res)
+ assert_equal(enc, res.encoding)
end
ensure
Readline.send((method_name + "=").to_sym, saved) if saved
@@ -236,4 +239,8 @@ class TestReadline < Test::Unit::TestCase
}
}
end
+
+ def get_default_internal_encoding
+ return Encoding.default_internal || Encoding.find("locale")
+ end
end if defined?(::Readline)