minitest-reporters 0.9.0 → 0.10.0

data/README.md

@@ -32,10 +32,6 @@ The following reporters are provided:
     MiniTest::Reporters::RubyMineReporter # => Reporter designed for RubyMine IDE and TeamCity CI server; see below
     MiniTest::Reporters::GuardReporter    # => Integrates with guard-minitest to provide on-screen notifications
 
-## TODO ##
-
-* Add some example images of the reporters.
-
 ## Note on Patches/Pull Requests ##
 
 * Fork the project.

data/lib/minitest/before_test_hook.rb

@@ -0,0 +1,16 @@
+module MiniTest
+  module BeforeTestHook
+    def self.before_test(instance)
+      runner = MiniTest::Unit.runner
+
+      if runner.respond_to?(:before_test)
+        runner.before_test(instance.class, instance.__name__)
+      end
+    end
+
+    def before_setup
+      BeforeTestHook.before_test(self)
+      super
+    end
+  end
+end

data/lib/minitest/reporter.rb

@@ -3,23 +3,23 @@ module MiniTest
     def runner
       Unit.runner
     end
-    
+
     def output
       runner.output
     end
-    
+
     def verbose?
       runner.verbose
     end
-    
+
     def print(*args)
       runner.output.print(*args)
     end
-    
+
     def puts(*args)
       runner.output.puts(*args)
     end
-    
+
     def before_suites(suites, type); end
     def after_suites(suites, type); end
     def before_suite(suite); end

data/lib/minitest/reporter_runner.rb

@@ -0,0 +1,86 @@
+module MiniTest
+  # Runner for MiniTest that supports reporters.
+  #
+  # Based upon Ryan Davis of Seattle.rb's MiniTest (MIT License).
+  #
+  # @see https://github.com/seattlerb/minitest MiniTest
+  class ReporterRunner < Unit
+    attr_accessor :suites_start_time, :test_start_time, :reporters, :test_results
+
+    alias_method :suite_start_time, :start_time
+
+    def initialize
+      super
+      self.reporters = []
+      self.test_results = {}
+    end
+
+    def _run_suites(suites, type)
+      self.suites_start_time = Time.now
+      count_tests!(suites, type)
+      trigger_callback(:before_suites, suites, type)
+      super(suites, type)
+    ensure
+      trigger_callback(:after_suites, suites, type)
+    end
+
+    def _run_suite(suite, type)
+      trigger_callback(:before_suite, suite)
+      super(suite, type)
+    ensure
+      trigger_callback(:after_suite, suite)
+    end
+
+    def before_test(suite, test)
+      self.test_start_time = Time.now
+      trigger_callback(:before_test, suite, test)
+    end
+
+    def record(suite, test, assertions, time, exception)
+      result = case exception
+      when nil then :pass
+      when Skip then :skip
+      when Assertion then :failure
+      else :error
+      end
+
+      test_runner = TestRunner.new(
+        suite,
+        test.to_sym,
+        assertions,
+        time,
+        result,
+        exception
+      )
+
+      test_results[suite] ||= {}
+      test_results[suite][test.to_sym] = test_runner
+      trigger_callback(result, suite, test, test_runner)
+    end
+
+    def puts(*args)
+    end
+
+    def print(*args)
+    end
+
+    def status(io = output)
+    end
+
+    private
+
+    def trigger_callback(callback, *args)
+      reporters.each do |reporter|
+        reporter.public_send(callback, *args)
+      end
+    end
+
+    def count_tests!(suites, type)
+      filter = options[:filter] || '/./'
+      filter = Regexp.new $1 if filter =~ /\/(.*)\//
+      self.test_count = suites.inject(0) do |acc, suite|
+        acc + suite.send("#{type}_methods").grep(filter).length
+      end
+    end
+  end
+end

data/lib/minitest/reporters.rb

@@ -1,10 +1,11 @@
 require "minitest/unit"
 
 module MiniTest
-  autoload :Reporter, "minitest/reporter"
-  autoload :SuiteRunner, "minitest/suite_runner"
-  autoload :TestRunner, "minitest/test_runner"
-  autoload :BacktraceFilter, "minitest/backtrace_filter"
+  require "minitest/reporter"
+  require "minitest/reporter_runner"
+  require "minitest/before_test_hook"
+  require "minitest/test_runner"
+  require "minitest/backtrace_filter"
 
   module Reporters
     require "minitest/reporters/version"
@@ -18,11 +19,22 @@ module MiniTest
     autoload :JUnitReporter, "minitest/reporters/junit_reporter"
 
     def self.use!(console_reporters = ProgressReporter.new, env = ENV)
