Imported minitest 3.0.0 (r7435) w/ fixes for rubygems. 10955 tests, 2253343 assertions, 1 failures, 1 errors, 28 skips minus drb tests on x86_64-darwin11.3.0 and reviewed by drbrain

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 12 deletions

diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb
index 1707810a4f..e13890f32f 100644
--- a/test/minitest/test_minitest_unit.rb
+++ b/test/minitest/test_minitest_unit.rb
@@ -6,7 +6,7 @@
 ######################################################################
 
 require 'pathname'
-require File.expand_path('../metametameta', __FILE__)
+require 'test/minitest/metametameta'
 
 module MyModule; end
 class AnError < StandardError; include MyModule; end
@@ -706,13 +706,16 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
 
   def test_assert_block
     exp = ["NOTE: MiniTest::Unit::TestCase#assert_block is deprecated,",
-           "use assert. It will be removed on or after 2012-06-01.\n"].join " "
+           "use assert. It will be removed on or after 2012-06-01."].join " "
 
-    assert_output "", exp do
+    out, err = capture_io do
       @tc.assert_block do
         true
       end
     end
+
+    assert_equal "", out
+    assert_match exp, err
   end
 
   def test_assert_block_triggered
@@ -952,15 +955,6 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     @tc.assert_match "blah", obj
   end
 
-  def test_assert_match_matchee_match
-    @assertion_count = 2
-
-    obj = Object.new
-    def obj.=~(o); true end
-
-    @tc.assert_match "blah", obj
-  end
-
   def test_assert_match_object_triggered
     @assertion_count = 2