Fix Style/SignalException cop.

hainesr · Sep 26, 2019 · 9005351 · 9005351
1 parent b9e6e95
commit 9005351
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/.rubocop_rubyzip.yml b/.rubocop_rubyzip.yml
@@ -181,19 +181,6 @@ Style/SafeNavigation:
     - 'test/filesystem/file_stat_test.rb'
     - 'test/test_helper.rb'
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'test/central_directory_entry_test.rb'
-    - 'test/central_directory_test.rb'
-    - 'test/filesystem/file_nonmutating_test.rb'
-    - 'test/ioextras/abstract_input_stream_test.rb'
-    - 'test/local_entry_test.rb'
-    - 'test/test_helper.rb'
-
 # Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

diff --git a/test/central_directory_entry_test.rb b/test/central_directory_entry_test.rb
@@ -63,7 +63,7 @@ def test_read_entry_from_truncated_zip_file
     fragment.extend(IOizeString)
     entry = ::Zip::Entry.new
     entry.read_c_dir_entry(fragment)
-    fail 'ZipError expected'
+    raise 'ZipError expected'
   rescue ::Zip::Error
   end
 end
diff --git a/test/central_directory_test.rb b/test/central_directory_test.rb
@@ -22,7 +22,7 @@ def test_read_from_invalid_stream
       cdir = ::Zip::CentralDirectory.new
       cdir.read_from_stream(zipFile)
     end
-    fail 'ZipError expected!'
+    raise 'ZipError expected!'
   rescue ::Zip::Error
   end
 
@@ -33,7 +33,7 @@ def test_read_from_truncated_zip_file
     fragment.extend(IOizeString)
     entry = ::Zip::CentralDirectory.new
     entry.read_from_stream(fragment)
-    fail 'ZipError expected'
+    raise 'ZipError expected'
   rescue ::Zip::Error
   end
 

diff --git a/test/filesystem/file_nonmutating_test.rb b/test/filesystem/file_nonmutating_test.rb
@@ -80,7 +80,7 @@ def test_new
     end
     begin
       is = @zip_file.file.new('file1') do
-        fail 'should not call block'
+        raise 'should not call block'
       end
     ensure
       is.close if is

diff --git a/test/ioextras/abstract_input_stream_test.rb b/test/ioextras/abstract_input_stream_test.rb
@@ -95,7 +95,7 @@ def test_readline
     test_gets
     begin
       @io.readline
-      fail 'EOFError expected'
+      raise 'EOFError expected'
     rescue EOFError
     end
   end

diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
@@ -46,7 +46,7 @@ def test_read_local_entry_from_truncated_zip_file
     zipFragment.extend(IOizeString).reset
     entry = ::Zip::Entry.new
     entry.read_local_entry(zipFragment)
-    fail 'ZipError expected'
+    raise 'ZipError expected'
   rescue ::Zip::Error
   end
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -106,7 +106,7 @@ def assert_entry_contents_for_stream(filename, zis, entryName)
         if (expected && actual) && (expected.length > 400 || actual.length > 400)
           zipEntryFilename = entryName + '.zipEntry'
           File.open(zipEntryFilename, 'wb') { |entryfile| entryfile << actual }
-          fail("File '#{filename}' is different from '#{zipEntryFilename}'")
+          raise("File '#{filename}' is different from '#{zipEntryFilename}'")
         else
           assert_equal(expected, actual)
         end
@@ -122,7 +122,7 @@ def self.assert_contents(filename, aString)
     if fileContents.length > 400 || aString.length > 400
       stringFile = filename + '.other'
       File.open(stringFile, 'wb') { |f| f << aString }
-      fail("File '#{filename}' is different from contents of string stored in '#{stringFile}'")
+      raise("File '#{filename}' is different from contents of string stored in '#{stringFile}'")
     else
       assert_equal(fileContents, aString)
     end