-      runner = SuiteRunner.new
+      include_hook!
+      runner = ReporterRunner.new
       runner.reporters = choose_reporters(console_reporters, env)
       Unit.runner = runner
     end
 
+    def self.include_hook!
+      if Unit::VERSION >= "3.3.0"
+        Unit::TestCase.send(:include, BeforeTestHook)
+      else
+        Unit::TestCase.send(:define_method, :before_setup) do
+          BeforeTestHook.before_test(self)
+        end
+      end
+    end
+
     def self.choose_reporters(console_reporters, env)
       if env["TM_PID"]
         [RubyMateReporter.new]

data/lib/minitest/reporters/default_reporter.rb

@@ -41,7 +41,7 @@ module MiniTest
       end
 
       def after_suites(suites, type)
-        time = Time.now - runner.start_time
+        time = Time.now - runner.suites_start_time
 
         puts
         puts
@@ -49,7 +49,7 @@ module MiniTest
           [time, runner.test_count / time, runner.assertion_count / time]
 
         i = 0
-        runner.report.each do |suite, tests|
+        runner.test_results.each do |suite, tests|
           tests.each do |test, test_runner|
             message = message_for(test_runner)
             if message
@@ -60,7 +60,6 @@ module MiniTest
         end
 
         puts
-
         puts status
       end
 

data/lib/minitest/reporters/guard_reporter.rb

@@ -11,7 +11,7 @@ module MiniTest
       include Reporter
 
       def after_suites(*args)
-        duration = Time.now - runner.start_time
+        duration = Time.now - runner.suites_start_time
         ::Guard::MinitestNotifier.notify(runner.test_count, runner.assertion_count,
                                          runner.failures, runner.errors,
                                          runner.skips, duration)

data/lib/minitest/reporters/junit_reporter.rb

@@ -15,14 +15,14 @@ module MiniTest
       def initialize(reports_dir = "test/reports", backtrace_filter = BacktraceFilter.default_filter)
         @backtrace_filter = backtrace_filter
         @reports_path = File.join(Dir.getwd, reports_dir)
-        p "Emptying #{@reports_path}"
+        puts "Emptying #{@reports_path}"
         FileUtils.remove_dir(@reports_path) if File.exists?(@reports_path)
         FileUtils.mkdir_p(@reports_path)
       end
 
       def after_suites(suites, type)
-        p "Writing XML reports to #{@reports_path}"
-        runner.report.each do |suite, tests|
+        puts "Writing XML reports to #{@reports_path}"
+        runner.test_results.each do |suite, tests|
           suite_result = analyze_suite(suite, tests)
 
           xml = Builder::XmlMarkup.new(:indent => 2)
@@ -51,7 +51,7 @@ module MiniTest
         e = test_runner.exception
 
         case test_runner.result
-        when :skip 
+        when :skip
           xml.skipped(:type => test)
         when :error
           xml.error(:type => test, :message => xml.trunc!(e.message)) do
@@ -79,7 +79,7 @@ module MiniTest
         end
       end
 
-      
+
       def location(exception)
         last_before_assertion = ''
         exception.backtrace.reverse_each do |s|
@@ -105,7 +105,7 @@ module MiniTest
         while File.exists?(File.join(@reports_path, filename)) # restrict number of tries, to avoid infinite loops
           file_counter += 1
           filename = "TEST-#{suite}-#{file_counter}.xml"
-          p "Too many duplicate files, overwriting earlier report #{filename}" and break if file_counter >= 99
+          puts "Too many duplicate files, overwriting earlier report #{filename}" and break if file_counter >= 99
         end
         File.join(@reports_path, filename)
       end

data/lib/minitest/reporters/progress_reporter.rb

@@ -46,7 +46,7 @@ module MiniTest
         @progress.show({
           :msg => "#{@finished_count}/#{runner.test_count}",
           :done => @finished_count,
-          :total => runner.test_count
+          :total => runner.test_count,
         }, true)
       end
 
@@ -94,7 +94,7 @@ module MiniTest
       def after_suites(suites, type)
         @progress.close
 
-        total_time = Time.now - runner.start_time
+        total_time = Time.now - runner.suites_start_time
 
         wipe
         puts

data/lib/minitest/reporters/ruby_mate_reporter.rb

@@ -41,7 +41,7 @@ module MiniTest
       end
 
       def after_suites(suites, type)
