yugui	2008-12-25 18:53:49 +0900 (Thu, 25 Dec 2008)

  New Revision: 21014

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

  Log:
    merges r20943 from trunk into ruby_1_9_1.
    * lib/test/unit/assertions.rb (assert_equal): show small differences
      for Regexp and Float.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/test/unit/assertions.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21013)
+++ ruby_1_9_1/ChangeLog	(revision 21014)
@@ -1,3 +1,8 @@
+Tue Dec 23 17:38:03 2008  Tanaka Akira  <akr@f...>
+
+	* lib/test/unit/assertions.rb (assert_equal): show small differences
+	  for Regexp and Float.
+
 Tue Dec 23 16:49:48 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (rb_w32_spawn): support normal commands with arguments.
Index: ruby_1_9_1/lib/test/unit/assertions.rb
===================================================================
--- ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21013)
+++ ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21014)
@@ -53,9 +53,13 @@
           exp_comment = ''
           act_comment = ''
           if exp_str == act_str
-            if exp.is_a?(String) && act.is_a?(String)
+            if (exp.is_a?(String) && act.is_a?(String)) ||
+               (exp.is_a?(Regexp) && act.is_a?(Regexp))
               exp_comment = " (#{exp.encoding})"
               act_comment = " (#{act.encoding})"
+            elsif exp.is_a?(Float) && act.is_a?(Float)
+              exp_str = "%\#.#{Float::DIG+2}g" % exp
+              act_str = "%\#.#{Float::DIG+2}g" % act
             elsif exp.is_a?(Time) && act.is_a?(Time)
               exp_comment = " (nsec=#{exp.nsec})"
               act_comment = " (nsec=#{act.nsec})"

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