summaryrefslogtreecommitdiff
path: root/lib/test
diff options
context:
space:
mode:
Diffstat (limited to 'lib/test')
-rw-r--r--lib/test/unit/assertions.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 02126badca..3076b7fd02 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -60,13 +60,13 @@ EOT
public
def assert_raises(*args)
_wrap_assertion do
- if Class === args.last and Exception >= args.last
+ if Class === args.last
message = ""
else
message = args.pop
end
args.each do |klass|
- assert(Exception >= klass, "Should expect a class of exception")
+ assert(Exception >= klass, "Should expect a class of exception, #{klass}")
end
expected = args.size == 1 ? args.first : args
actual_exception = nil
@@ -182,13 +182,13 @@ EOT
public
def assert_nothing_raised(*args)
_wrap_assertion do
- if Class === args.last and Exception >= args.last
+ if Class === args.last
message = ""
else
message = args.pop
end
args.each do |klass|
- assert(Exception >= klass, "Should expect a class of exception")
+ assert(Exception >= klass, "Should expect a class of exception, #{klass}")
end
begin
yield