From ae042f21fb695fc80eb19273fa542e8dad85f19f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 2 Jun 2015 02:18:44 +0000
Subject: use assert_raise

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/optparse/test_acceptable.rb | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'test/optparse')

diff --git a/test/optparse/test_acceptable.rb b/test/optparse/test_acceptable.rb
index 6ec619ef8c..ee8479cc1e 100644
--- a/test/optparse/test_acceptable.rb
+++ b/test/optparse/test_acceptable.rb
@@ -32,19 +32,19 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--integer 0x3")})
     assert_equal(3, @integer)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 0b")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 09")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 0x")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--integer 1234xyz")
     end
   end
@@ -65,11 +65,11 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--float 1E-2")})
     assert_in_epsilon(0.01, @float)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--float 0e")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--float 1.234xyz")
     end
   end
@@ -87,15 +87,15 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 1.2/2.3")})
     assert_equal(Rational(12, 23), @numeric)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 1/")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 12/34xyz")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--numeric 12x/34yz")
     end
   end
@@ -107,21 +107,21 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-integer 10")})
     assert_equal(10, @decimal_integer)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 0b1")
     end
 
-    e = assert_raises(OptionParser::InvalidArgument) do
+    e = assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 09")
     end
 
     assert_equal("invalid argument: --decimal-integer 09", e.message)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer x")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 1234xyz")
     end
   end
@@ -142,19 +142,19 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 011")})
     assert_equal(9, @octal_integer)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 09")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 0b1")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer x")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--octal-integer 01234xyz")
     end
   end
@@ -172,21 +172,21 @@ class TestOptionParser::Acceptable < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 1E2")})
     assert_in_delta(100.0, @decimal_numeric)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-numeric 0b1")
     end
 
-    e = assert_raises(OptionParser::InvalidArgument) do
+    e = assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-numeric 09")
     end
 
     assert_equal("invalid argument: --decimal-numeric 09", e.message)
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 1234xyz")
     end
 
-    assert_raises(OptionParser::InvalidArgument) do
+    assert_raise(OptionParser::InvalidArgument) do
       @opt.parse!(%w"--decimal-integer 12.34xyz")
     end
   end
-- 
cgit v1.2.3