diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-22 05:50:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-22 05:50:17 +0000 |
commit | cb9ffb8d1cc1a784674e0f1594582b1406547dbd (patch) | |
tree | bd233d95e4c34fba58f65a3bedd037370d0c9bf0 | |
parent | e1d15712565ef38f7acd605dc1aafb3884b6a008 (diff) | |
download | ruby-cb9ffb8d1cc1a784674e0f1594582b1406547dbd.tar.gz |
* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
assertion message must not be nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/test/unit/assertions.rb | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Oct 22 14:50:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): + assertion message must not be nil. + Fri Oct 22 13:59:50 2010 NARUSE, Yui <naruse@ruby-lang.org> * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index b9fc2bcf12..ce28042c49 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -13,8 +13,11 @@ module Test UNASSIGNED = Object.new # :nodoc: def assert(test, msg = UNASSIGNED) - msg = nil if msg == UNASSIGNED - unless String === msg or Proc === msg or msg.nil? then + case msg + when UNASSIGNED + msg = nil + when String, Proc + else bt = caller.reject { |s| s.rindex(MiniTest::MINI_DIR, 0) } raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt end |