merges r20896 from trunk into ruby_1_9_1.

* test/readline/test_readline.rb
  (TestReadline#test_some_characters_methods): checked encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fa1c5ae54d..6daa3deef9 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 14:55:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (SPLAT_PROC): splat values by hand.
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)