Use assert_raise and skip for test/unit

Author: aycabta

test/rdoc/test_rdoc_comment.rb

@@ -294,7 +294,7 @@ def test_text_equals_no_text
     c = RDoc::Comment.new nil, @top_level
     c.document = @RM::Document.new
 
-    e = assert_raises RDoc::Error do
+    e = assert_raise RDoc::Error do
       c.text = 'other'
     end
 

test/rdoc/test_rdoc_encoding.rb

@@ -171,7 +171,7 @@ def test_class_set_encoding_bad
 
     assert_nil encoding
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       s = RDoc::Encoding.detect_encoding "# -*- encoding: undecided -*-\n"
     end
   end

test/rdoc/test_rdoc_generator_json_index.rb

@@ -168,7 +168,7 @@ def test_generate_gzipped
     begin
       require 'zlib'
     rescue LoadError
-      omit "no zlib"
+      skip "no zlib"
     end
     @g.generate
     @g.generate_gzipped

test/rdoc/test_rdoc_i18n_locale.rb

@@ -32,7 +32,7 @@ def test_load_existent_po
     begin
       require 'gettext/po_parser'
     rescue LoadError
-      omit 'gettext gem is not found'
+      skip 'gettext gem is not found'
     end
 
     fr_locale_dir = File.join @locale_dir, 'fr'

test/rdoc/test_rdoc_markdown.rb

@@ -717,7 +717,7 @@ def test_parse_note_inline
   def test_parse_note_no_notes
     @parser.notes = false
 
-    assert_raises RDoc::Markdown::ParseError do
+    assert_raise RDoc::Markdown::ParseError do
       parse "Some text.[^1]"
     end
   end

test/rdoc/test_rdoc_markup_attribute_manager.rb

@@ -75,15 +75,15 @@ def test_add_word_pair
   end
 
   def test_add_word_pair_angle
-    e = assert_raises ArgumentError do
+    e = assert_raise ArgumentError do
       @am.add_word_pair '<', '>', 'angles'
     end
 
     assert_equal "Word flags may not start with '<'", e.message
   end
 
   def test_add_word_pair_invalid
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       @am.add_word_pair("<", "<", :TEST)
     end
   end

test/rdoc/test_rdoc_markup_document.rb

@@ -34,7 +34,7 @@ def test_append_string
 
     assert_empty @d
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       @d << 'hi'
     end
   end

test/rdoc/test_rdoc_markup_parser.rb

@@ -1087,7 +1087,7 @@ def test_skip
 
     assert_equal [:NEWLINE, "\n", 9, 0], parser.peek_token
 
-    assert_raises RDoc::Markup::Parser::ParseError do
+    assert_raise RDoc::Markup::Parser::ParseError do
       parser.skip :NONE
     end
 
@@ -1661,7 +1661,7 @@ def test_unget
 
     assert_equal [:HEADER, 1, 0, 0], parser.peek_token
 
-    assert_raises @RMP::Error do
+    assert_raise @RMP::Error do
       parser.unget
     end
 

test/rdoc/test_rdoc_options.rb

@@ -17,8 +17,8 @@ def teardown
   end
 
   def test_check_files
-    omit "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
-    omit "assumes that euid is not root" if Process.euid == 0
+    skip "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
+    skip "assumes that euid is not root" if Process.euid == 0
 
     out, err = capture_output do
       temp_dir do
@@ -288,7 +288,7 @@ def test_parse_encoding_invalid
   end
 
   def test_parse_formatter
-    e = assert_raises OptionParser::InvalidOption do
+    e = assert_raise OptionParser::InvalidOption do
       @options.parse %w[--format darkfish --format ri]
     end
 
@@ -297,7 +297,7 @@ def test_parse_formatter
   end
 
   def test_parse_formatter_ri
-    e = assert_raises OptionParser::InvalidOption do
+    e = assert_raise OptionParser::InvalidOption do
       @options.parse %w[--format darkfish --ri]
     end
 
@@ -306,7 +306,7 @@ def test_parse_formatter_ri
 
     @options = RDoc::Options.new
 
-    e = assert_raises OptionParser::InvalidOption do
+    e = assert_raise OptionParser::InvalidOption do
       @options.parse %w[--format darkfish -r]
     end
 
@@ -315,7 +315,7 @@ def test_parse_formatter_ri
   end
 
   def test_parse_formatter_ri_site
-    e = assert_raises OptionParser::InvalidOption do
+    e = assert_raise OptionParser::InvalidOption do
       @options.parse %w[--format darkfish --ri-site]
     end
 
@@ -324,7 +324,7 @@ def test_parse_formatter_ri_site
 
     @options = RDoc::Options.new
 
-    e = assert_raises OptionParser::InvalidOption do
+    e = assert_raise OptionParser::InvalidOption do
       @options.parse %w[--format darkfish -R]
     end
 
@@ -417,7 +417,7 @@ def test_parse_ignore_invalid_default
 
   def test_parse_ignore_invalid_no
     out, err = capture_output do
-      assert_raises SystemExit do
+      assert_raise SystemExit do
         @options.parse %w[--no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
       end
     end
@@ -430,7 +430,7 @@ def test_parse_ignore_invalid_no
 
   def test_parse_ignore_invalid_no_quiet
     out, err = capture_output do
-      assert_raises SystemExit do
+      assert_raise SystemExit do
         @options.parse %w[--quiet --no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
       end
     end
@@ -631,7 +631,7 @@ def test_parse_write_options
     FileUtils.mkdir_p tmpdir
 
     Dir.chdir tmpdir do
-      e = assert_raises SystemExit do
+      e = assert_raise SystemExit do
         @options.parse %w[--write-options]
       end
 

test/rdoc/test_rdoc_parser.rb

@@ -104,7 +104,7 @@ def test_class_for_executable
   end
 
   def test_class_for_forbidden
-    omit 'chmod not supported' if Gem.win_platform?
+    skip 'chmod not supported' if Gem.win_platform?
 
     tf = Tempfile.open 'forbidden' do |io|
       begin