use assert_raise

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

7 files changed, 22 insertions, 22 deletions

diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
index 56839e7b63..e9dcecef67 100644
--- a/test/fiddle/test_closure.rb
+++ b/test/fiddle/test_closure.rb
@@ -6,15 +6,15 @@ end
 module Fiddle
   class TestClosure < Fiddle::TestCase
     def test_argument_errors
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Closure.new(TYPE_INT, TYPE_INT)
       end
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Closure.new('foo', [TYPE_INT])
       end
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Closure.new(TYPE_INT, ['meow!'])
       end
     end
diff --git a/test/fiddle/test_cparser.rb b/test/fiddle/test_cparser.rb
index 4d4799d8d6..2810e393b2 100644
--- a/test/fiddle/test_cparser.rb
+++ b/test/fiddle/test_cparser.rb
@@ -60,7 +60,7 @@ module Fiddle
     end
 
     def test_undefined_ctype
-      assert_raises(DLError) { parse_ctype('DWORD') }
+      assert_raise(DLError) { parse_ctype('DWORD') }
     end
 
     def test_undefined_ctype_with_type_alias
@@ -92,7 +92,7 @@ module Fiddle
     end
 
     def test_struct_undefined
-      assert_raises(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
+      assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
     end
 
     def test_struct_undefined_with_type_alias
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
index 529aaa8baf..01ac09b52c 100644
--- a/test/fiddle/test_func.rb
+++ b/test/fiddle/test_func.rb
@@ -12,7 +12,7 @@ module Fiddle
 
     def test_syscall_with_tainted_string
       f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT)
-      assert_raises(SecurityError) do
+      assert_raise(SecurityError) do
         Thread.new {
           $SAFE = 1
           f.call("uname -rs".taint)
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index de7c9585f7..2e3a432ec3 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -23,15 +23,15 @@ module Fiddle
     end
 
     def test_argument_errors
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
       end
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Function.new(@libm['sin'], ['foo'], TYPE_DOUBLE)
       end
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         Function.new(@libm['sin'], [TYPE_DOUBLE], 'foo')
       end
     end
@@ -49,10 +49,10 @@ module Fiddle
       }.new(TYPE_INT, [TYPE_INT])
       func = Function.new(closure, [TYPE_INT], TYPE_INT)
 
-      assert_raises(ArgumentError) do
+      assert_raise(ArgumentError) do
         func.call(1,2,3)
       end
-      assert_raises(ArgumentError) do
+      assert_raise(ArgumentError) do
         func.call
       end
     end
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index 2480230829..54165f00af 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -15,8 +15,8 @@ module Fiddle
     end
 
     def test_static_sym_unknown
-      assert_raises(DLError) { Fiddle::Handle.sym('fooo') }
-      assert_raises(DLError) { Fiddle::Handle['fooo'] }
+      assert_raise(DLError) { Fiddle::Handle.sym('fooo') }
+      assert_raise(DLError) { Fiddle::Handle['fooo'] }
     end
 
     def test_static_sym
@@ -41,20 +41,20 @@ module Fiddle
     def test_sym_closed_handle
       handle = Fiddle::Handle.new(LIBC_SO)
       handle.close
-      assert_raises(DLError) { handle.sym("calloc") }
-      assert_raises(DLError) { handle["calloc"] }
+      assert_raise(DLError) { handle.sym("calloc") }
+      assert_raise(DLError) { handle["calloc"] }
     end
 
     def test_sym_unknown
       handle = Fiddle::Handle.new(LIBC_SO)
-      assert_raises(DLError) { handle.sym('fooo') }
-      assert_raises(DLError) { handle['fooo'] }
+      assert_raise(DLError) { handle.sym('fooo') }
+      assert_raise(DLError) { handle['fooo'] }
     end
 
     def test_sym_with_bad_args
       handle = Handle.new(LIBC_SO)
-      assert_raises(TypeError) { handle.sym(nil) }
-      assert_raises(TypeError) { handle[nil] }
+      assert_raise(TypeError) { handle.sym(nil) }
+      assert_raise(TypeError) { handle[nil] }
     end
 
     def test_sym
@@ -71,7 +71,7 @@ module Fiddle
     def test_handle_close_twice
       handle = Handle.new(LIBC_SO)
       handle.close
-      assert_raises(DLError) do
+      assert_raise(DLError) do
         handle.close
       end
     end
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index c83f50fe44..f94d67b459 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -44,7 +44,7 @@ module Fiddle
 
   class TestImport < TestCase
     def test_ensure_call_dlload
-      err = assert_raises(RuntimeError) do
+      err = assert_raise(RuntimeError) do
         Class.new do
           extend Importer
           extern "void *strcpy(char*, char*)"
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
index 3ea9bc86dd..ef54470943 100644
--- a/test/fiddle/test_pointer.rb
+++ b/test/fiddle/test_pointer.rb
@@ -105,7 +105,7 @@ module Fiddle
       ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
       assert_equal ptr, ptr2
 
-      assert_raises(Fiddle::DLError) do
+      assert_raise(Fiddle::DLError) do
         Pointer.to_ptr Struct.new(:to_ptr).new(nil)
       end
     end