From 17dde49326abb035ef14cd4be8b33337c6248e82 Mon Sep 17 00:00:00 2001
From: ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Aug 2012 00:39:57 +0000
Subject: Imported minitest 3.3.0 (r7676)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/minitest/metametameta.rb | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'test/minitest/metametameta.rb')

diff --git a/test/minitest/metametameta.rb b/test/minitest/metametameta.rb
index 35a27d51b6..a4f7dfa1e6 100644
--- a/test/minitest/metametameta.rb
+++ b/test/minitest/metametameta.rb
@@ -9,25 +9,29 @@ require 'tempfile'
 require 'stringio'
 require 'minitest/autorun'
 
+class MiniTest::Unit::TestCase
+  def clean s
+    s.gsub(/^ {6}/, '')
+  end
+end
+
 class MetaMetaMetaTestCase < MiniTest::Unit::TestCase
-  def assert_report expected = nil
-    expected ||= <<-EOM.gsub(/^ {6}/, '')
-      Run options: --seed 42
+  def assert_report expected, flags = %w[--seed 42]
+    header = clean <<-EOM
+      Run options: #{flags.map { |s| s =~ /\|/ ? s.inspect : s }.join " "}
 
       # Running tests:
 
-      .
-
-      Finished tests in 0.00
-
-      1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
+    @tu.run flags
+
     output = @output.string.dup
     output.sub!(/Finished tests in .*/, "Finished tests in 0.00")
     output.sub!(/Loaded suite .*/, 'Loaded suite blah')
 
     output.gsub!(/ = \d+.\d\d s = /, ' = 0.00 s = ')
+    output.gsub!(/0x[A-Fa-f0-9]+/, '0xXXX')
 
     if windows? then
       output.gsub!(/\[(?:[A-Za-z]:)?[^\]:]+:\d+\]/, '[FILE:LINE]')
@@ -37,7 +41,7 @@ class MetaMetaMetaTestCase < MiniTest::Unit::TestCase
       output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in')
     end
 
-    assert_equal(expected, output)
+    assert_equal header + expected, output
   end
 
   def setup
-- 
cgit v1.2.3