-        total_time = Time.now - runner.start_time
+        total_time = Time.now - runner.suites_start_time
 
         puts
         puts('Finished in %.5fs' % total_time)

data/lib/minitest/reporters/rubymine_reporter.rb

@@ -1,14 +1,5 @@
 # Test results reporter for RubyMine IDE (http://www.jetbrains.com/ruby/) and
 # TeamCity(http://www.jetbrains.com/teamcity/) Continuous Integration Server
-#
-# Usage:
-#     # in test_helper.rb
-#     ...
-#     if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
-#       MiniTest::Unit.runner.reporters << MiniTest::Reporters::RubyMineReporter.new
-#     else
-#       MiniTest::Unit.runner.reporters << MiniTest::Reporters::DefaultReporter.new
-#     end
 
 require "ansi"
 begin
@@ -81,7 +72,7 @@ else
         end
 
         def after_suites(suites, type)
-          total_time = Time.now - runner.start_time
+          total_time = Time.now - runner.suites_start_time
 
           puts('Finished in %.5fs' % total_time)
           print('%d tests, %d assertions, ' % [runner.test_count, runner.assertion_count])

data/lib/minitest/reporters/spec_reporter.rb

@@ -13,8 +13,9 @@ module MiniTest
       include ANSI::Code
 
       TEST_PADDING = 2
+      TEST_SIZE = 63
+      MARK_SIZE = 5
       INFO_PADDING = 8
-      MARK_SIZE    = 5
 
       def initialize(backtrace_filter = BacktraceFilter.default_filter)
         @backtrace_filter = backtrace_filter
@@ -26,7 +27,7 @@ module MiniTest
       end
 
       def after_suites(suites, type)
-        total_time = Time.now - runner.start_time
+        total_time = Time.now - runner.suites_start_time
 
         puts('Finished in %.5fs' % total_time)
         print('%d tests, %d assertions, ' % [runner.test_count, runner.assertion_count])
@@ -43,21 +44,25 @@ module MiniTest
         puts
       end
 
+      def before_test(suite, test)
+        print pad_test(test)
+      end
+
       def pass(suite, test, test_runner)
         print(green { pad_mark('PASS') })
-        print_test_with_time(test)
+        print_time(test)
         puts
       end
 
       def skip(suite, test, test_runner)
         print(yellow { pad_mark('SKIP') })
-        print_test_with_time(test)
+        print_time(test)
         puts
       end
 
       def failure(suite, test, test_runner)
         print(red { pad_mark('FAIL') })
-        print_test_with_time(test)
+        print_time(test)
         puts
         print_info(test_runner.exception)
         puts
@@ -65,7 +70,7 @@ module MiniTest
 
       def error(suite, test, test_runner)
         print(red { pad_mark('ERROR') })
-        print_test_with_time(test)
+        print_time(test)
         puts
         print_info(test_runner.exception)
         puts
@@ -73,9 +78,9 @@ module MiniTest
 
       private
 
-      def print_test_with_time(test)
+      def print_time(test)
         total_time = Time.now - runner.test_start_time
-        print(" %s (%.2fs)" % [test, total_time])
+        print(" (%.2fs)" % total_time)
       end
 
       def print_info(e)
@@ -90,7 +95,11 @@ module MiniTest
       end
 
       def pad_mark(str)
-        pad("%#{MARK_SIZE}s" % str, TEST_PADDING)
+        "%#{MARK_SIZE}s" % str
+      end
+
+      def pad_test(str)
+        pad("%-#{TEST_SIZE}s" % str, TEST_PADDING)
       end
     end
   end

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Reporters
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
   end
 end

data/lib/minitest/test_runner.rb

@@ -1,39 +1,3 @@
 module MiniTest
-  # Runner for individual MiniTest tests.
-  # 
-  # You *should not* create instances of this class directly. Instances of
-  # {SuiteRunner} will create these and send them to the reporters.
-  # 
-  # Based upon Ryan Davis of Seattle.rb's MiniTest (MIT License).
-  # 
-  # @see https://github.com/seattlerb/minitest MiniTest
-  class TestRunner
-    attr_reader :suite, :test, :assertions, :result, :exception, :options
-    
-    def initialize(suite, test)
-      @suite = suite
-      @test = test
-      @assertions = 0
-    end
-    
-    def run
-      suite_instance = suite.new(test)
-      @result, @exception = fix_result(suite_instance.run(self))
-      @assertions = suite_instance._assertions
-    end
-    
-    def puke(suite, test, exception)
-      case exception
-      when Skip then [:skip, exception]
-      when Assertion then [:failure, exception]
-      else [:error, exception]
-      end
-    end
-    
-    private
-    
-    def fix_result(result)
-      result == '.' ? [:pass, nil] : result
-    end
-  end
+  TestRunner = Struct.new(:suite, :test, :assertions, :time, :result, :exception)
 end

