yugui	2009-01-09 11:19:08 +0900 (Fri, 09 Jan 2009)

  New Revision: 21404

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21404

  Log:
    merges r21376 from trunk into ruby_1_9_1.
    * lib/test/unit/assertions.rb (assert_no_match): don't count up as two
      assertions.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/test/unit/assertions.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21403)
+++ ruby_1_9_1/ChangeLog	(revision 21404)
@@ -1,3 +1,8 @@
+Thu Jan  8 00:31:58 2009  Tanaka Akira  <akr@f...>
+
+	* lib/test/unit/assertions.rb (assert_no_match): don't count up as two
+	  assertions.
+
 Mon Jan  5 12:52:08 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (init_env): use user profile folder than personal
Index: ruby_1_9_1/lib/test/unit/assertions.rb
===================================================================
--- ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21403)
+++ ruby_1_9_1/lib/test/unit/assertions.rb	(revision 21404)
@@ -92,6 +92,7 @@
 
       def assert_no_match(regexp, string, msg=nil)
         assert_instance_of(Regexp, regexp, "The first argument to assert_no_match should be a Regexp.")
+        self._assertions -= 1
         msg = message(msg) { "<#{mu_pp(regexp)}> expected to not match\n<#{mu_pp(string)}>" }
         assert(regexp !~ string, msg)
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/