minitest 2.0.2 → 2.1.0

data/History.txt

@@ -1,3 +1,19 @@
+=== 2.1.0 / 2011-04-11
+
+* 5 minor enhancements:
+
+  * Added MiniTest::Spec.register_spec_type(matcher, klass) and spec_type(desc)
+  * Added ability for specs to share code via subclassing of Spec. (metaskills)
+  * Clarified (or tried to) bench_performance_linear's use of threshold.
+  * MiniTest::Unit.runner=(runner) provides an easy way of creating custom test runners for specialized needs. (justinweiss)
+  * Reverse order of inheritance in teardowns of specs. (deepfryed)
+
+* 3 bug fixes:
+
+  * FINALLY fixed problems of inheriting specs in describe/it/describe scenario. (MGPalmer)
+  * Fixed a new warning in 1.9.3.
+  * Fixed assert_block's message handling. (nobu)
+
 === 2.0.2 / 2010-12-24
 
 * 1 minor enhancement:

data/README.txt

@@ -54,7 +54,7 @@ Given that you'd like to test the following class:
       "OHAI!"
     end
 
-    def does_it_blend?
+    def will_it_blend?
       "YES!"
     end
   end
@@ -72,8 +72,8 @@ Given that you'd like to test the following class:
       assert_equal "OHAI!", @meme.i_can_has_cheezburger?
     end
 
-    def test_that_it_doesnt_not_blend
-      refute_match /^no/i, @meme.does_it_blend?
+    def test_that_it_will_not_blend
+      refute_match /^no/i, @meme.will_it_blend?
     end
   end
 
@@ -94,7 +94,7 @@ Given that you'd like to test the following class:
 
     describe "when asked about blending possibilities" do
       it "won't say no" do
-        @meme.does_it_blend?.wont_match /^no/i
+        @meme.will_it_blend?.wont_match /^no/i
       end
     end
   end
@@ -166,14 +166,66 @@ Output is tab-delimited to make it easy to paste into a spreadsheet.
     describe "#ask" do
       describe "when passed an unpunctuated question" do
         it "should invoke the appropriate predicate method on the meme" do
-          @meme.expect :does_it_blend?, :return_value
-          @meme_asker.ask "does it blend"
+          @meme.expect :will_it_blend?, :return_value
+          @meme_asker.ask "will it blend"
           @meme.verify
         end
       end
     end
   end
 
+=== Customizable Test Runner Types:
+
+MiniTest::Unit.runner=(runner) provides an easy way of creating custom
+test runners for specialized needs. Justin Weiss provides the
+following real-world example to create an alternative to regular
+fixture loading:
+
+  class MiniTestWithHooks::Unit < MiniTest::Unit
+    def before_suites
+    end
+
+    def after_suites
+    end
+
+    def _run_suites(suites, type)
+      begin
+        before_suites
+        super(suites, type)
+      ensure
+        after_suites
+      end
+    end
+
+    def _run_suite(suite, type)
+      begin
+        suite.before_suite
+        super(suite, type)
+      ensure
+        suite.after_suite
+      end
+    end
+  end
+
+  module MiniTestWithTransactions
+    class Unit < MiniTestWithHooks::Unit
+      include TestSetupHelper
+
+      def before_suites
+        super
+        setup_nested_transactions
+        # load any data we want available for all tests
+      end
+
+      def after_suites
+        teardown_nested_transactions
+        super
+      end
+    end
+  end
+
+  MiniTest::Unit.runner = MiniTestWithTransactions::Unit.new
+
 == REQUIREMENTS:
 
 * Ruby 1.8, maybe even 1.6 or lower. No magic is involved.

data/lib/minitest/benchmark.rb

@@ -105,10 +105,16 @@ class MiniTest::Unit
 
     ##
     # Runs the given +work+ and asserts that the times gathered fit to
-    # match a constant rate (eg, linear slope == 0) within a given error
-    # +threshold+.
+    # match a constant rate (eg, linear slope == 0) within a given
+    # +threshold+. Note: because we're testing for a slope of 0, R^2
+    # is not a good determining factor for the fit, so the threshold
+    # is applied against the slope itself. As such, you probably want
+    # to tighten it from the default.
     #
-    # Fit is calculated by #fit_constant.
+    # See http://www.graphpad.com/curvefit/goodness_of_fit.htm for
+    # more details.
+    #
+    # Fit is calculated by #fit_linear.
     #
     # Ranges are specified by ::bench_range.
     #
