nobu	2012-05-08 03:53:56 +0900 (Tue, 08 May 2012)

  New Revision: 35576

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

  Log:
    lib/test/unit.rb: refactoring puke
    
    * lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
      drop useless reports, not override entirely.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35575)
+++ ChangeLog	(revision 35576)
@@ -1,5 +1,8 @@
-Tue May  8 03:53:40 2012  Nobuyoshi Nakada  <nobu@r...>
+Tue May  8 03:53:54 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
+	  drop useless reports, not override entirely.
+
 	* bootstraptest/runner.rb (exec_test, show_progress): show rotators
 	  and pass/fail counts.
 
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 35575)
+++ lib/test/unit.rb	(revision 35576)
@@ -650,21 +650,13 @@
         # TODO:
         #   this overriding is for minitest feature that skip messages are
         #   hidden when not verbose (-v), note this is temporally.
-        e = case e
-            when MiniTest::Skip then
-              @skips += 1
-              return "." if /no message given\z/ =~ e.message
-              "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
-            when MiniTest::Assertion then
-              @failures += 1
-              "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
-            else
-              @errors += 1
-              bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
-              "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
-            end
-        @report << e
-        e[0, 1]
+        n = report.size
+        rep = super
+        if MiniTest::Skip === e and /no message given\z/ =~ e.message
+          report.slice!(n..-1)
+          rep = "."
+        end
+        rep
       end
 
       def initialize # :nodoc:

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