minitest 2.9.0 → 2.9.1

data/.autotest

@@ -5,7 +5,7 @@ require 'autotest/restart'
 Autotest.add_hook :initialize do |at|
   at.testlib = 'minitest/unit'
 
-  at.extra_class_map["MiniSpec"]             = "test/test_minitest_spec.rb"
+  at.extra_class_map["MiniTest::Spec"]       = "test/test_minitest_spec.rb"
   at.extra_class_map["TestMiniTestTestCase"] = "test/test_minitest_unit.rb"
   at.extra_class_map["TestMiniTestUnit"]     = "test/test_minitest_unit.rb"
   at.add_exception 'coverage.info'

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.9.1 / 2011-12-13
+
+* 4 minor enhancements:
+
+  * Added a ton of tests on spec error message output.
+  * Cleaned up consistency of msg handling on unary expectations.
+  * Improved error messages on assert/refute_in_delta.
+  * infect_an_assertion no longer checks arity and better handles args.
+
+* 1 bug fix:
+
+  * Fixed error message on specs when 2+ args and custom message provided. (chastell)
+
 === 2.9.0 / 2011-12-07
 
 * 4 minor enhancements:

data/lib/minitest/spec.rb

@@ -7,11 +7,14 @@ class Module # :nodoc:
     # warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
     self.class_eval <<-EOM
       def #{new_name} *args
-        return MiniTest::Spec.current.#{meth}(*args, &self) if
-          Proc === self
-        return MiniTest::Spec.current.#{meth}(args.first, self) if
-          args.size == 1 unless #{!!dont_flip}
-        return MiniTest::Spec.current.#{meth}(self, *args)
+        case
+        when Proc === self then
+          MiniTest::Spec.current.#{meth}(*args, &self)
+        when #{!!dont_flip} then
+          MiniTest::Spec.current.#{meth}(self, *args)
+        else
+          MiniTest::Spec.current.#{meth}(args.first, self, *args[1..-1])
+        end
       end
     EOM
   end
@@ -328,7 +331,7 @@ module MiniTest::Expectations
   #
   # :method: must_be_nil
 
-  infect_an_assertion :assert_nil, :must_be_nil
+  infect_an_assertion :assert_nil, :must_be_nil, :unary
 
   ##
   # See MiniTest::Assertions#assert_operator
@@ -489,7 +492,7 @@ module MiniTest::Expectations
   #
   # :method: wont_be_nil
 
-  infect_an_assertion :refute_nil, :wont_be_nil
+  infect_an_assertion :refute_nil, :wont_be_nil, :unary
 
   ##
   # See MiniTest::Assertions#refute_operator

data/lib/minitest/unit.rb

@@ -224,7 +224,7 @@ module MiniTest
 
     def assert_in_delta exp, act, delta = 0.001, msg = nil
       n = (exp - act).abs
-      msg = message(msg) { "Expected #{exp} - #{act} (#{n}) to be < #{delta}" }
+      msg = message(msg) { "Expected |#{exp} - #{act}| (#{n}) to be < #{delta}"}
       assert delta >= n, msg
     end
 
@@ -333,7 +333,7 @@ module MiniTest
     # Fails unless the block raises one of +exp+
 
     def assert_raises *exp
-      msg = "#{exp.pop}\n" if String === exp.last
+      msg = "#{exp.pop}.\n" if String === exp.last
 
       should_raise = false
       begin
@@ -526,7 +526,7 @@ module MiniTest
     def refute_in_delta exp, act, delta = 0.001, msg = nil
       n = (exp - act).abs
       msg = message(msg) {
-        "Expected #{exp} - #{act} (#{n}) to not be < #{delta}"
+        "Expected |#{exp} - #{act}| (#{n}) to not be < #{delta}"
       }
       refute delta > n, msg
     end
@@ -643,7 +643,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "2.9.0" # :nodoc:
+    VERSION = "2.9.1" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:

data/test/test_minitest_spec.rb

@@ -7,6 +7,19 @@ class ExampleA; end
 class ExampleB < ExampleA; end
 
 describe MiniTest::Spec do
+  def assert_triggered expected = "blah", klass = MiniTest::Assertion
+    @assertion_count += 2
+
+    e = assert_raises(klass) do
+      yield
+    end
+
+    msg = e.message.sub(/(---Backtrace---).*/m, '\1')
+    msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
+
+    assert_equal expected, msg
+  end
+
   before do
     @assertion_count = 4
   end
@@ -56,47 +69,107 @@ describe MiniTest::Spec do
 
   it "needs to verify equality" do
     (6 * 7).must_equal(42).must_equal true
