* test/minitest/test_mini_test.rb: the number of assertions must be

  exactly equal to the number of assertion method calls that the end-user
  would write. [ruby-dev:37703]

* lib/minitest/unit.rb: ditto.
  Patch by David Flanagan <david AT davidflanagan.com>. [ruby-core:21350]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index 5f2fa5c99..77bcee99e 100644
--- a/lib/minitest/unit.rb
+++ b/lib/minitest/unit.rb
@@ -76,6 +76,7 @@ module MiniTest
     def assert_empty obj, msg = nil
       msg = message(msg) { "Expected #{obj.inspect} to be empty" }
       assert_respond_to obj, :empty?
+      self._assertions -= 1
       assert obj.empty?, msg
     end
 
@@ -97,6 +98,7 @@ module MiniTest
     def assert_includes collection, obj, msg = nil
       msg = message(msg) { "Expected #{mu_pp(collection)} to include #{mu_pp(obj)}" }
       assert_respond_to collection, :include?
+      self._assertions -= 1
       assert collection.include?(obj), msg
     end
 
@@ -118,6 +120,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, :"=~"
+      self._assertions -= 1
       exp = /#{Regexp.escape(exp)}/ if String === exp && String === act
       assert exp =~ act, msg
     end
@@ -241,6 +244,7 @@ module MiniTest
     def refute_empty obj, msg = nil
       msg = message(msg) { "Expected #{obj.inspect} to not be empty" }
       assert_respond_to obj, :empty?
+      self._assertions -= 1
       refute obj.empty?, msg
     end
 
@@ -262,6 +266,7 @@ module MiniTest
     def refute_includes collection, obj, msg = nil
       msg = message(msg) { "Expected #{mu_pp(collection)} to not include #{mu_pp(obj)}" }
       assert_respond_to collection, :include?
+      self._assertions -= 1
       refute collection.include?(obj), msg
     end
 
@@ -282,6 +287,7 @@ module MiniTest
     def refute_match exp, act, msg = nil
       msg = message(msg) { "Expected #{mu_pp(exp)} to not match #{mu_pp(act)}" }
       assert_respond_to act, :"=~"
+      self._assertions -= 1
       exp = /#{Regexp.escape(exp)}/ if String === exp && String === act
       refute exp =~ act, msg
     end