diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/test/unit.rb | 15 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat Oct 18 13:40:27 2008 Tanaka Akira <akr@fsij.org> + + * lib/test/unit.rb (assert_nothing_thrown): implemented. + Sat Oct 18 01:33:22 2008 WATANABE Hirofumi <eban@ruby-lang.org> * common.mk: use added options for generic_erb.rb. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index d81a111631..9c15806963 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -48,7 +48,7 @@ module Test begin require f rescue LoadError - puts $! + puts "#{f}: #{$!}" end } @@ -79,7 +79,7 @@ module Test rescue Exception => e if ((args.empty? && !e.instance_of?(MiniTest::Assertion)) || args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a }) - msg = message(msg) { "Exception raised:\n<#{mu_pp(act)}>" } + msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" } assert(false, msg) else raise @@ -88,6 +88,17 @@ module Test nil end + def assert_nothing_thrown(msg=nil) + begin + yield + rescue ArgumentError => error + raise error if /^uncaught throw (.+)$/ !~ error.message + msg = message(msg) { "<#{$1.intern}> was thrown when nothing was expected" } + flunk(msg) + end + assert(true, "Expected nothing to be thrown") + end + def assert_equal(exp, act, msg = nil) msg = message(msg) { exp_str = mu_pp(exp) |