data/minitest-reporters.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'minitest-reporters'
 
-  s.add_dependency 'minitest', '>= 2.0', '< 4.0'
+  s.add_dependency 'minitest', '>= 2.12', '< 4.0'
   s.add_dependency 'ansi'
   s.add_dependency 'powerbar'
   s.add_dependency 'builder'
 
-  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'rr'
   s.add_development_dependency 'maruku'
-  s.add_development_dependency 'test_declarative'
   s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")

data/test/minitest/backtrace_filter_test.rb

@@ -8,28 +8,28 @@ module MiniTestReportersTest
       @backtrace = ["foo", "bar", "baz"]
     end
 
-    test "adding filters" do
+    def test_adding_filters
       @filter.add_filter(/foo/)
       assert @filter.filters?("foo")
       refute @filter.filters?("baz")
     end
 
-    test "filter backtrace when first line is filtered" do
+    def test_filter_backtrace_when_first_line_is_filtered
       @filter.add_filter(/foo/)
       assert_equal ["bar", "baz"], @filter.filter(@backtrace)
     end
 
-    test "filter backtrace when middle line is filtered" do
+    def test_filter_backtrace_when_middle_line_is_filtered
       @filter.add_filter(/bar/)
       assert_equal ["foo"], @filter.filter(@backtrace)
     end
 
-    test "filter backtrace when all lines are filtered" do
+    def test_filter_backtrace_when_all_lines_are_filtered
       @filter.add_filter(/./)
       assert_equal ["foo", "bar", "baz"], @filter.filter(@backtrace)
     end
 
-    test "default filter" do
+    def test_default_filter
       assert @default_filter.filters?("lib/minitest")
       assert @default_filter.filters?("lib/minitest/reporters")
       refute @default_filter.filters?("lib/my_gem")

data/test/minitest/reporter_test.rb

@@ -6,28 +6,28 @@ module MiniTestReportersTest
       klass = Class.new do
         include MiniTest::Reporter
       end
-      
+
       @reporter = klass.new
     end
-    
-    test 'callbacks' do
+
+    def test_callbacks
       [
         :before_suites, :after_suite, :before_suite, :after_suite, :before_test,
         :pass, :skip, :failure, :error
       ].each { |method| assert_respond_to @reporter, method }
     end
-    
-    test '#runner' do
+
+    def test_runner
       assert_kind_of MiniTest::Unit, @reporter.runner
     end
-    
-    test '#output' do
+
+    def test_output
       assert_equal MiniTest::Unit.output, @reporter.output
     end
-    
-    test '#verbose?' do
+
+    def test_verbose
       refute @reporter.verbose?
-      
+
       begin
         @reporter.runner.verbose = true
         assert @reporter.verbose?
@@ -35,14 +35,14 @@ module MiniTestReportersTest
         @reporter.runner.verbose = false
       end
     end
-    
-    test '#print' do
-      @reporter.output.expects(:print).with('foo')
+
+    def test_print
+      mock(@reporter.output).print('foo')
       @reporter.print('foo')
     end
-    
-    test '#puts' do
-      @reporter.output.expects(:puts).with('foo')
+
+    def test_puts
+      mock(@reporter.output).puts('foo')
       @reporter.puts('foo')
     end
   end

data/test/minitest/reporters_test.rb

@@ -2,10 +2,10 @@ require 'test_helper'
 
 module MiniTestReportersTest
   class ReportersTest < TestCase
-    test "chooses the Rubymine reporter when necessary" do
+    def test_chooses_the_rubymine_reporter_when_necessary
       # Rubymine reporter complains when RubyMine libs are not available, so
       # stub its #puts method out.
-      MiniTest::Unit.runner.output.stubs(:puts) 
+      stub(MiniTest::Unit.runner.output).puts
 
       reporters = Minitest::Reporters.choose_reporters [], { "RM_INFO" => "x" }
       assert_instance_of MiniTest::Reporters::RubyMineReporter, reporters[0]
@@ -14,12 +14,12 @@ module MiniTestReportersTest
       assert_instance_of MiniTest::Reporters::RubyMineReporter, reporters[0]
     end
 
