akr	2008-09-16 01:24:39 +0900 (Tue, 16 Sep 2008)

  New Revision: 19370

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

  Log:
    add assertion message for previous commit.

  Modified files:
    trunk/test/ruby/enc/test_utf16.rb

Index: test/ruby/enc/test_utf16.rb
===================================================================
--- test/ruby/enc/test_utf16.rb	(revision 19369)
+++ test/ruby/enc/test_utf16.rb	(revision 19370)
@@ -1,12 +1,19 @@
 require 'test/unit'
 
 class TestUTF16 < Test::Unit::TestCase
-  def encdump(str)
-    d = str.dump
-    if /\.force_encoding\("[A-Za-z0-9.:_+-]*"\)\z/ =~ d
-      d
+  def encdump(obj)
+    case obj
+    when String
+      d = obj.dump
+      if /\.force_encoding\("[A-Za-z0-9.:_+-]*"\)\z/ =~ d
+        d
+      else
+        "#{d}.force_encoding(#{obj.encoding.name.dump})"
+      end
+    when Regexp
+      "Regexp.new(#{encdump(obj.source)}, #{obj.options})"
     else
-      "#{d}.force_encoding(#{str.encoding.name.dump})"
+      raise Argument, "unexpected: #{obj.inspect}"
     end
   end
 
@@ -359,6 +366,6 @@
   def test_regexp_escape
     s = "\0*".force_encoding("UTF-16BE")
     r = Regexp.new(Regexp.escape(s))
-    assert(r =~ s)
+    assert(r =~ s, "#{encdump(r)} =~ #{encdump(s)}")
   end
 end

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