* test: assert_raises has been deprecated since a long time ago.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 9 deletions

diff --git a/test/optparse/test_noarg.rb b/test/optparse/test_noarg.rb
index 28c469093..329956a61 100644
--- a/test/optparse/test_noarg.rb
+++ b/test/optparse/test_noarg.rb
@@ -18,7 +18,7 @@ module TestOptionParser::NoArg
   end
 
   def test_short
-    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-x")})
     assert_equal(true, @flag)
     @flag = nil
@@ -27,11 +27,11 @@ module TestOptionParser::NoArg
   end
 
   def test_abbrev
-    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-o")})
     assert_equal(true, @flag)
     @flag = nil
-    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-O")}
+    assert_raise(OptionParser::InvalidOption) {@opt.parse!(%w"-O")}
     assert_nil(@flag)
     @flag = nil
     assert_equal(%w"foo", no_error {@opt.parse!(%w"-o foo")})
@@ -39,7 +39,7 @@ module TestOptionParser::NoArg
   end
 
   def test_long
-    assert_raises(OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
+    assert_raise(OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
     assert_equal(true, @flag)
     @flag = nil
@@ -49,8 +49,8 @@ module TestOptionParser::NoArg
 
   def test_ambiguous
     @opt.def_option("--open") {|x|}
-    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
-    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
+    assert_raise(OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
+    assert_raise(OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
     assert_equal(true, @flag)
   end
diff --git a/test/optparse/test_reqarg.rb b/test/optparse/test_reqarg.rb
index 0999e5e60..4ce9dd629 100644
--- a/test/optparse/test_reqarg.rb
+++ b/test/optparse/test_reqarg.rb
@@ -32,7 +32,7 @@ module TestOptionParser::ReqArg
   end
 
   def test_short
-    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"-x")}
+    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"-x")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"", no_error {@opt.parse!(%w"-xbar")})
@@ -42,7 +42,7 @@ module TestOptionParser::ReqArg
   end
 
   def test_abbrev
-    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"-o")}
+    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"-o")}
     assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"", no_error {@opt.parse!(%w"-obar")})
@@ -52,7 +52,7 @@ module TestOptionParser::ReqArg
   end
 
   def test_long
-    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"--opt")}
+    assert_raise(OptionParser::MissingArgument) {@opt.parse!(%w"--opt")}
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt foo")})
     assert_equal("foo", @flag)
     assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})