summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/test/unit/assertions.rb43
2 files changed, 33 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 862cc5db978..973a41c2002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 8 11:56:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: assert_nothing_thrown,
+ assert_raise, assert_not_equal, assert_no_match, assert_not_nil,
+ assert_not_same are coming back as alias.
+
Wed Oct 8 11:18:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (autoload_delete, autoload_file): should not delete
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index ee973dc58e4..97cc2700b4a 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -5,7 +5,6 @@
############################################################
require 'mini/test'
-require 'test/unit/deprecate'
module Test; end
module Test::Unit # patch up bastards that that extend improperly.
@@ -32,28 +31,40 @@ module Test::Unit # patch up bastards that that extend improperly.
end
module Test::Unit
- module Assertions # deprecations
- tu_deprecate :assert_nothing_thrown, :assert_nothing_raised # 2009-06-01
- tu_deprecate :assert_raise, :assert_raises # 2010-06-01
- tu_deprecate :assert_not_equal, :refute_equal # 2009-06-01
- tu_deprecate :assert_no_match, :refute_match # 2009-06-01
- tu_deprecate :assert_not_nil, :refute_nil # 2009-06-01
- tu_deprecate :assert_not_same, :refute_same # 2009-06-01
-
- def assert_nothing_raised _ = :ignored, msg = nil # 2009-06-01
- self.class.tu_deprecation_warning :assert_nothing_raised
+ module Assertions
+ def assert_nothing_raised(*exp)
+ msg = (Module === exp.last) ? "" : exp.pop
+ noexc = exp.select {|e| not (Module === e and Exception >= e)}
+ unless noexc.empty?
+ noexc = *noexc if noexc.size == 1
+ raise TypeError, "Should expect a class of exception, #{noexc.inspect}"
+ end
self._assertions += 1
- yield
- rescue => e
- raise Mini::Assertion, exception_details(e, "Exception raised:")
+ begin
+ yield
+ rescue Exception => e
+ exp.include?(e.class) or raise
+ raise(Mini::Assertion, exception_details(e, "#{msg}#{msg.empty? ? '' : ' '}Exception raised:"))
+ end
end
- def build_message(user_message, template_message, *args) # 2009-06-01
- self.class.tu_deprecation_warning :build_message
+ def build_message(user_message, template_message, *args)
user_message ||= ''
user_message += ' ' unless user_message.empty?
msg = template_message.split(/<\?>/).zip(args.map { |o| o.inspect })
user_message + msg.join
end
+
+ alias assert_nothing_thrown assert_nothing_raised
+ alias assert_raise assert_raises
+ alias assert_not_equal refute_equal
+ alias assert_no_match refute_match
+ alias assert_not_nil refute_nil
+ alias assert_not_same refute_same
+
+ private
+ def _wrap_assertion
+ yield
+ end
end
end