diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:59 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:51:59 +0000 |
| commit | 49a4a8b911c50cc6c8aea1d5c90650c594329afe (patch) | |
| tree | e5d1ebebdfee14dc46f26804e2d4a3b0fcccdb9d | |
| parent | 38f94d8edb0895ca1b7ab9207d1fcdadeefc657a (diff) | |
merges r20915 from trunk into ruby_1_9_1.
* lib/test/unit/assertions.rb (assert_nothing_raised): increment
assertion count. [ruby-dev:37480]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/test/unit/assertions.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Dec 22 21:08:54 2008 Tanaka Akira <akr@fsij.org> + + * lib/test/unit/assertions.rb (assert_nothing_raised): increment + assertion count. [ruby-dev:37480] + Mon Dec 22 19:10:44 2008 NAKAMURA Usaku <usa@ruby-lang.org> * thread_win32.c (Init_native_thread): need to call diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 2c1f76e69..af1a23a3b 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -15,6 +15,7 @@ module Test end def assert_nothing_raised(*args) + self._assertions += 1 if Module === args.last msg = nil else |