summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 14:24:08 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 14:24:08 +0000
commit338253cbe54569137cff26f6cb5dd6db379f481b (patch)
tree6f883159ec5ca9263982913375b2f3ed80305d9c
parent0ebf9b176380e691d3505e6c96cb0e33c6d892e4 (diff)
* lib/test/unit.rb (assert_equal): failure message changed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/test/unit.rb17
2 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5c0f451dc..f87952893c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 16 23:23:27 2008 Tanaka Akira <akr@fsij.org>
+
+ * lib/test/unit.rb (assert_equal): failure message changed.
+
Thu Oct 16 22:52:54 2008 Tanaka Akira <akr@fsij.org>
* lib/test/unit: removed test/unit.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 329e451d4f..fddc994e64 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -89,7 +89,22 @@ module Test
end
def assert_equal(exp, act, msg = nil)
- msg = message(msg) { "Expected\n<#{mu_pp(exp)}> but\n<#{mu_pp(act)}>" }
+ msg = message(msg) {
+ exp_str = mu_pp(exp)
+ act_str = mu_pp(act)
+ exp_comment = ''
+ act_comment = ''
+ if exp_str == act_str
+ if exp.is_a?(String) && act.is_a?(String)
+ exp_comment = " (#{exp.encoding})"
+ act_comment = " (#{act.encoding})"
+ elsif exp.is_a?(Time) && act.is_a?(Time)
+ exp_comment = " (nsec=#{exp.nsec})"
+ act_comment = " (nsec=#{act.nsec})"
+ end
+ end
+ "<#{exp_str}>#{exp_comment} expected but was\n<#{act_str}>#{act_comment}"
+ }
assert(exp == act, msg)
end