kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):

Browse source 
allow multiple exception list.  [ruby-core:01884]

* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
  check whether arguments are subclass of Exception.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-12-04 17:49:39 +00:00
parent e78a9cdcdb
commit 01d06638b9
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Dec 5 02:49:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
allow multiple exception list. [ruby-core:01884]
* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
check whether arguments are subclass of Exception.
Thu Dec 4 21:50:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):

34
lib/test/unit/assertions.rb
View file

@ -58,23 +58,29 @@ EOT
# Passes if block raises exception.
public
def assert_raises(expected_exception_klass, message="")
def assert_raises(*args)
_wrap_assertion do
assert_instance_of(Class, expected_exception_klass, "Should expect a class of exception")
if Class === args.last and Exception >= args.last
message = ""
else
message = args.pop
end
args.each do |klass|
assert(Exception >= klass, "Should expect a class of exception")
end
expected = args.size == 1 ? args.first : args
actual_exception = nil
full_message = build_message(message, "<?> exception expected but none was thrown.", expected_exception_klass)
full_message = build_message(message, "<?> exception expected but none was thrown.", expected)
assert_block(full_message) do
thrown = false
begin
yield
rescue Exception => thrown_exception
actual_exception = thrown_exception
thrown = true
rescue Exception => actual_exception
break
end
thrown
false
end
full_message = build_message(message, "<?> exception expected but was\n?", expected_exception_klass, actual_exception)
assert_block(full_message) { expected_exception_klass == actual_exception.class }
full_message = build_message(message, "<?> exception expected but was\n?", expected, actual_exception)
assert_block(full_message) { args.include?(actual_exception.class) }
actual_exception
end
end
@ -176,10 +182,14 @@ EOT
public
def assert_nothing_raised(*args)
_wrap_assertion do
message = ""
if (!args[-1].instance_of?(Class))
if Class === args.last and Exception >= args.last
message = ""
else
message = args.pop
end
args.each do |klass|
assert(Exception >= klass, "Should expect a class of exception")
end
begin
yield
rescue Exception => e