yugui	2008-12-13 13:05:27 +0900 (Sat, 13 Dec 2008)

  New Revision: 20716

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

  Log:
    merges r20713 from trunk into ruby_1_9_1.
    * lib/minitest/test.rb (MinTest::Unit#location):
      skips user-defined assertions as MiniTest's.
      e.g. for test/ruby/test_m17n.rb.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/minitest/unit.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20715)
+++ ruby_1_9_1/ChangeLog	(revision 20716)
@@ -1,3 +1,9 @@
+Sat Dec 13 12:38:16 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* lib/minitest/test.rb (MinTest::Unit#location): 
+	  skips user-defined assertions as MiniTest's.
+	  e.g. for test/ruby/test_m17n.rb.
+
 Wed Dec 10 12:56:32 2008  Akinori MUSHA  <knu@i...>
 
 	* enumerator.c (enumerator_rewind): If the enclosed object
Index: ruby_1_9_1/lib/minitest/unit.rb
===================================================================
--- ruby_1_9_1/lib/minitest/unit.rb	(revision 20715)
+++ ruby_1_9_1/lib/minitest/unit.rb	(revision 20716)
@@ -336,8 +336,12 @@
     end
 
     def location e
-      e.backtrace.find { |s|
-        s !~ /in .(assert|refute|flunk|pass|fail|raise)/
+      e.backtrace.reverse.inject(""){ |last, s|
+        if  s =~ /in .(assert|refute|flunk$|pass$|fail$|raise$)/
+          break last 
+        else
+          s
+        end
       }.sub(/:in .*$/, '')
     end
 

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