summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 09:34:08 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 09:34:08 +0000
commitace35ac66c3df9beec76bbff7c75b37307930678 (patch)
treed1b9aae8082205ccd07c61b6dd987133613fe975
parent12932721dc5908b2762120b8bd6573c429c7c51b (diff)
* lib/test/unit/assertions.rb (assert_equal): show small differences
for Regexp and Float. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit/assertions.rb6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b2127593b..17e1a2873c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 23 17:38:03 2008 Tanaka Akira <akr@fsij.org>
+
+ * lib/test/unit/assertions.rb (assert_equal): show small differences
+ for Regexp and Float.
+
Tue Dec 23 16:49:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_spawn): support normal commands with arguments.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index af1a23a3bc..0a31915bd9 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -53,9 +53,13 @@ module Test
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})"