akr	2008-10-16 23:28:06 +0900 (Thu, 16 Oct 2008)

  New Revision: 19802

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

  Log:
    * lib/test/unit.rb (assert_equal): avoid incompatible character
      encodings error.

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19801)
+++ ChangeLog	(revision 19802)
@@ -1,3 +1,8 @@
+Thu Oct 16 23:27:27 2008  Tanaka Akira  <akr@f...>
+
+	* lib/test/unit.rb (assert_equal): avoid incompatible character
+	  encodings error.
+
 Thu Oct 16 23:23:27 2008  Tanaka Akira  <akr@f...>
 
 	* lib/test/unit.rb (assert_equal): failure message changed.
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 19801)
+++ lib/test/unit.rb	(revision 19802)
@@ -102,6 +102,16 @@
               exp_comment = " (nsec=#{exp.nsec})"
               act_comment = " (nsec=#{act.nsec})"
             end
+          elsif !Encoding.compatible?(exp_str, act_str)
+            if exp.is_a?(String) && act.is_a?(String)
+              exp_str = exp.dump
+              act_str = act.dump
+              exp_comment = " (#{exp.encoding})"
+              act_comment = " (#{act.encoding})"
+            else
+              exp_str = exp_str.dump
+              act_str = act_str.dump
+            end
           end
           "<#{exp_str}>#{exp_comment} expected but was\n<#{act_str}>#{act_comment}"
         }

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