-    test "chooses the TextMate reporter when necessary" do
+    def test_chooses_the_textmate_reporter_when_necessary
       reporters = Minitest::Reporters.choose_reporters [], {"TM_PID" => "x"}
       assert_instance_of MiniTest::Reporters::RubyMateReporter, reporters[0]
     end
 
-    test "chooses the console reporters when necessary" do
+    def test_chooses_the_console_reporters_when_necessary
       reporters = Minitest::Reporters.choose_reporters [MiniTest::Reporters::SpecReporter.new], {}
       assert_instance_of MiniTest::Reporters::SpecReporter, reporters[0]
     end

data/test/test_helper.rb

@@ -1,20 +1,11 @@
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'mocha'
-require 'test_declarative'
+require 'rr'
 require 'minitest/reporters'
 
 module MiniTestReportersTest
-  require File.expand_path('../support/test_case', __FILE__)
-
-  module Fixtures
-    require File.expand_path('../support/fixtures/test_case_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/empty_test_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/error_test_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/failure_test_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/pass_test_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/skip_test_fixture', __FILE__)
-    require File.expand_path('../support/fixtures/suite_callback_test_fixture', __FILE__)
+  class TestCase < MiniTest::Unit::TestCase
+    include RR::Adapters::MiniTest
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.12'
     - - <
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.12'
     - - <
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -113,22 +113,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test_declarative
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +144,9 @@ files:
 - README.md
 - Rakefile
 - lib/minitest/backtrace_filter.rb
+- lib/minitest/before_test_hook.rb
 - lib/minitest/reporter.rb
+- lib/minitest/reporter_runner.rb
 - lib/minitest/reporters.rb
 - lib/minitest/reporters/default_reporter.rb
 - lib/minitest/reporters/guard_reporter.rb
@@ -170,22 +156,11 @@ files:
 - lib/minitest/reporters/rubymine_reporter.rb
 - lib/minitest/reporters/spec_reporter.rb
 - lib/minitest/reporters/version.rb
-- lib/minitest/suite_runner.rb
 - lib/minitest/test_runner.rb
 - minitest-reporters.gemspec
 - test/minitest/backtrace_filter_test.rb
 - test/minitest/reporter_test.rb
 - test/minitest/reporters_test.rb
-- test/minitest/suite_runner_test.rb
-- test/minitest/test_runner_test.rb
-- test/support/fixtures/empty_test_fixture.rb
-- test/support/fixtures/error_test_fixture.rb
-- test/support/fixtures/failure_test_fixture.rb
-- test/support/fixtures/pass_test_fixture.rb
-- test/support/fixtures/skip_test_fixture.rb
-- test/support/fixtures/suite_callback_test_fixture.rb
-- test/support/fixtures/test_case_fixture.rb
-- test/support/test_case.rb
 - test/test_helper.rb
 homepage: https://github.com/CapnKernul/minitest-reporters
 licenses: []
@@ -201,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2934247906506335852
+      hash: 3874457769361975598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2934247906506335852
+      hash: 3874457769361975598
 requirements: []
 rubyforge_project: minitest-reporters
 rubygems_version: 1.8.24
@@ -221,14 +196,4 @@ test_files:
 - test/minitest/backtrace_filter_test.rb
 - test/minitest/reporter_test.rb
 - test/minitest/reporters_test.rb
-- test/minitest/suite_runner_test.rb
-- test/minitest/test_runner_test.rb
-- test/support/fixtures/empty_test_fixture.rb
-- test/support/fixtures/error_test_fixture.rb
-- test/support/fixtures/failure_test_fixture.rb
-- test/support/fixtures/pass_test_fixture.rb
-- test/support/fixtures/skip_test_fixture.rb
-- test/support/fixtures/suite_callback_test_fixture.rb
-- test/support/fixtures/test_case_fixture.rb
-- test/support/test_case.rb
 - test/test_helper.rb

data/lib/minitest/suite_runner.rb

