akr	2008-01-20 03:56:50 +0900 (Sun, 20 Jan 2008)

  New Revision: 15133

  Modified files:
    trunk/test/ruby/test_m17n.rb

  Log:
    update encdump for UTF-16.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_m17n.rb?r1=15133&r2=15132&diff_format=u

Index: test/ruby/test_m17n.rb
===================================================================
--- test/ruby/test_m17n.rb	(revision 15132)
+++ test/ruby/test_m17n.rb	(revision 15133)
@@ -79,7 +79,12 @@
   end
 
   def encdump(str)
-    "#{str.dump}.force_encoding(#{str.encoding.name.dump})"
+    d = str.dump
+    if /\.force_encoding\("[A-Za-z0-9.:_+-]*"\)\z/ =~ d
+      d
+    else
+      "#{d}.force_encoding(#{str.encoding.name.dump})"
+    end
   end
 
   def encdumpargs(args)
@@ -287,7 +292,8 @@
   end
 
   def test_utf16_valid_encoding
-    assert_equal(false, "\xd8\x00\xd8\x00".force_encoding("utf-16be").valid_encoding?)
+    s = "\xd8\x00\xd8\x00".force_encoding("utf-16be")
+    assert_equal(false, s.valid_encoding?, "#{encdump s}.valid_encoding?")
   end
 
   def test_utf16

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