minitest 4.3.3 → 4.4.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 4.4.0 / 2013-01-07
+
+* 3 minor enhancements:
+
+  * Added fit_logarithic and assert_performance_logarithmic. (ktheory)
+  * Merge processed options so others can mess with defaults. (tenderlove)
+  * TestCase#message can now take another proc to defer custom message cost. (ordinaryzelig/bhenderson)
+
+* 1 bug fix:
+
+  * TestCase#passed? now true if test is skipped. (qanhd)
+
 === 4.3.3 / 2012-12-06
 
 * 1 bug fix:

data/README.txt

@@ -319,6 +319,7 @@ minitest-reporters      :: Create customizable MiniTest output formats
 minitest-rg             :: redgreen minitest
 minitest-shouldify      :: Adding all manner of shoulds to MiniTest (bad idea)
 minitest-spec-magic     :: Minitest::Spec extensions for Rails and beyond
+minitest-spec-rails     :: Drop in MiniTest::Spec superclass for ActiveSupport::TestCase.
 minitest-tags           :: add tags for minitest
 minitest-wscolor        :: Yet another test colorizer.
 minitest_owrapper       :: Get tests results as a TestResult object.
@@ -347,7 +348,6 @@ Authors... Please send me a pull request with a description of your minitest ext
 * minitest-rails-shoulda
 * minitest-spec
 * minitest-spec-context
-* minitest-spec-rails
 * minitest-spec-should
 * minitest-sugar
 * minitest_should

data/lib/minitest/benchmark.rb

@@ -154,6 +154,26 @@ class MiniTest::Unit # :nodoc:
       assert_performance validation_for_fit(:exponential, threshold), &work
     end
 
+    ##
+    # Runs the given +work+ and asserts that the times gathered fit to
+    # match a logarithmic curve within a given error +threshold+.
+    #
+    # Fit is calculated by #fit_logarithmic.
+    #
+    # Ranges are specified by ::bench_range.
+    #
+    # Eg:
+    #
+    #   def bench_algorithm
+    #     assert_performance_logarithmic 0.9999 do |n|
+    #       @obj.algorithm(n)
+    #     end
+    #   end
+
+    def assert_performance_logarithmic threshold = 0.99, &work
+      assert_performance validation_for_fit(:logarithmic, threshold), &work
+    end
+
     ##
     # Runs the given +work+ and asserts that the times gathered fit to
     # match a straight line within a given error +threshold+.
@@ -229,6 +249,29 @@ class MiniTest::Unit # :nodoc:
       return Math.exp(a), b, fit_error(xys) { |x| Math.exp(a + b * x) }
     end
 
+    ##
+    # To fit a functional form: y = a + b*ln(x).
+    #
+    # Takes x and y values and returns [a, b, r^2].
+    #
+    # See: http://mathworld.wolfram.com/LeastSquaresFittingLogarithmic.html
+
+    def fit_logarithmic xs, ys
+      n     = xs.size
+      xys   = xs.zip(ys)
+      slnx2 = sigma(xys) { |x,y| Math.log(x) ** 2 }
+      slnx  = sigma(xys) { |x,y| Math.log(x)      }
+      sylnx = sigma(xys) { |x,y| y * Math.log(x)  }
+      sy    = sigma(xys) { |x,y| y                }
+
+      c = n * slnx2 - slnx ** 2
+      b = ( n * sylnx - sy * slnx ) / c
+      a = (sy - b * slnx) / n
+
+      return a, b, fit_error(xys) { |x| a + b * Math.log(x) }
+    end
+
+
     ##
     # Fits the functional form: a + bx.
     #

data/lib/minitest/hell.rb

@@ -1,4 +1,4 @@
-class Minitest::Unit::TestCase
+class Minitest::Unit::TestCase # :nodoc:
   class << self
     alias :old_test_order :test_order
 

data/lib/minitest/parallel_each.rb

@@ -1,9 +1,21 @@
+##
+# Provides a parallel #each that lets you enumerate using N threads.
+# Use environment variable N to customize. Defaults to 2. Enumerable,
+# so all the goodies come along (tho not all are wrapped yet to
+# return another ParallelEach instance).
+
 class ParallelEach
   require 'thread'
   include Enumerable
 
