From 289d6bb30f4c2fffa2437436030c889f10522e72 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Oct 2013 08:41:13 +0000
Subject: test: use assert_raise

* test/ruby, test/-ext-: use assert_raise instead of assert_raises.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/-ext-/tracepoint/test_tracepoint.rb                 | 2 +-
 test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb | 2 +-
 test/ruby/test_file.rb                                   | 2 +-
 test/ruby/test_hash.rb                                   | 2 +-
 test/ruby/test_module.rb                                 | 6 +++---
 test/ruby/test_thread.rb                                 | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb
index a4cb2882ed..f7a0f6c783 100644
--- a/test/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/-ext-/tracepoint/test_tracepoint.rb
@@ -3,7 +3,7 @@ require '-test-/tracepoint'
 
 class TestTracepointObj < Test::Unit::TestCase
   def test_not_available_from_ruby
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       TracePoint.trace(:obj_new){}
     end
   end
diff --git a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb b/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
index e181068611..e88dbefac6 100644
--- a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
+++ b/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
@@ -27,7 +27,7 @@ class TestWaitForSingleFD < Test::Unit::TestCase
     with_pipe do |r,w|
       wfd = w.fileno
       w.close
-      assert_raises(Errno::EBADF) do
+      assert_raise(Errno::EBADF) do
         IO.wait_for_single_fd(wfd, RB_WAITFD_OUT, nil)
       end
     end
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 25ad11c64f..4a1f03cb00 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -339,7 +339,7 @@ class TestFile < Test::Unit::TestCase
   end
 
   def test_file_open_double_mode
-    e = assert_raises(ArgumentError) { File.open("a", 'w', :mode => 'rw+') }
+    e = assert_raise(ArgumentError) { File.open("a", 'w', :mode => 'rw+') }
     assert_equal 'mode specified twice', e.message
   end
 
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 21fbf410ff..9bbe48cf33 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -99,7 +99,7 @@ class TestHash < Test::Unit::TestCase
         super(Object.new)
       end
     }.new
-    assert_raises(TypeError) { h.dup }
+    assert_raise(TypeError) { h.dup }
   end
 
   def test_clear_initialize_copy
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 144b75d9f7..ddaf6777b4 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -248,7 +248,7 @@ class TestModule < Test::Unit::TestCase
       ":",
       ["String::", "[Bug #7573]"],
     ].each do |name, msg|
-      e = assert_raises(NameError, "#{msg}#{': ' if msg}wrong constant name #{name.dump}") {
+      e = assert_raise(NameError, "#{msg}#{': ' if msg}wrong constant name #{name.dump}") {
         Object.const_get name
       }
       assert_equal("wrong constant name %s" % name, e.message)
@@ -296,7 +296,7 @@ class TestModule < Test::Unit::TestCase
   end
 
   def test_nested_bad_class
-    assert_raises(TypeError) do
+    assert_raise(TypeError) do
       self.class.const_get([User, 'USER', 'Foo'].join('::'))
     end
   end
@@ -1656,7 +1656,7 @@ class TestModule < Test::Unit::TestCase
       @@foo
       $foo
     ].each do |name|
-      assert_raises(NameError) do
+      assert_raise(NameError) do
         Module.new { attr_accessor name.to_sym }
       end
     end
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index ca3ab08e63..260c654287 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -83,7 +83,7 @@ class TestThread < Test::Unit::TestCase
   def test_thread_variable_frozen
     t = Thread.new { }.join
     t.freeze
-    assert_raises(RuntimeError) do
+    assert_raise(RuntimeError) do
       t.thread_variable_set(:foo, "bar")
     end
   end
@@ -748,13 +748,13 @@ _eom
   end
 
   def test_thread_join_current
-    assert_raises(ThreadError) do
+    assert_raise(ThreadError) do
       Thread.current.join
     end
   end
 
   def test_thread_join_main_thread
-    assert_raises(ThreadError) do
+    assert_raise(ThreadError) do
       Thread.new(Thread.current) {|t|
         t.join
       }.join
-- 
cgit v1.2.3