From 1e4c606b1a6d1fcf619b0341487b838ee6f6d686 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Sep 2009 13:22:27 +0000
Subject: * lib/test/unit/assertions.rb (assert_equal): use Time#subsec if nsec
   is not enough to distinguish arguments.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/test/unit/assertions.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 35348d87b..821faf580 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -67,8 +67,16 @@ module Test
               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})"
+              if exp.subsec * 1000_000_000 == exp.nsec
+                exp_comment = " (#{exp.nsec}[ns])"
+              else
+                exp_comment = " (subsec=#{exp.subsec})"
+              end
+              if act.subsec * 1000_000_000 == act.nsec
+                act_comment = " (#{act.nsec}[ns])"
+              else
+                act_comment = " (subsec=#{act.subsec})"
+              end
             elsif exp.class != act.class
               # a subclass of Range, for example.
               exp_comment = " (#{exp.class})"
-- 
cgit