[前][次][番号順一覧][スレッド一覧]

ruby-changes:8273

From: akr <ko1@a...>
Date: Thu, 16 Oct 2008 23:27:11 +0900 (JST)
Subject: [ruby-changes:8273] Ruby:r19801 (trunk): * lib/test/unit.rb (assert_equal): failure message changed.

akr	2008-10-16 23:24:08 +0900 (Thu, 16 Oct 2008)

  New Revision: 19801

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

  Log:
    * lib/test/unit.rb (assert_equal): failure message changed.

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19800)
+++ ChangeLog	(revision 19801)
@@ -1,3 +1,7 @@
+Thu Oct 16 23:23:27 2008  Tanaka Akira  <akr@f...>
+
+	* lib/test/unit.rb (assert_equal): failure message changed.
+
 Thu Oct 16 22:52:54 2008  Tanaka Akira  <akr@f...>
 
 	* lib/test/unit: removed test/unit.
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 19800)
+++ lib/test/unit.rb	(revision 19801)
@@ -89,7 +89,22 @@
       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
 

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

[前][次][番号順一覧][スレッド一覧]