@@ -1,110 +0,0 @@
-module MiniTest
-  # Runner for MiniTest suites.
-  # 
-  # This is a heavily refactored version of the built-in MiniTest runner. It's
-  # about the same speed, from what I can tell, but is significantly easier to
-  # extend.
-  # 
-  # Based upon Ryan Davis of Seattle.rb's MiniTest (MIT License).
-  # 
-  # @see https://github.com/seattlerb/minitest MiniTest
-  class SuiteRunner < Unit
-    attr_accessor :suite_start_time, :test_start_time, :reporters
-    
-    def initialize
-      self.report = {}
-      self.errors = 0
-      self.failures = 0
-      self.skips = 0
-      self.test_count = 0
-      self.assertion_count = 0
-      self.verbose = false
-      self.reporters = []
-    end
-    
-    def _run_anything(type)
-      self.start_time = Time.now
-      
-      suites = suites_of_type(type)
-      tests = suites.inject({}) do |acc, suite|
-        acc[suite] = filtered_tests(suite, type)
-        acc
-      end
-      
-      self.test_count = tests.inject(0) { |acc, suite| acc + suite[1].length }
-      
-      if test_count > 0
-        trigger(:before_suites, suites, type)
-        
-        fix_sync do
-          suites.each { |suite| _run_suite(suite, tests[suite]) }
-        end
-        
-        trigger(:after_suites, suites, type)
-      end
-    end
-    
-    def _run_suite(suite, tests)
-      unless tests.empty?
-        begin
-          self.suite_start_time = Time.now
-          
-          trigger(:before_suite, suite)
-          suite.startup if suite.respond_to?(:startup)
-          
-          tests.each { |test| _run_test(suite, test) }
-        ensure
-          suite.shutdown if suite.respond_to?(:shutdown)
-          trigger(:after_suite, suite)
-        end
-      end
-    end
-    
-    def _run_test(suite, test)
-      self.test_start_time = Time.now
-      trigger(:before_test, suite, test)
-      
-      test_runner = TestRunner.new(suite, test)
-      test_runner.run
-      add_test_result(suite, test, test_runner)
-      
-      trigger(test_runner.result, suite, test, test_runner)
-    end
-    
-    def trigger(callback, *args)
-      reporters.each { |reporter| reporter.send(callback, *args) }
-    end
-    
-    private
-    
-    def filtered_tests(suite, type)
-      filter = options[:filter] || '/./'
-      filter = Regexp.new($1) if filter =~ /\/(.*)\//
-      suite.send("#{type}_methods").grep(filter)
-    end
-    
-    def suites_of_type(type)
-      TestCase.send("#{type}_suites")
-    end
-    
-    def add_test_result(suite, test, test_runner)
-      self.report[suite] ||= {}
-      self.report[suite][test.to_sym] = test_runner
-      
-      self.assertion_count += test_runner.assertions
-      
-      case test_runner.result
-      when :skip then self.skips += 1
-      when :failure then self.failures += 1
-      when :error then self.errors += 1
-      end
-    end
-    
-    def fix_sync
-      sync = output.respond_to?(:'sync=') # stupid emacs
-      old_sync, output.sync = output.sync, true if sync
-      yield
-      output.sync = old_sync if sync
-    end
-  end
-end

data/test/minitest/suite_runner_test.rb

