nobu	2012-03-15 10:31:43 +0900 (Thu, 15 Mar 2012)

  New Revision: 35026

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35026

  Log:
    * test/ruby/test_arity.rb (TestArity#err_mess): use assert_raise.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_arity.rb
    trunk/test/ruby/test_object.rb
    trunk/test/ruby/test_require.rb
    trunk/test/ruby/test_thread.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35025)
+++ ChangeLog	(revision 35026)
@@ -1,3 +1,7 @@
+Thu Mar 15 10:31:40 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/test_arity.rb (TestArity#err_mess): use assert_raise.
+
 Thu Mar 15 07:03:52 2012  Eric Hodel  <drbrain@s...>
 
 	* vm_eval.c (check_funcall):  Raise ArgumentError if respond_to?
Index: test/ruby/test_arity.rb
===================================================================
--- test/ruby/test_arity.rb	(revision 35025)
+++ test/ruby/test_arity.rb	(revision 35026)
@@ -3,16 +3,16 @@
 class TestArity < Test::Unit::TestCase
   def err_mess(method_proc = nil, argc = 0)
     args = (1..argc).to_a
-    case method_proc
+    err = assert_raise(ArgumentError) do
+      case method_proc
       when nil
         yield
       when Symbol
         method(method_proc).call(*args)
       else
         method_proc.call(*args)
+      end
     end
-    fail "Expected ArgumentError to be raised"
-  rescue ArgumentError => err
     s = err.to_s
     assert s =~ /wrong number of arguments \((.*)\)/, "Unexpected ArgumentError's message: #{s}"
     $1

Property changes on: test/ruby/test_arity.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 35025)
+++ test/ruby/test_require.rb	(revision 35026)
@@ -7,7 +7,7 @@
 class TestRequire < Test::Unit::TestCase
   def test_load_error_path
     filename = "should_not_exist"
-    error = assert_raises(LoadError) do
+    error = assert_raise(LoadError) do
       require filename
     end
     assert_equal filename, error.path
Index: test/ruby/test_object.rb
===================================================================
--- test/ruby/test_object.rb	(revision 35025)
+++ test/ruby/test_object.rb	(revision 35026)
@@ -471,11 +471,11 @@
       end
     end
 
-    e = assert_raises(ArgumentError, '[bug:6000]') do
+    e = assert_raise(ArgumentError, '[bug:6000]') do
       [[p]].flatten
     end
 
-    assert_equal('respond_to? must accept 1 or 2 arguments (requires 3)',                        e.message)
+    assert_equal('respond_to? must accept 1 or 2 arguments (requires 3)', e.message)
   end
 
   def test_method_missing_passed_block
Index: test/ruby/test_thread.rb
===================================================================
--- test/ruby/test_thread.rb	(revision 35025)
+++ test/ruby/test_thread.rb	(revision 35026)
@@ -137,7 +137,7 @@
 #    mutex = Mutex.new
 #    cv = ConditionVariable.new
 #
-#    assert_raises(fatal) {
+#    assert_raise(fatal) {
 #      mutex.lock
 #      cv.wait mutex
 #      mutex.unlock

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/