root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Style/NonNilCheck cop. 

Use the `refute_nil` method for most of these.
This commit is contained in:
Robert Haines 2019-09-15 19:01:57 +01:00
parent 5a1baf46ab
commit b3c4c37882
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.rubocop_todo.yml
View File

@ -252,15 +252,6 @@ Style/Next:
Exclude:
- 'lib/zip/entry.rb'
# Offense count: 7
# Cop supports --auto-correct.
# Configuration parameters: IncludeSemanticChanges.
Style/NonNilCheck:
Exclude:
- 'test/case_sensitivity_test.rb'
- 'test/file_test.rb'
- 'test/settings_test.rb'
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedOctalStyle.

2
test/case_sensitivity_test.rb
View File

@ -63,7 +63,7 @@ class ZipCaseSensitivityTest < MiniTest::Test
private
def assert_contains(zf, entryName, filename = entryName)
assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
refute_nil(zf.entries.detect { |e| e.name == entryName }, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
assert_entry_contents(zf, entryName, filename) if File.exist?(filename)
end
end

16
test/file_test.rb
View File

@ -432,8 +432,8 @@ class ZipFileTest < MiniTest::Test
zf.commit
zfRead = ::Zip::File.new(TEST_ZIP.zip_name)
assert(zfRead.entries.detect { |e| e.name == newName } != nil)
assert(zfRead.entries.detect { |e| e.name == oldName }.nil?)
refute_nil(zfRead.entries.detect { |e| e.name == newName })
assert_nil(zfRead.entries.detect { |e| e.name == oldName })
zfRead.close
zf.close
@ -451,8 +451,8 @@ class ZipFileTest < MiniTest::Test
zf.commit
zf.close
zf2 = ::Zip::File.open(filename)
assert(zf2.entries.detect { |e| e.name == 'test1.txt' } != nil)
assert(zf2.entries.detect { |e| e.name == 'test2.txt' } != nil)
refute_nil(zf2.entries.detect { |e| e.name == 'test1.txt' })
refute_nil(zf2.entries.detect { |e| e.name == 'test2.txt' })
res = system("unzip -tqq #{filename}")
assert_equal(res, true)
end
@ -471,8 +471,8 @@ class ZipFileTest < MiniTest::Test
buffer = zf.write_buffer(io)
File.open(TEST_ZIP.zip_name, 'wb') { |f| f.write buffer.string }
zfRead = ::Zip::File.new(TEST_ZIP.zip_name)
assert(zfRead.entries.detect { |e| e.name == newName } != nil)
assert(zfRead.entries.detect { |e| e.name == oldName }.nil?)
refute_nil(zfRead.entries.detect { |e| e.name == newName })
assert_nil(zfRead.entries.detect { |e| e.name == oldName })
zfRead.close
zf.close
@ -678,11 +678,11 @@ class ZipFileTest < MiniTest::Test
private
def assert_contains(zf, entryName, filename = entryName)
assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
refute_nil(zf.entries.detect { |e| e.name == entryName }, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
assert_entry_contents(zf, entryName, filename) if File.exist?(filename)
end
def assert_not_contains(zf, entryName)
assert(zf.entries.detect { |e| e.name == entryName }.nil?, "entry #{entryName} in #{zf.entries.join(', ')} in zip file #{zf}")
assert_nil(zf.entries.detect { |e| e.name == entryName }, "entry #{entryName} in #{zf.entries.join(', ')} in zip file #{zf}")
end
end

4
test/settings_test.rb
View File

@ -18,7 +18,7 @@ class ZipSettingsTest < MiniTest::Test
end
def open_zip(&aProc)
assert(!aProc.nil?)
refute_nil(aProc)
::Zip::File.open(TestZipFile::TEST_ZIP4.zip_name, &aProc)
end
@ -89,7 +89,7 @@ class ZipSettingsTest < MiniTest::Test
private
def assert_contains(zf, entryName, filename = entryName)
assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
refute_nil(zf.entries.detect { |e| e.name == entryName }, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
assert_entry_contents(zf, entryName, filename) if File.exist?(filename)
end
end