@@ -1,164 +0,0 @@
-require 'test_helper'
-
-module MiniTestReportersTest
-  class SuiteRunnerTest < TestCase
-    def setup
-      @runner = MiniTest::SuiteRunner.new
-      @reporter = add_reporter
-    end
-    
-    test '#report' do
-      assert_equal({}, @runner.report)
-    end
-    
-    test '#reporters' do
-      assert_equal [@reporter], @runner.reporters
-      
-      reporter2 = add_reporter
-      assert_equal [@reporter, reporter2], @runner.reporters
-    end
-    
-    test '#_run_anything with no suites' do
-      stub_suites([])
-      
-      @reporter.expects(:before_suites).never
-      @reporter.expects(:after_suites).never
-      
-      @runner._run_anything(:test)
-      
-      assert_equal 0, @runner.test_count
-      assert_equal 0, @runner.assertion_count
-      assert_instance_of Time, @runner.start_time
-      assert_equal({}, @runner.report)
-    end
-    
-    test '#_run_anything with suites' do
-      suites = [Fixtures::PassTestFixture, Fixtures::SkipTestFixture]
-      stub_suites(suites)
-      
-      @reporter.expects(:before_suites).with(suites, :test)
-      @reporter.expects(:after_suites).with(suites, :test)
-      
-      @runner._run_anything(:test)
-      
-      assert_equal 3, @runner.test_count
-      assert_equal 3, @runner.assertion_count
-      assert_instance_of Time, @runner.start_time
-      assert_equal :pass, @runner.report[Fixtures::PassTestFixture][:test_pass].result
-      assert_equal :pass, @runner.report[Fixtures::PassTestFixture][:test_foo].result
-      assert_equal :skip, @runner.report[Fixtures::SkipTestFixture][:test_skip].result
-    end
-    
-    test '#_run_anything with a filter' do
-      @runner.options[:filter] = '/foo/'
-      stub_suites([Fixtures::PassTestFixture])
-      
-      @runner._run_anything(:test)
-      assert_equal 2, @runner.assertion_count
-    end
-    
-    test '#_run_suite without tests' do
-      @reporter.expects(:before_suite).never
-      @reporter.expects(:after_suite).never
-      
-      @runner._run_suite(Fixtures::EmptyTestFixture, [])
-    end
-    
-    test '#_run_suite with tests' do
-      @reporter.expects(:before_suite).with(Fixtures::PassTestFixture)
-      @reporter.expects(:after_suite).with(Fixtures::PassTestFixture)
-      
-      @runner._run_suite(Fixtures::PassTestFixture, [:test_pass, :test_foo])
-      
-      assert_equal 3, @runner.assertion_count
-      assert_instance_of Time, @runner.suite_start_time
-    end
-    
-    test '#_run_suite with a suite .startup and .shutdown' do
-      suite = Fixtures::SuiteCallbackTestFixture
-      suite.expects(:startup)
-      suite.expects(:shutdown)
-      @runner._run_suite(suite, [:test_foo])
-    end
-    
-    test '#_run_test with a passing test' do
-      suite = Fixtures::PassTestFixture
-      test = :test_pass
-            
-      @reporter.expects(:before_test).with(suite, test)
-      @reporter.expects(:pass).with(suite, test, instance_of(MiniTest::TestRunner))
-      
-      @runner._run_test(suite, test)
-      
-      assert_equal 1, @runner.assertion_count
-      assert_instance_of Time, @runner.test_start_time
-      assert_equal :pass, @runner.report[suite][test].result
-    end
-    
-    test '#_run_test with a skipped test' do
-      suite = Fixtures::SkipTestFixture
-      test = :test_skip
-            
-      @reporter.expects(:before_test).with(suite, test)
-      @reporter.expects(:skip).with(suite, test, instance_of(MiniTest::TestRunner))
-      
-      @runner._run_test(suite, test)
-      
-      assert_equal 0, @runner.assertion_count
-      assert_instance_of Time, @runner.test_start_time
-      assert_equal :skip, @runner.report[suite][test].result
-    end
-    
-    test '#_run_test with a failing test' do
-      suite = Fixtures::FailureTestFixture
-      test = :test_failure
-            
-      @reporter.expects(:before_test).with(suite, test)
-      @reporter.expects(:failure).with(suite, test, instance_of(MiniTest::TestRunner))
-      
-      @runner._run_test(suite, test)
-      
-      assert_equal 0, @runner.assertion_count
-      assert_instance_of Time, @runner.test_start_time
-      assert_equal :failure, @runner.report[suite][test].result
-    end
-    
-    test '#_run_test with an error test' do
-      suite = Fixtures::ErrorTestFixture
-      test = :test_error
-      
-      @reporter.expects(:before_test).with(suite, test)
-      @reporter.expects(:error).with(suite, test, instance_of(MiniTest::TestRunner))
-      
-      @runner._run_test(suite, test)
-      
-      assert_equal 0, @runner.assertion_count
-      assert_instance_of Time, @runner.test_start_time
-      assert_equal :error, @runner.report[suite][test].result
-    end
-    
-    test '#trigger' do
-      reporter2 = add_reporter
-      @reporter.expects(:before_suite).with(Fixtures::PassTestFixture)
-      reporter2.expects(:before_suite).with(Fixtures::PassTestFixture)
-      
-      @runner.trigger(:before_suite, Fixtures::PassTestFixture)
-    end
-    
-    private
-    
-    def add_reporter
-      klass = Class.new do
-        include MiniTest::Reporter
-      end
-      
-      reporter = klass.new
-      @runner.reporters << reporter
-      reporter
-    end
-    
-    def stub_suites(suites)
-      MiniTest::Unit::TestCase.stubs(:test_suites).returns(suites)
-    end
-  end
-end

data/test/minitest/test_runner_test.rb