@@ -322,7 +328,7 @@ class MiniTest::Spec
   #     end
   #   end
 
-  def self.bench_performance_linear name, threshold = 0.9, &work
+  def self.bench_performance_linear name, threshold = 0.99, &work
     bench name do
       assert_performance_linear threshold, &work
     end

data/lib/minitest/spec.rb

@@ -55,17 +55,41 @@ module Kernel
   #
   # TODO: find good tutorial url.
   #
-  # Defines a test class subclassing from either
-  # MiniTest::Unit::TestCase or from the surrounding describe's class.
-
-  def describe desc, &block
+  # Defines a test class subclassing from either MiniTest::Spec or
+  # from the surrounding describe's class. The surrounding class may
+  # subclass MiniTest::Spec manually in order to easily share code:
+  #
+  #     class MySpec < MiniTest::Spec
+  #       # ... shared code ...
+  #     end
+  #
+  #     class TestStuff < MySpec
+  #       it "does stuff" do
+  #         # shared code available here
+  #       end
+  #       describe "inner stuff" do
+  #         it "still does stuff" do
+  #           # ...and here
+  #         end
+  #       end
+  #     end
+
+  def describe desc, &block # :doc:
     stack = MiniTest::Spec.describe_stack
     name  = [stack.last, desc].compact.join("::")
-    cls   = Class.new(stack.last || MiniTest::Spec)
+    sclas = stack.last || if Class === self && self < MiniTest::Spec then
+                            self
+                          else
+                            MiniTest::Spec.spec_type desc
+                          end
+    cls   = Class.new sclas
+
+    sclas.children << cls unless cls == MiniTest::Spec
 
     # :stopdoc:
     # omg this sucks
     (class << cls; self; end).send(:define_method, :to_s) { name }
+    (class << cls; self; end).send(:define_method, :desc) { desc }
     # :startdoc:
 
     cls.nuke_test_methods!
@@ -78,21 +102,40 @@ module Kernel
   private :describe
 end
 
-class Module
-  def classes type = Object # :nodoc:
-    constants.map { |n| const_get n }.find_all { |c|
-      c.class == Class and type > c
-    } - [self]
-  end
-end
-
 ##
 # MiniTest::Spec -- The faster, better, less-magical spec framework!
 #
 # For a list of expectations, see Object.
 
-
 class MiniTest::Spec < MiniTest::Unit::TestCase
