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

  throw won't raise NameError nor ThreadError but ArgumentError on 1.9.
  (Test::Unit::Assertions#assert_not_throws): ditto.

* test/testunit/test_assertions.rb: add assertions for throwing some
  objects other than Symbol.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 36 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d73edbe1e6..5234322e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Dec 29 04:46:58 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throws):
+	  throw won't raise NameError nor ThreadError but ArgumentError on 1.9.
+	  (Test::Unit::Assertions#assert_not_throws): ditto.
+
+	* test/testunit/test_assertions.rb: add assertions for throwing some
+	  objects other than Symbol.
+
 Sat Dec 29 03:10:12 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (io_unread): fix typo.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 0d55b0b068..7c2c721fc1 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -369,11 +369,12 @@ EOT
         end
       end
 
-      UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
-                       ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
+      UncaughtThrow = {
+        ArgumentError => /^uncaught throw (.+)$/,
+      } #`
 
       ##
-      # Passes if the block throws +expected_symbol+
+      # Passes if the block throws +expected_value+
       #
       # Example:
       #   assert_throws :done do
@@ -381,23 +382,22 @@ EOT
       #   end
 
       public
-      def assert_throws(expected_symbol, message="", &proc)
+      def assert_throws(expected_value, message="", &proc)
         _wrap_assertion do
-          assert_instance_of(Symbol, expected_symbol, "assert_throws expects the symbol that should be thrown for its first argument")
           assert_block("Should have passed a block to assert_throws."){block_given?}
           caught = true
           begin
-            catch(expected_symbol) do
+            catch(expected_value) do
               proc.call
               caught = false
             end
-            full_message = build_message(message, "<?> should have been thrown.", expected_symbol)
+            full_message = build_message(message, "<?> should have been thrown.", expected_value)
             assert_block(full_message){caught}
-          rescue NameError, ThreadError => error
+          rescue ArgumentError => error
             if UncaughtThrow[error.class] !~ error.message
               raise error
             end
-            full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.intern)
+            full_message = build_message(message, "<?> expected to be thrown but\n<#$1> was thrown.", expected_value)
             flunk(full_message)
           end
         end
@@ -417,11 +417,11 @@ EOT
           assert(block_given?, "Should have passed a block to assert_nothing_thrown")
           begin
             proc.call
-          rescue NameError, ThreadError => error
+          rescue ArgumentError => error
             if UncaughtThrow[error.class] !~ error.message
               raise error
             end
-            full_message = build_message(message, "<?> was thrown when nothing was expected", $1.intern)
+            full_message = build_message(message, "<#$1> was thrown when nothing was expected")
             flunk(full_message)
           end
           assert(true, "Expected nothing to be thrown")
diff --git a/test/testunit/test_assertions.rb b/test/testunit/test_assertions.rb
index 19b4963946..d39c089b39 100644
--- a/test/testunit/test_assertions.rb
+++ b/test/testunit/test_assertions.rb
@@ -403,6 +403,22 @@ Message: <"Error">
             throw :thing
           }
         }
+        check_nothing_fails {
+          assert_throws(0, "message") {
+            throw 0
+          }
+        }
+        obj = Object.new
+        check_nothing_fails {
+          assert_throws(obj, "message") {
+            throw obj
+          }
+        }
+        check_fails("message.\n<\"string\"> expected to be thrown but\n<\"string\"> was thrown.") {
+          assert_throws("string", "message") {
+            throw "string"
+          }
+        }
         check_fails("message.\n<:thing> expected to be thrown but\n<:thing2> was thrown.") {
           assert_throws(:thing, "message") {
             throw :thing2