minitest-reporters 0.14.2 → 0.14.3

data/Gemfile

@@ -1,2 +1,2 @@
 source :rubygems
-gemspec
+gemspec

data/lib/minitest/around_test_hooks.rb

@@ -0,0 +1,21 @@
+module MiniTest
+  module AroundTestHooks
+    def self.before_test(instance)
+      MiniTest::Unit.runner.before_test(instance.class, instance.__name__)
+    end
+
+    def self.after_test(instance)
+      MiniTest::Unit.runner.after_test(instance.class, instance.__name__)
+    end
+
+    def before_setup
+      AroundTestHooks.before_test(self)
+      super
+    end
+
+    def after_teardown
+      super
+      AroundTestHooks.after_test(self)
+    end
+  end
+end

data/lib/minitest/reporter_runner.rb

@@ -5,18 +5,25 @@ module MiniTest
   #
   # @see https://github.com/seattlerb/minitest MiniTest
   class ReporterRunner < Unit
-    attr_accessor :suites_start_time, :test_start_time, :reporters, :test_results
+    extend Forwardable
 
-    alias_method :suite_start_time, :start_time
+    attr_accessor :reporters
+    attr_reader :test_results
+    attr_reader :suites_start_time
+    attr_reader :suite_start_time
+    attr_reader :test_start_time
+
+    def_delegator :@test_recorder, :assertion_count
 
     def initialize
       super
       self.reporters = []
-      self.test_results = {}
+      @test_results = {}
+      @test_recorder = TestRecorder.new
     end
 
     def _run_suites(suites, type)
-      self.suites_start_time = Time.now
+      @suites_start_time = Time.now
       count_tests!(suites, type)
       trigger_callback(:before_suites, suites, type)
       super(suites, type)
@@ -25,63 +32,54 @@ module MiniTest
     end
 
     def _run_suite(suite, type)
+      @suite_start_time = Time.now
       trigger_callback(:before_suite, suite)
-      self.start_time = Time.now
       super(suite, type)
     ensure
       trigger_callback(:after_suite, suite)
     end
 
     def before_test(suite, test)
-      self.test_start_time = Time.now
+      @test_start_time = Time.now
       trigger_callback(:before_test, suite, test)
     end
 
     def record(suite, test, assertions, time, exception)
-      self.assertion_count += assertions
-
-      result = case exception
-      when nil then :pass
-      when Skip then :skip
-      when Assertion then :failure
-      else :error
-      end
+      runner = TestRunner.new(suite,
+                              test.to_sym,
+                              assertions,
+                              time,
+                              exception)
 
-      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)
+      @test_results[suite] ||= {}
+      @test_results[suite][test.to_sym] = runner
+      @test_recorder.record(runner)
     end
 
-    def puts(*args)
-    end
+    def after_test(suite, test)
+      runners = @test_recorder[suite, test.to_sym]
 
-    def print(*args)
+      runners.each do |runner|
+        trigger_callback(runner.result, suite, test.to_sym, runner)
+      end
     end
 
-    def status(io = output)
-    end
+    # Stub out the three IO methods used by the built-in reporter.
+    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
+      reporters.each { |r| r.public_send(callback, *args) }
     end
 
     def count_tests!(suites, type)
       filter = options[:filter] || '/./'
       filter = Regexp.new $1 if filter =~ /\/(.*)\//
-      self.test_count = suites.inject(0) do |acc, suite|
+
+      @test_count = suites.inject(0) do |acc, suite|
         acc + suite.send("#{type}_methods").grep(filter).length
       end
     end

data/lib/minitest/reporters/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Reporters
-    VERSION = "0.14.2"
+    VERSION = "0.14.3"
   end
 end

data/lib/minitest/reporters.rb

@@ -4,8 +4,9 @@ module MiniTest
   require "minitest/relative_position"
   require "minitest/reporter"
   require "minitest/reporter_runner"
-  require "minitest/before_test_hook"
+  require "minitest/around_test_hooks"
   require "minitest/test_runner"
+  require "minitest/test_recorder"
   require "minitest/extensible_backtrace_filter"
 
   module Reporters
@@ -34,10 +35,14 @@ module MiniTest
 
     def self.use_before_test_hook!
       if Unit::VERSION >= "3.3.0"
-        Unit::TestCase.send(:include, BeforeTestHook)
+        Unit::TestCase.send(:include, AroundTestHooks)
       else
         Unit::TestCase.send(:define_method, :before_setup) do
-          BeforeTestHook.before_test(self)
+          AroundTestHooks.before_test(self)
+        end
+
+        Unit::TestCase.send(:define_method, :after_teardown) do
+          AroundTestHooks.after_test(self)
         end
       end
     end

data/lib/minitest/test_recorder.rb

@@ -0,0 +1,22 @@
+module MiniTest
+  class TestRecorder
+    def initialize
+      @records = {}
+    end
+
+    def [](suite, test)
+      name = [suite, test]
+      @records[name]
+    end
+
+    def record(runner)
+      name = [runner.suite, runner.test]
+      @records[name] ||= []
+      @records[name] << runner
+    end
+
+    def assertion_count
+      @records.inject(0) { |acc, r| acc + r.last.last.assertions }
+    end
+  end
+end

data/lib/minitest/test_runner.rb

@@ -1,3 +1,12 @@
 module MiniTest
-  TestRunner = Struct.new(:suite, :test, :assertions, :time, :result, :exception)
+  class TestRunner < Struct.new(:suite, :test, :assertions, :time, :exception)
+    def result
+      case exception
+      when nil then :pass
+      when Skip then :skip
+      when Assertion then :failure
+      else :error
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -13,7 +13,7 @@ end
 
 if ENV["REPORTER"]
   reporter_klass = MiniTest::Reporters.const_get(ENV["REPORTER"])
-  MiniTest::Reporters.use! [reporter_klass.new]
+  MiniTest::Reporters.use!(reporter_klass.new)
 else
   MiniTest::Reporters.use!(MiniTest::Reporters::DefaultReporter.new)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -127,7 +127,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/minitest/before_test_hook.rb
+- lib/minitest/around_test_hooks.rb
 - lib/minitest/extensible_backtrace_filter.rb
 - lib/minitest/relative_position.rb
 - lib/minitest/reporter.rb
@@ -141,6 +141,7 @@ files:
 - lib/minitest/reporters/rubymine_reporter.rb
 - lib/minitest/reporters/spec_reporter.rb
 - lib/minitest/reporters/version.rb
+- lib/minitest/test_recorder.rb
 - lib/minitest/test_runner.rb
 - minitest-reporters.gemspec
 - test/gallery/bad_test.rb
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1266049475304988820
+      hash: 3603087580033239175
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1266049475304988820
+      hash: 3603087580033239175
 requirements: []
 rubyforge_project: minitest-reporters
 rubygems_version: 1.8.24

data/lib/minitest/before_test_hook.rb

@@ -1,16 +0,0 @@
-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