+  ##
+  # Contains pairs of matchers and Spec classes to be used to
+  # calculate the superclass of a top-level describe. This allows for
+  # automatically customizable spec types.
+  #
+  # See: register_spec_type and spec_type
+
+  TYPES = [[//, MiniTest::Spec]]
+
+  ##
+  # Register a new type of spec that matches the spec's description. Eg:
+  #
+  #     register_spec_plugin(/Controller$/, MiniTest::Spec::Rails)
+
+  def self.register_spec_type matcher, klass
+    TYPES.unshift [matcher, klass]
+  end
+
+  ##
+  # Figure out the spec class to use based on a spec's description. Eg:
+  #
+  #     spec_type("BlahController") # => MiniTest::Spec::Rails
+
+  def self.spec_type desc
+    desc = desc.to_s
+    TYPES.find { |re, klass| re === desc }.last
+  end
+
   @@describe_stack = []
   def self.describe_stack # :nodoc:
     @@describe_stack
@@ -102,6 +145,10 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     @@current_spec
   end
 
+  def self.children
+    @children ||= []
+  end
+
   def initialize name # :nodoc:
     super
     @@current_spec = self
@@ -113,12 +160,22 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
     end
   end
 
+  ##
+  # Spec users want setup/teardown to be inherited and NOTHING ELSE.
+  # It is almost like method reuse is lost on them.
+
   def self.define_inheritable_method name, &block # :nodoc:
+    # regular super() warns
     super_method = self.superclass.instance_method name
 
+    teardown     = name.to_s == "teardown"
+    super_before = super_method && ! teardown
+    super_after  = super_method && teardown
+
     define_method name do
-      super_method.bind(self).call if super_method # regular super() warns
+      super_method.bind(self).call if super_before
       instance_eval(&block)
+      super_method.bind(self).call if super_after
     end
   end
 
@@ -165,8 +222,8 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
 
     define_method name, &block
 
-    classes(MiniTest::Spec).each do |mod|
-      mod.send :undef_method, name if mod.respond_to? name
+    self.children.each do |mod|
+      mod.send :undef_method, name if mod.public_method_defined? name
     end
   end
 end

data/lib/minitest/unit.rb

@@ -94,7 +94,8 @@ module MiniTest
     # Fails unless the block returns a true value.
 
     def assert_block msg = nil
-      assert yield, "Expected block to return true value."
+      msg = message(msg) { "Expected block to return true value" }
+      assert yield, msg
     end
 
     ##
@@ -174,7 +175,7 @@ module MiniTest
     def assert_match exp, act, msg = nil
       msg = message(msg) { "Expected #{mu_pp(exp)} to match #{mu_pp(act)}" }
       assert_respond_to act, :"=~"
-      exp = /#{Regexp.escape exp}/ if String === exp && String === act
+      exp = Regexp.new Regexp.escape exp if String === exp and String === act
       assert exp =~ act, msg
     end
 
@@ -218,8 +219,8 @@ module MiniTest
     # Fails unless the block raises one of +exp+
 
     def assert_raises *exp
-      msg = String === exp.last ? exp.pop : nil
-      msg = msg.to_s + "\n" if msg
+      msg = "#{exp.pop}\n" if String === exp.last
+
       should_raise = false
       begin
         yield
@@ -339,7 +340,14 @@ module MiniTest
     # Returns details for exception +e+
 
     def exception_details e, msg
-      "#{msg}\nClass: <#{e.class}>\nMessage: <#{e.message.inspect}>\n---Backtrace---\n#{MiniTest::filter_backtrace(e.backtrace).join("\n")}\n---------------"
+      [
+       "#{msg}",
+       "Class: <#{e.class}>",
+       "Message: <#{e.message.inspect}>",
+       "---Backtrace---",
+       "#{MiniTest::filter_backtrace(e.backtrace).join("\n")}",
+       "---------------",
+      ].join "\n"
     end
 
     ##
@@ -355,14 +363,8 @@ module MiniTest
 
     def message msg = nil, &default
       proc {
-        if msg then
-          msg = msg.to_s unless String === msg
-          msg += '.' unless msg.empty?
-          msg += "\n#{default.call}."
-          msg.strip
-        else
-          "#{default.call}."
-        end
+        custom_message = "#{msg}.\n" unless msg.nil? or msg.to_s.empty?
+        "#{custom_message}#{default.call}."
       }
     end
 
@@ -514,7 +516,7 @@ module MiniTest
   end
 
   class Unit
-    VERSION = "2.0.2" # :nodoc:
+    VERSION = "2.1.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -585,6 +587,23 @@ module MiniTest
       @@out = stream
     end
 
+    ##
+    # Tells MiniTest::Unit to delegate to +runner+, an instance of a
+    # MiniTest::Unit subclass, when MiniTest::Unit#run is called.
+
+    def self.runner= runner
+      @@runner = runner
+    end
+
+    ##
+    # Returns the MiniTest::Unit subclass instance that will be used
+    # to run the tests. A MiniTest::Unit instance is the default
+    # runner.
+
+    def self.runner
+      @@runner ||= self.new
+    end
+
     ##
     # Return all plugins' run methods (methods that start with "run_").
 
@@ -622,8 +641,8 @@ module MiniTest
 
       results = _run_suites suites, type
 
-      @test_count      = results.inject(0) { |sum, (tc, ac)| sum + tc }
-      @assertion_count = results.inject(0) { |sum, (tc, ac)| sum + ac }
+      @test_count      = results.inject(0) { |sum, (tc, _)| sum + tc }
+      @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
 
       output.sync = old_sync if sync
 
@@ -754,9 +773,16 @@ module MiniTest
     end
 
     ##
-    # Top level driver, controls all output and filtering.
+    # Begins the full test run. Delegates to +runner+'s #_run method.
 
     def run args = []
+      self.class.runner._run(args)
+    end
+
+    ##
+    # Top level driver, controls all output and filtering.
+
+    def _run args = []
       self.options = process_args args
 
       puts "Run options: #{help}"

data/test/test_minitest_benchmark.rb

@@ -44,6 +44,21 @@ class TestMiniTestBenchmark < MiniTest::Unit::TestCase
     assert_fit :exponential, x, y, 0.95, 13.81148, -0.1820
   end
 
+  def test_fit_constant_clean
+    x = (1..5).to_a
+    y = [5.0, 5.0, 5.0, 5.0, 5.0]
+
+    assert_fit :linear, x, y, nil, 5.0, 0
+  end
+
+  def test_fit_constant_noisy
+    x = (1..5).to_a
+    y = [1.0, 1.2, 1.0, 0.8, 1.0]
+
+    # verified in numbers and R
+    assert_fit :linear, x, y, nil, 1.12, -0.04
+  end
+
   def test_fit_linear_clean
     # y = m * x + b where m = 2.2, b = 3.1
     x = (1..5).to_a
@@ -90,7 +105,7 @@ class TestMiniTestBenchmark < MiniTest::Unit::TestCase
   def assert_fit msg, x, y, fit, exp_a, exp_b
     a, b, rr = send "fit_#{msg}", x, y
 
-    assert_operator rr, :>=, fit
+    assert_operator rr, :>=, fit if fit
     assert_in_delta exp_a, a
     assert_in_delta exp_b, b
   end

data/test/test_minitest_spec.rb

@@ -1,4 +1,5 @@
 require 'minitest/spec'
+require 'stringio'
 
 MiniTest::Unit.autorun
 
@@ -196,34 +197,112 @@ describe MiniTest::Spec do
 end
 
 class TestMeta < MiniTest::Unit::TestCase
-  def test_structure
+  def test_setup
+    srand 42
+    MiniTest::Unit::TestCase.reset
+  end
+
+  def util_structure
     x = y = z = nil
+    before_list = []
+    after_list  = []
     x = describe "top-level thingy" do
-      before {}
-      after  {}
+      before { before_list << 1 }
+      after  { after_list  << 1 }
 
       it "top-level-it" do end
 
       y = describe "inner thingy" do
-        before {}
+        before { before_list << 2 }
+        after  { after_list  << 2 }
         it "inner-it" do end
 
         z = describe "very inner thingy" do
-          before {}
+          before { before_list << 3 }
+          after  { after_list  << 3 }
           it "inner-it" do end
         end
       end
     end
 
+    return x, y, z, before_list, after_list
+  end
+
+  def test_structure
+    x, y, z, * = util_structure
+
     assert_equal "top-level thingy", x.to_s
     assert_equal "top-level thingy::inner thingy", y.to_s
     assert_equal "top-level thingy::inner thingy::very inner thingy", z.to_s
 
+    assert_equal "top-level thingy", x.desc
+    assert_equal "inner thingy", y.desc
+    assert_equal "very inner thingy", z.desc
+
     top_methods = %w(setup teardown test_0001_top_level_it)
-    inner_methods = %w(setup test_0001_inner_it)
+    inner_methods = %w(setup teardown test_0001_inner_it)
 
     assert_equal top_methods,   x.instance_methods(false).sort.map {|o| o.to_s }
     assert_equal inner_methods, y.instance_methods(false).sort.map {|o| o.to_s }
     assert_equal inner_methods, z.instance_methods(false).sort.map {|o| o.to_s }
   end
+
+  def test_setup_teardown_behavior
+    _, _, z, before_list, after_list = util_structure
+
+    tc = z.new(nil)
+    tc.setup
+    tc.teardown
+
+    assert_equal [1, 2, 3], before_list
+    assert_equal [3, 2, 1], after_list
+  end
+
+  def test_children
+    MiniTest::Spec.children.clear
+
+    x = y = z = nil
+    x = describe "top-level thingy" do
+      y = describe "first thingy" do end
+
+      it "top-level-it" do end
+
+      z = describe "second thingy" do end
+    end
+
+    assert_equal [x], MiniTest::Spec.children
+    assert_equal [y, z], x.children
+    assert_equal [], y.children
+    assert_equal [], z.children
+  end
+
+  def test_describe_first_structure
+    x = y = z = nil
+    x = describe "top-level thingy" do
+      y = describe "first thingy" do end
+
+      it "top-level-it" do end
+
+      z = describe "second thingy" do end
+    end
+
+    assert_equal ['test_0001_top_level_it'],
+      x.instance_methods.grep(/^test/).map {|o| o.to_s}
+    assert_equal [], y.instance_methods.grep(/^test/)
+    assert_equal [], z.instance_methods.grep(/^test/)
+  end
+
+  def test_structure_subclasses
+    z = nil
+    x = Class.new MiniTest::Spec do
+      def xyz; end
+    end
+    y = Class.new x do
+      z = describe("inner") {}
+    end
+
+    assert_respond_to x.new(nil), "xyz"
+    assert_respond_to y.new(nil), "xyz"
+    assert_respond_to z.new(nil), "xyz"
+  end
 end

data/test/test_minitest_unit.rb

@@ -45,6 +45,7 @@ Finished tests in 0.00
 
   def teardown
     MiniTest::Unit.output = $stdout
+    MiniTest::Unit.runner = nil
     Object.send :remove_const, :ATestCase if defined? ATestCase
   end
 
@@ -248,7 +249,7 @@ RuntimeError: unhandled exception
     assert_report expected
   end
 
-  def test_run_failing # TODO: add error test
+  def test_run_failing
     tc = Class.new(MiniTest::Unit::TestCase) do
       def test_something
         assert true
@@ -354,6 +355,57 @@ not yet
     assert_report expected
   end
 
+  def test_default_runner_is_minitest_unit
+    assert_instance_of MiniTest::Unit, MiniTest::Unit.runner
+  end
+
+  def test_run_with_other_runner
+
+    runner = Class.new(MiniTest::Unit) do
+      # Run once before each suite
+      def _run_suite(suite, type)
+        begin
+          suite.before_suite
+          super(suite, type)
+        end
+      end
+    end
+
+    tc = Class.new(MiniTest::Unit::TestCase) do
+
+      def self.before_suite
+        MiniTest::Unit.output.puts "Running #{self.name} tests"
+        @@foo = 1
+      end
+
+      def test_something
+        assert_equal 1, @@foo
+      end
+
+      def test_something_else
+        assert_equal 1, @@foo
+      end
+    end
+
+    Object.const_set(:ATestCase, tc)
+    MiniTest::Unit.runner = runner.new
+    @tu.run %w[--seed 42]
+
+    # We should only see 'running ATestCase tests' once
+    expected = "Run options: --seed 42
+
+# Running tests:
+
+Running ATestCase tests
+..
+
+Finished tests in 0.00
+
+2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
+"
+    assert_report expected
+  end
+
   def util_expand_bt bt
     if RUBY_VERSION =~ /^1\.9/ then
       bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
@@ -403,8 +455,8 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_block_triggered
-    util_assert_triggered 'Expected block to return true value.' do
-      @tc.assert_block do
+    util_assert_triggered "blah.\nExpected block to return true value." do
+      @tc.assert_block "blah" do
         false
       end
     end
@@ -883,8 +935,9 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
   def test_message
     @assertion_count = 0
 
-    assert_equal "blah2.",         @tc.message { "blah2" }.call
-    assert_equal "blah2.",         @tc.message("") { "blah2" }.call
+    assert_equal "blah2.",         @tc.message          { "blah2" }.call
+    assert_equal "blah2.",         @tc.message("")      { "blah2" }.call
+    assert_equal "blah1.\nblah2.", @tc.message(:blah1)  { "blah2" }.call
     assert_equal "blah1.\nblah2.", @tc.message("blah1") { "blah2" }.call
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 2
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -35,35 +36,39 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2011-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id002
 description: |-
@@ -120,6 +125,7 @@ files:
 - test/test_minitest_mock.rb
 - test/test_minitest_spec.rb
 - test/test_minitest_unit.rb
+- .gemtest
 has_rdoc: true
 homepage: http://rubyforge.org/projects/bfts
 licenses: []
@@ -131,23 +137,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: bfts
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking

metadata.gz.sig

@@ -1,3 +1,2 @@
-aJ�s�{t����Ä׵�[���%�R�Ɲ?B�MEE 骍R5
m>c�i�^����ƨP��hd�f� ΤΫ�>��v��1�(�#hă
-Mf�z�%8�3l��`)Og���ћ��+ɐ��p.���$�cg�![3��φ������cd��-�g$_��h@N|��۱�~�8g��N�_�O�V�_/	9��p
-6#�ĥ�O��*�{RG ���@x�.�{ej2���x����v�nXHc,�F�c
+�Q1�rZ��+C��Lu��;5M=Ŏ�$<��3�ۈq��F��$^���p���~��m�<o�ź�~ʽ�@Ñ,=��lu�@Q!�lO-�@�դ�Jw�h��^��m�YeJ1��O��9�kv��=�0��
+�/��G��ypgf�'v+:�_����X�v߅_~0c��;V�.��/��n�f%^�Ԏ�-�EzS׉~�z'#��>�}�j֣h��bk_����tv'�r���y�0�}�h��<'