kosaki	2011-02-05 16:50:12 +0900 (Sat, 05 Feb 2011)

  New Revision: 30796

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

  Log:
    * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
      msg can be passed nil. [Bug #4371] [ruby-dev:43174]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30795)
+++ ChangeLog	(revision 30796)
@@ -1,3 +1,8 @@
+Sat Feb  5 16:47:54 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  msg can be passed nil. [Bug #4371] [ruby-dev:43174]
+
 Sat Feb  5 15:18:25 2011  Eric Hodel  <drbrain@s...>
 
 	* lib/rdoc: Upgrade to RDoc 3.5.2
Index: lib/test/unit/assertions.rb
===================================================================
--- lib/test/unit/assertions.rb	(revision 30795)
+++ lib/test/unit/assertions.rb	(revision 30796)
@@ -10,13 +10,10 @@
         obj.pretty_inspect.chomp
       end
 
-      UNASSIGNED = Object.new # :nodoc:
-
-      def assert(test, msg = UNASSIGNED)
+      def assert(test, msg = nil)
         case msg
-        when UNASSIGNED
-          msg = nil
-        when String, Proc
+        when String, Proc, NilClass
+          # do nothing
         else
           bt = caller.reject { |s| s.rindex(MiniTest::MINI_DIR, 0) }
           raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt

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