@@ -1,91 +0,0 @@
-require 'test_helper'
-
-module MiniTestReportersTest
-  class TestRunnerTest < TestCase
-    def setup
-      @suite = stub
-      @test = :test_foo
-      @runner = MiniTest::TestRunner.new(@suite, @test)
-    end
-    
-    test '#suite' do
-      assert_equal @suite, @runner.suite
-    end
-    
-    test '#test' do
-      assert_equal @test, @runner.test
-    end
-    
-    test '#run with a passing test' do
-      suite_instance = stub(:_assertions => 3)
-      suite_instance.expects(:run).with(@runner).returns('.')
-      @suite.stubs(:new).with(@test).returns(suite_instance)
-      
-      @runner.run
-      
-      assert_equal :pass, @runner.result
-      assert_nil @runner.exception
-      assert_equal 3, @runner.assertions
-    end
-    
-    test '#run with an skipped test' do
-      error = stub
-      suite_instance = stub(:_assertions => 3)
-      suite_instance.expects(:run).with(@runner).returns([:skip, error])
-      @suite.stubs(:new).with(@test).returns(suite_instance)
-      
-      @runner.run
-      
-      assert_equal :skip, @runner.result
-      assert_equal error, @runner.exception
-      assert_equal 3, @runner.assertions
-    end
-    
-    test '#run with a failing test' do
-      error = stub
-      suite_instance = stub(:_assertions => 3)
-      suite_instance.expects(:run).with(@runner).returns([:failure, error])
-      @suite.stubs(:new).with(@test).returns(suite_instance)
-      
-      @runner.run
-      
-      assert_equal :failure, @runner.result
-      assert_equal error, @runner.exception
-      assert_equal 3, @runner.assertions
-    end
-    
-    test '#run with an errored test' do
-      error = stub
-      suite_instance = stub(:_assertions => 3)
-      suite_instance.expects(:run).with(@runner).returns([:error, error])
-      @suite.stubs(:new).with(@test).returns(suite_instance)
-      
-      @runner.run
-      
-      assert_equal :error, @runner.result
-      assert_equal error, @runner.exception
-      assert_equal 3, @runner.assertions
-    end
-    
-    test '#puke with a skip' do
-      skip = MiniTest::Skip.new
-      result = @runner.puke(@suite, @test, skip)
-      
-      assert_equal [:skip, skip], result
-    end
-    
-    test '#puke with a failure' do
-      failure = MiniTest::Assertion.new
-      result = @runner.puke(@suite, @test, failure)
-      
-      assert_equal [:failure, failure], result
-    end
-    
-    test '#puke with an error' do
-      error = RuntimeError.new
-      result = @runner.puke(@suite, @test, error)
-      
-      assert_equal [:error, error], result
-    end
-  end
-end

data/test/support/fixtures/empty_test_fixture.rb

@@ -1,5 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class EmptyTestFixture < TestCaseFixture; end
-  end
-end

data/test/support/fixtures/error_test_fixture.rb

@@ -1,9 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class ErrorTestFixture < TestCaseFixture
-      def test_error
-        raise RuntimeError.new
-      end
-    end
-  end
-end

data/test/support/fixtures/failure_test_fixture.rb

@@ -1,9 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class FailureTestFixture < TestCaseFixture
-      def test_failure
-        flunk
-      end
-    end
-  end
-end

data/test/support/fixtures/pass_test_fixture.rb

@@ -1,14 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class PassTestFixture < TestCaseFixture
-      def test_pass
-        assert true
-      end
-      
-      def test_foo
-        assert true
-        assert true
-      end
-    end
-  end
-end

data/test/support/fixtures/skip_test_fixture.rb

@@ -1,9 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class SkipTestFixture < TestCaseFixture
-      def test_skip
-        skip
-      end
-    end
-  end
-end

data/test/support/fixtures/suite_callback_test_fixture.rb

@@ -1,9 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class SuiteCallbackTestFixture < TestCaseFixture
-      def self.startup; end
-      def self.shutdown; end
-      def test_foo; end
-    end
-  end
-end

data/test/support/fixtures/test_case_fixture.rb

@@ -1,38 +0,0 @@
-module MiniTestReportersTest
-  module Fixtures
-    class TestCaseFixture
-      attr_writer :_assertions
-      
-      def self.test_methods
-        public_instance_methods(true).grep(/^test/)
-      end
-      
-      def initialize(test)
-        @test = test
-      end
-      
-      def run(runner)
-        send(@test)
-        '.'
-      rescue MiniTest::Assertion, RuntimeError => e
-        runner.puke(self, @test, e)
-      end
-      
-      def skip
-        raise MiniTest::Skip.new
-      end
-      
-      def flunk
-        raise MiniTest::Assertion.new
-      end
-      
-      def assert(value)
-        self._assertions += 1
-      end
-      
-      def _assertions
-        @_assertions ||= 0
-      end
-    end
-  end
-end

data/test/support/test_case.rb

@@ -1,4 +0,0 @@
-module MiniTestReportersTest
-  class TestCase < MiniTest::Unit::TestCase
-  end
-end