diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:53:49 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:53:49 +0000 |
| commit | 2562e1faef68f7cf1f35dc90a98e86f17d2a0a76 (patch) | |
| tree | cc8ce8faabbbb27b5a631c221da9489ed75106a8 /lib | |
| parent | c3b50d5adaa0c140dc3d681d6c0c4c10dd2e7fe6 (diff) | |
merges r20943 from trunk into ruby_1_9_1.
* lib/test/unit/assertions.rb (assert_equal): show small differences
for Regexp and Float.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test/unit/assertions.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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})" |