+  ##
+  # How many Threads to use for this parallel #each.
+
   N = (ENV['N'] || 2).to_i
 
+  ##
+  # Create a new ParallelEach instance over +list+.
+
   def initialize list
     @queue = Queue.new # *sigh*... the Queue api sucks sooo much...
 
@@ -11,10 +23,14 @@ class ParallelEach
     N.times { @queue << nil }
   end
 
-  def grep pattern
+  def grep pattern # :nodoc:
     self.class.new super
   end
 
+  ##
+  # Starts N threads that yield each element to your block. Joins the
+  # threads at the end.
+
   def each
     threads = N.times.map {
       Thread.new do

data/lib/minitest/spec.rb

@@ -179,7 +179,7 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
   ##
   # Define an expectation with name +desc+. Name gets morphed to a
   # proper test method name. For some freakish reason, people who
-  # write specs don't like class inheritence, so this goes way out of
+  # write specs don't like class inheritance, so this goes way out of
   # its way to make sure that expectations aren't inherited.
   #
   # This is also aliased to #specify and doesn't require a +desc+ arg.

data/lib/minitest/unit.rb

@@ -33,6 +33,9 @@ module MiniTest
   class Skip < Assertion; end
 
   class << self
+    ##
+    # Filter object for backtraces.
+
     attr_accessor :backtrace_filter
   end
 
@@ -555,6 +558,7 @@ module MiniTest
 
     def message msg = nil, ending = ".", &default
       proc {
+        msg = msg.call.chomp(".") if Proc === msg
         custom_message = "#{msg}.\n" unless msg.nil? or msg.to_s.empty?
         "#{custom_message}#{default.call}#{ending}"
       }
@@ -730,7 +734,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "4.3.3" # :nodoc:
+    VERSION = "4.4.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -1032,7 +1036,7 @@ module MiniTest
     # Top level driver, controls all output and filtering.
 
     def _run args = []
-      self.options = process_args args
+      self.options.merge! process_args args
 
       puts "Run options: #{help}"
 
@@ -1299,7 +1303,7 @@ module MiniTest
         rescue *PASSTHROUGH_EXCEPTIONS
           raise
         rescue Exception => e
-          @passed = false
+          @passed = Skip === e
           time = Time.now - start_time
           runner.record self.class, self.__name__, self._assertions, time, e
           result = runner.puke self.class, self.__name__, e
@@ -1325,11 +1329,11 @@ module MiniTest
         @__name__ = name
         @__io__ = nil
         @passed = nil
-        @@current = self
+        @@current = self # FIX: make thread local
       end
 
       def self.current # :nodoc:
-        @@current
+        @@current # FIX: make thread local
       end
 
       ##

data/test/minitest/test_minitest_benchmark.rb

@@ -44,6 +44,22 @@ class TestMiniTestBenchmark < MiniTest::Unit::TestCase
     assert_fit :exponential, x, y, 0.95, 13.81148, -0.1820
   end
 
+  def test_fit_logarithmic_clean
+    x = [1.0, 2.0, 3.0, 4.0, 5.0]
+    y = x.map { |n| 1.1 + 2.1 * Math.log(n) }
+
+    assert_fit :logarithmic, x, y, 1.0, 1.1, 2.1
+  end
+
+  def test_fit_logarithmic_noisy
+    x = [1.0, 2.0, 3.0, 4.0, 5.0]
+    # Generated with
+    # y = x.map { |n| jitter = 0.999 + 0.002 * rand; (Math.log(n) ) * jitter }
+    y = [0.0, 0.6935, 1.0995, 1.3873, 1.6097]
+
+    assert_fit :logarithmic, x, y, 0.95, 0, 1
+  end
+
   def test_fit_constant_clean
     x = (1..5).to_a
     y = [5.0, 5.0, 5.0, 5.0, 5.0]

data/test/minitest/test_minitest_unit.rb

@@ -172,42 +172,22 @@ class TestMiniTestUnit < MetaMetaMetaTestCase
     assert_instance_of MiniTest::Unit, MiniTest::Unit.runner
   end
 
-  def with_overridden_include
-    Class.class_eval do
-      def inherited_with_hacks klass
-        throw :inherited_hook
-      end
 
-      alias inherited_without_hacks inherited
-      alias inherited               inherited_with_hacks
-      alias IGNORE_ME!              inherited # 1.8 bug. god I love venture bros
-    end
-
-    yield
-  ensure
-    Class.class_eval do
-      alias inherited inherited_without_hacks
-
-      undef_method :inherited_with_hacks
-      undef_method :inherited_without_hacks
+  def test_passed_eh_teardown_good
+    test_class = Class.new MiniTest::Unit::TestCase do
+      def teardown; assert true; end
+      def test_omg; assert true; end
     end
 
-    refute_respond_to Class, :inherited_with_hacks
-    refute_respond_to Class, :inherited_without_hacks
-  end
-
-  def test_inherited_hook_plays_nice_with_others
-    with_overridden_include do
-      assert_throws :inherited_hook do
-        Class.new MiniTest::Unit::TestCase
-      end
-    end
+    test = test_class.new :test_omg
+    test.run @tu
+    assert test.passed?
   end
 
-  def test_passed_eh_teardown_good
+  def test_passed_eh_teardown_skipped
     test_class = Class.new MiniTest::Unit::TestCase do
       def teardown; assert true; end
-      def test_omg; assert true; end
+      def test_omg; skip "bork"; end
     end
 
     test = test_class.new :test_omg
@@ -235,6 +215,40 @@ class TestMiniTestUnit < MetaMetaMetaTestCase
   end
 end
 
+class TestMiniTestUnitInherited < MetaMetaMetaTestCase
+  def with_overridden_include
+    Class.class_eval do
+      def inherited_with_hacks klass
+        throw :inherited_hook
+      end
+
+      alias inherited_without_hacks inherited
+      alias inherited               inherited_with_hacks
+      alias IGNORE_ME!              inherited # 1.8 bug. god I love venture bros
+    end
+
+    yield
+  ensure
+    Class.class_eval do
+      alias inherited inherited_without_hacks
+
+      undef_method :inherited_with_hacks
+      undef_method :inherited_without_hacks
+    end
+
+    refute_respond_to Class, :inherited_with_hacks
+    refute_respond_to Class, :inherited_without_hacks
+  end
+
+  def test_inherited_hook_plays_nice_with_others
+    with_overridden_include do
+      assert_throws :inherited_hook do
+        Class.new MiniTest::Unit::TestCase
+      end
+    end
+  end
+end
+
 class TestMiniTestRunner < MetaMetaMetaTestCase
   # do not parallelize this suite... it just can't handle it.
 
@@ -658,7 +672,9 @@ class TestMiniTestUnitOrder < MetaMetaMetaTestCase
 end
 
 class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
-  parallelize_me!
+  # do not call parallelize_me! - teardown accesses @tc._assertions
+  # which is not threadsafe. Nearly every method in here is an
+  # assertion test so it isn't worth splitting it out further.
 
   RUBY18 = ! defined? Encoding
 
@@ -1402,6 +1418,36 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     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
+
+    message = proc { "blah1" }
+    assert_equal "blah1.\nblah2.", @tc.message(message) { "blah2" }.call
+
+    message = @tc.message { "blah1" }
+    assert_equal "blah1.\nblah2.", @tc.message(message) { "blah2" }.call
+  end
+
+  def test_message_message
+    util_assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+      @tc.assert_equal 1, 2, message { "whoops" }
+    end
+  end
+
+  def test_message_lambda
+    util_assert_triggered "whoops.\nExpected: 1\n  Actual: 2" do
+      @tc.assert_equal 1, 2, lambda { "whoops" }
+    end
+  end
+
+  def test_message_deferred
+    @assertion_count, var = 0, nil
+
+    msg = message { var = "blah" }
+
+    assert_nil var
+
+    msg.call
+
+    assert_equal "blah", var
   end
 
   def test_pass

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 47
   prerelease: 
   segments: 
   - 4
-  - 3
-  - 3
-  version: 4.3.3
+  - 4
+  - 0
+  version: 4.4.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-12-07 00:00:00 Z
+date: 2013-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
-        - 3
-        version: "3.3"
+        - 4
+        version: "3.4"
   type: :development
   version_requirements: *id002
 description: |-