-    proc { (6 * 9).must_equal(42) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected: 42\n  Actual: 54" do
+      (6 * 9).must_equal 42
+    end
+
+    assert_triggered "msg.\nExpected: 42\n  Actual: 54" do
+      (6 * 9).must_equal 42, "msg"
+    end
   end
 
   it "needs to verify floats within a delta" do
+    @assertion_count += 1 # extra test
+
     (6.0 * 7).must_be_close_to(42.0).must_equal true
-    proc { 42.002.must_be_close_to 42.0 }.must_raise MiniTest::Assertion
+
+    assert_triggered 'Expected |0.0 - 0.01| (0.01) to be < 0.001.' do
+      (1.0 / 100).must_be_close_to 0.0
+    end
+
+    assert_triggered 'Expected |0.0 - 0.001| (0.001) to be < 1.0e-06.' do
+      (1.0 / 1000).must_be_close_to 0.0, 0.000001
+    end
+
+    assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be < 1.0e-06." do
+      (1.0 / 1000).must_be_close_to 0.0, 0.000001, "msg"
+    end
   end
 
   it "needs to verify types of objects" do
     (6 * 7).must_be_instance_of(Fixnum).must_equal true
-    proc { (6 * 7).must_be_instance_of String }.must_raise MiniTest::Assertion
+
+    exp = "Expected 42 to be an instance of String, not Fixnum."
+
+    assert_triggered exp do
+      (6 * 7).must_be_instance_of String
+    end
+
+    assert_triggered "msg.\n#{exp}" do
+      (6 * 7).must_be_instance_of String, "msg"
+    end
   end
 
   it "needs to verify kinds of objects" do
-    @assertion_count = 6
+    @assertion_count += 2 # extra test
 
     (6 * 7).must_be_kind_of(Fixnum).must_equal true
     (6 * 7).must_be_kind_of(Numeric).must_equal true
-    proc { (6 * 7).must_be_kind_of String }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 42 to be a kind of String, not Fixnum." do
+      (6 * 7).must_be_kind_of String
+    end
+
+    assert_triggered "msg.\nExpected 42 to be a kind of String, not Fixnum." do
+      (6 * 7).must_be_kind_of String, "msg"
+    end
   end
 
   it "needs to verify regexp matches" do
-    @assertion_count = 6
+    @assertion_count += 3 # must_match is 2 assertions
 
     "blah".must_match(/\w+/).must_equal true
-    proc { "blah".must_match(/\d+/) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected /\\d+/ to match \"blah\"." do
+      "blah".must_match(/\d+/)
+    end
+
+    assert_triggered "msg.\nExpected /\\d+/ to match \"blah\"." do
+      "blah".must_match(/\d+/, "msg")
+    end
   end
 
   it "needs to verify nil" do
     nil.must_be_nil.must_equal true
-    proc { 42.must_be_nil }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 42 to be nil." do
+      42.must_be_nil
+    end
+
+    assert_triggered "msg.\nExpected 42 to be nil." do
+      42.must_be_nil "msg"
+    end
   end
 
   it "needs to verify using any binary operator" do
+    @assertion_count -= 1 # no msg
+
     41.must_be(:<, 42).must_equal true
-    proc { 42.must_be(:<, 41) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 42 to be < 41." do
+      42.must_be(:<, 41)
+    end
   end
 
   it "needs to verify using any predicate" do
+    @assertion_count -= 1 # no msg
+
     "".must_be(:empty?).must_equal true
-    proc { "blah".must_be(:empty?) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected \"blah\" to be empty?." do
+      "blah".must_be :empty?
+    end
   end
 
   it "needs to catch an expected exception" do
@@ -107,105 +180,207 @@ describe MiniTest::Spec do
   end
 
   it "needs to catch an unexpected exception" do
-    @assertion_count = 2
+    @assertion_count -= 2 # no positive
+
+    msg = <<-EOM.gsub(/^ {6}/, '').chomp
+      [RuntimeError] exception expected, not
+      Class: <MiniTest::Assertion>
+      Message: <\"MiniTest::Assertion\">
+      ---Backtrace---
+    EOM
 
-    proc {
-      proc { raise MiniTest::Assertion }.must_raise(RuntimeError)
-    }.must_raise MiniTest::Assertion
+    assert_triggered msg do
+      proc { raise MiniTest::Assertion }.must_raise RuntimeError
+    end
+
+    assert_triggered "msg.\n#{msg}" do
+      proc { raise MiniTest::Assertion }.must_raise RuntimeError, "msg"
+    end
   end
 
-  it "needs raise if an expected exception is not raised" do
-    @assertion_count = 2
+  it "needs to raise if an expected exception is not raised" do
+    @assertion_count -= 2 # no positive test
+
+    assert_triggered "RuntimeError expected but nothing was raised." do
+      proc { 42 }.must_raise RuntimeError
+    end
 
-    proc { proc { 42 }.must_raise(RuntimeError) }.must_raise MiniTest::Assertion
+    assert_triggered "msg.\nRuntimeError expected but nothing was raised." do
+      proc { 42 }.must_raise RuntimeError, "msg"
+    end
   end
 
   it "needs to be able to catch a MiniTest::Assertion exception" do
-    @assertion_count = 2
+    @assertion_count = 1
 
-    proc { 1.wont_equal 1 }.must_raise MiniTest::Assertion
+    assert_triggered "Expected 1 to not be equal to 1." do
+      1.wont_equal 1
+    end
   end
 
   it "needs to verify using respond_to" do
     42.must_respond_to(:+).must_equal true
-    proc { 42.must_respond_to(:clear) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 42 (Fixnum) to respond to #clear." do
+      42.must_respond_to :clear
+    end
+
+    assert_triggered "msg.\nExpected 42 (Fixnum) to respond to #clear." do
+      42.must_respond_to :clear, "msg"
+    end
   end
 
   it "needs to verify identity" do
     1.must_be_same_as(1).must_equal true
-    proc { 1.must_be_same_as 2 }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 1 (oid=N) to be the same as 2 (oid=N)." do
+      1.must_be_same_as 2
+    end
+
+    assert_triggered "msg.\nExpected 1 (oid=N) to be the same as 2 (oid=N)." do
+      1.must_be_same_as 2, "msg"
+    end
   end
 
   it "needs to verify throw" do
-    @assertion_count = 6
+    @assertion_count += 2 # 2 extra tests
 
     proc { throw :blah }.must_throw(:blah).must_equal true
-    proc { proc { }.must_throw(:blah) }.must_raise MiniTest::Assertion
-    proc { proc { throw :xxx }.must_throw(:blah) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected :blah to have been thrown." do
+      proc { }.must_throw :blah
+    end
+
+    assert_triggered "Expected :blah to have been thrown, not :xxx." do
+      proc { throw :xxx }.must_throw :blah
+    end
+
+    assert_triggered "msg.\nExpected :blah to have been thrown." do
+      proc { }.must_throw :blah, "msg"
+    end
+
+    assert_triggered "msg.\nExpected :blah to have been thrown, not :xxx." do
+      proc { throw :xxx }.must_throw :blah, "msg"
+    end
   end
 
   it "needs to verify inequality" do
     42.wont_equal(6 * 9).must_equal false
-    proc { 1.wont_equal 1 }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 1 to not be equal to 1." do
+      1.wont_equal 1
+    end
+
+    assert_triggered "msg.\nExpected 1 to not be equal to 1." do
+      1.wont_equal 1, "msg"
+    end
   end
 
   it "needs to verify mismatch" do
-    @assertion_count = 6
+    @assertion_count += 3 # match is 2
+
     "blah".wont_match(/\d+/).must_equal false
-    proc { "blah".wont_match(/\w+/) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected /\\w+/ to not match \"blah\"." do
+      "blah".wont_match(/\w+/)
+    end
+
+    assert_triggered "msg.\nExpected /\\w+/ to not match \"blah\"." do
+      "blah".wont_match(/\w+/, "msg")
+    end
   end
 
   it "needs to verify using any (negative) predicate" do
+    @assertion_count -= 1 # doesn't take a message
+
     "blah".wont_be(:empty?).must_equal false
-    proc { "".wont_be(:empty?) }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected \"\" to not be empty?." do
+      "".wont_be :empty?
+    end
   end
 
   it "needs to verify non-nil" do
     42.wont_be_nil.must_equal false
-    proc { nil.wont_be_nil }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected nil to not be nil." do
+      nil.wont_be_nil
+    end
+
+    assert_triggered "msg.\nExpected nil to not be nil." do
+      nil.wont_be_nil "msg"
+    end
   end
 
   it "needs to verify non-identity" do
     1.wont_be_same_as(2).must_equal false
-    proc { 1.wont_be_same_as 1 }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected 1 (oid=N) to not be the same as 1 (oid=N)." do
+      1.wont_be_same_as 1
+    end
+
+    assert_triggered "msg.\nExpected 1 (oid=N) to not be the same as 1 (oid=N)." do
+      1.wont_be_same_as 1, "msg"
+    end
   end
 
   it "needs to verify output in stdout" do
+    @assertion_count -= 1 # no msg
+
     proc { print "blah" }.must_output("blah").must_equal true
 
-    proc {
+    assert_triggered "In stdout.\nExpected: \"blah\"\n  Actual: \"xxx\"" do
       proc { print "xxx" }.must_output("blah")
-    }.must_raise MiniTest::Assertion
+    end
   end
 
   it "needs to verify output in stderr" do
+    @assertion_count -= 1 # no msg
+
     proc { $stderr.print "blah" }.must_output(nil, "blah").must_equal true
 
-    proc {
+    assert_triggered "In stderr.\nExpected: \"blah\"\n  Actual: \"xxx\"" do
       proc { $stderr.print "xxx" }.must_output(nil, "blah")
-    }.must_raise MiniTest::Assertion
+    end
   end
 
   it "needs to ensure silence" do
-    @assertion_count = 6
+    @assertion_count -= 1 # no msg
+    @assertion_count += 2 # assert_output is 2 assertions
 
     proc {  }.must_be_silent.must_equal true
 
-    proc {
+    assert_triggered "In stdout.\nExpected: \"\"\n  Actual: \"xxx\"" do
       proc { print "xxx" }.must_be_silent
-    }.must_raise MiniTest::Assertion
+    end
   end
 
   it "needs to be sensible about must_include order" do
-    @assertion_count = 6
+    @assertion_count += 3 # must_include is 2 assertions
+
     [1, 2, 3].must_include(2).must_equal true
-    proc { [1, 2, 3].must_include 5 }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected [1, 2, 3] to include 5." do
+      [1, 2, 3].must_include 5
+    end
+
+    assert_triggered "msg.\nExpected [1, 2, 3] to include 5." do
+      [1, 2, 3].must_include 5, "msg"
+    end
   end
 
   it "needs to be sensible about wont_include order" do
-    @assertion_count = 6
+    @assertion_count += 3 # wont_include is 2 assertions
+
     [1, 2, 3].wont_include(5).must_equal false
-    proc { [1, 2, 3].wont_include 2 }.must_raise MiniTest::Assertion
+
+    assert_triggered "Expected [1, 2, 3] to not include 2." do
+      [1, 2, 3].wont_include 2
+    end
+
+    assert_triggered "msg.\nExpected [1, 2, 3] to not include 2." do
+      [1, 2, 3].wont_include 2, "msg"
+    end
   end
 end
 

data/test/test_minitest_unit.rb

@@ -769,7 +769,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_in_delta_triggered
-    util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to be < 1.0e-06.' do
+    util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to be < 1.0e-06.' do
       @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
     end
   end
@@ -789,7 +789,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_in_epsilon_triggered
-    util_assert_triggered 'Expected 10000 - 9990 (10) to be < 9.99.' do
+    util_assert_triggered 'Expected |10000 - 9990| (10) to be < 9.99.' do
       @tc.assert_in_epsilon 10000, 9990
     end
   end
@@ -1004,13 +1004,15 @@ FILE:LINE:in `test_assert_raises_triggered_different'
       end
     end
 
-    expected = "XXX
-[RuntimeError] exception expected, not
-Class: <SyntaxError>
-Message: <\"icky\">
----Backtrace---
-FILE:LINE:in `test_assert_raises_triggered_different_msg'
----------------"
+    expected = <<-EOM.gsub(/^ {6}/, '').chomp
+      XXX.
+      [RuntimeError] exception expected, not
+      Class: <SyntaxError>
+      Message: <\"icky\">
+      ---Backtrace---
+      FILE:LINE:in `test_assert_raises_triggered_different_msg'
+      ---------------
+    EOM
 
     actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
     actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION >= '1.9.0'
@@ -1037,7 +1039,7 @@ FILE:LINE:in `test_assert_raises_triggered_different_msg'
       end
     end
 
-    expected = "XXX\nMiniTest::Assertion expected but nothing was raised."
+    expected = "XXX.\nMiniTest::Assertion expected but nothing was raised."
 
     assert_equal expected, e.message
   end
@@ -1217,6 +1219,12 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
     end
   end
 
+  def test_expectation_with_a_message
+    util_assert_triggered "Expected: 2\n  Actual: 1" do
+      1.must_equal 2, ''
+    end
+  end
+
   def test_flunk
     util_assert_triggered 'Epic Fail!' do
       @tc.flunk
@@ -1282,7 +1290,7 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
   end
 
   def test_refute_in_delta_triggered
-    util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to not be < 0.1.' do
+    util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to not be < 0.1.' do
       @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
     end
   end
@@ -1292,7 +1300,7 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
   end
 
   def test_refute_in_epsilon_triggered
-    util_assert_triggered 'Expected 10000 - 9991 (9) to not be < 10.0.' do
+    util_assert_triggered 'Expected |10000 - 9991| (9) to not be < 10.0.' do
       @tc.refute_in_epsilon 10000, 9991
       fail
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 2
   - 9
-  - 0
-  version: 2.9.0
+  - 1
+  version: 2.9.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-12-08 00:00:00 Z
+date: 2011-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe