yugui	2008-10-27 15:43:13 +0900 (Mon, 27 Oct 2008)

  New Revision: 19963

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

  Log:
    * test/minitest/test_mini_test.rb
      (test_assert_raises_triggered_different): the test failed when a
      file path in the backtrace contontains something except [\w\/\.],
      e.g. hyphen, Japanese characters or backslash.
    
    * test/minitest/test_mini_test.rb
      (test_assert_raises_triggered_subclass): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/test/minitest/test_mini_test.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19962)
+++ ChangeLog	(revision 19963)
@@ -1,3 +1,13 @@
+Mon Oct 27 15:38:38 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* test/minitest/test_mini_test.rb
+	  (test_assert_raises_triggered_different): the test failed when a
+	  file path in the backtrace contontains something except [\w\/\.],
+	  e.g. hyphen, Japanese characters or backslash.
+
+	* test/minitest/test_mini_test.rb
+	  (test_assert_raises_triggered_subclass): ditto.
+
 Mon Oct 27 15:32:08 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* test/minitest/test_mini_test.rb: fixed that r19958 made
Index: test/minitest/test_mini_test.rb
===================================================================
--- test/minitest/test_mini_test.rb	(revision 19962)
+++ test/minitest/test_mini_test.rb	(revision 19963)
@@ -521,7 +521,7 @@
 FILE:LINE:in `test_assert_raises_triggered_different'
 ---------------"
 
-    actual = e.message.gsub(/[\w\/\.]+:\d+/, 'FILE:LINE')
+    actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
     actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
 
     assert_equal expected, actual
@@ -553,7 +553,7 @@
 FILE:LINE:in `test_assert_raises_triggered_subclass'
 ---------------"
 
-    actual = e.message.gsub(/[\w\/\.]+:\d+/, 'FILE:LINE')
+    actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
     actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
 
     assert_equal expected, actual

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