yugui	2008-12-24 13:09:55 +0900 (Wed, 24 Dec 2008)

  New Revision: 20961

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20961

  Log:
    merges r20896 from trunk into ruby_1_9_1.
    * test/readline/test_readline.rb
      (TestReadline#test_some_characters_methods): checked encoding.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/test/readline/test_readline.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20960)
+++ ruby_1_9_1/ChangeLog	(revision 20961)
@@ -1,3 +1,8 @@
+Sun Dec 21 13:50:37 2008  TAKAO Kouji  <kouji@t...>
+
+	* test/readline/test_readline.rb
+	  (TestReadline#test_some_characters_methods): checked encoding.
+
 Sun Dec 21 14:55:18 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (SPLAT_PROC): splat values by hand.
Index: ruby_1_9_1/test/readline/test_readline.rb
===================================================================
--- ruby_1_9_1/test/readline/test_readline.rb	(revision 20960)
+++ ruby_1_9_1/test/readline/test_readline.rb	(revision 20961)
@@ -166,7 +166,7 @@
 
   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 @@
     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 @@
       }
     }
   end
+
+  def get_default_internal_encoding
+    return Encoding.default_internal || Encoding.find("locale")
+  end
 end if defined?(::Readline)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/