From 33d09499029e1d8a91e42c5548315a30a4a1df38 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 8 Jan 2017 15:31:51 +0900 Subject: [PATCH 1/3] Fix warnings: `Use assert_nil if expecting nil` --- test/central_directory_entry_test.rb | 2 +- test/crypto/null_encryption_test.rb | 8 ++++++-- test/entry_set_test.rb | 4 ++-- test/entry_test.rb | 4 ++-- test/filesystem/file_nonmutating_test.rb | 6 +++--- test/filesystem/file_stat_test.rb | 2 +- test/input_stream_test.rb | 8 ++++---- test/ioextras/abstract_input_stream_test.rb | 2 +- test/local_entry_test.rb | 2 +- test/test_helper.rb | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/test/central_directory_entry_test.rb b/test/central_directory_entry_test.rb index dede5f2e..35a16cde 100644 --- a/test/central_directory_entry_test.rb +++ b/test/central_directory_entry_test.rb @@ -37,7 +37,7 @@ def test_read_from_stream assert_equal('', entry.comment) entry = ::Zip::Entry.read_c_dir_entry(file) - assert_equal(nil, entry) + assert_nil(entry) # Fields that are not check by this test: # version made by 2 bytes # version needed to extract 2 bytes diff --git a/test/crypto/null_encryption_test.rb b/test/crypto/null_encryption_test.rb index 01a34ee4..ca039962 100644 --- a/test/crypto/null_encryption_test.rb +++ b/test/crypto/null_encryption_test.rb @@ -18,7 +18,9 @@ def test_header end def test_encrypt - [nil, '', 'a' * 10, 0xffffffff].each do |data| + assert_nil @encrypter.encrypt(nil) + + ['', 'a' * 10, 0xffffffff].each do |data| assert_equal data, @encrypter.encrypt(data) end end @@ -42,7 +44,9 @@ def test_gp_flags end def test_decrypt - [nil, '', 'a' * 10, 0xffffffff].each do |data| + assert_nil @decrypter.decrypt(nil) + + ['', 'a' * 10, 0xffffffff].each do |data| assert_equal data, @decrypter.decrypt(data) end end diff --git a/test/entry_set_test.rb b/test/entry_set_test.rb index 287d97a0..6501ab86 100644 --- a/test/entry_set_test.rb +++ b/test/entry_set_test.rb @@ -76,7 +76,7 @@ def test_find_entry ::Zip.case_insensitive_match = false zipEntrySet = ::Zip::EntrySet.new(entries) assert_equal(entries[0], zipEntrySet.find_entry('MiXeDcAsEnAmE')) - assert_equal(nil, zipEntrySet.find_entry('mixedcasename')) + assert_nil(zipEntrySet.find_entry('mixedcasename')) end def test_entries_with_sort @@ -123,7 +123,7 @@ def test_parent ] entrySet = ::Zip::EntrySet.new(entries) - assert_equal(nil, entrySet.parent(entries[0])) + assert_nil(entrySet.parent(entries[0])) assert_equal(entries[0], entrySet.parent(entries[1])) assert_equal(entries[1], entrySet.parent(entries[2])) end diff --git a/test/entry_test.rb b/test/entry_test.rb index 1206f71c..b49783d3 100644 --- a/test/entry_test.rb +++ b/test/entry_test.rb @@ -109,8 +109,8 @@ def test_parent_as_string entry5 = ::Zip::Entry.new('zf.zip', 'aa/bb/cc') entry6 = ::Zip::Entry.new('zf.zip', 'aa/bb/cc/') - assert_equal(nil, entry1.parent_as_string) - assert_equal(nil, entry2.parent_as_string) + assert_nil(entry1.parent_as_string) + assert_nil(entry2.parent_as_string) assert_equal('aa/', entry3.parent_as_string) assert_equal('aa/', entry4.parent_as_string) assert_equal('aa/bb/', entry5.parent_as_string) diff --git a/test/filesystem/file_nonmutating_test.rb b/test/filesystem/file_nonmutating_test.rb index 50184b78..e8242258 100644 --- a/test/filesystem/file_nonmutating_test.rb +++ b/test/filesystem/file_nonmutating_test.rb @@ -103,12 +103,12 @@ def test_size end def test_size? - assert_equal(nil, @zip_file.file.size?('notAFile')) + assert_nil(@zip_file.file.size?('notAFile')) assert_equal(72, @zip_file.file.size?('file1')) - assert_equal(nil, @zip_file.file.size?('dir2/dir21')) + assert_nil(@zip_file.file.size?('dir2/dir21')) assert_equal(72, @zip_file.file.stat('file1').size?) - assert_equal(nil, @zip_file.file.stat('dir2/dir21').size?) + assert_nil(@zip_file.file.stat('dir2/dir21').size?) end def test_file? diff --git a/test/filesystem/file_stat_test.rb b/test/filesystem/file_stat_test.rb index 93ff41ab..51e60d9c 100644 --- a/test/filesystem/file_stat_test.rb +++ b/test/filesystem/file_stat_test.rb @@ -11,7 +11,7 @@ def teardown end def test_blocks - assert_equal(nil, @zip_file.file.stat('file1').blocks) + assert_nil(@zip_file.file.stat('file1').blocks) end def test_ino diff --git a/test/input_stream_test.rb b/test/input_stream_test.rb index ade19e44..3a31684d 100644 --- a/test/input_stream_test.rb +++ b/test/input_stream_test.rb @@ -75,12 +75,12 @@ def test_incomplete_reads entry = zis.get_next_entry # empty.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[1], entry.name) assert_equal(0, entry.size) - assert_equal(nil, zis.gets) + assert_nil(zis.gets) assert_equal(true, zis.eof?) entry = zis.get_next_entry # empty_chmod640.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[2], entry.name) assert_equal(0, entry.size) - assert_equal(nil, zis.gets) + assert_nil(zis.gets) assert_equal(true, zis.eof?) entry = zis.get_next_entry # short.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[3], entry.name) @@ -102,12 +102,12 @@ def test_incomplete_reads_from_string_io entry = zis.get_next_entry # empty.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[1], entry.name) assert_equal(0, entry.size) - assert_equal(nil, zis.gets) + assert_nil(zis.gets) assert_equal(true, zis.eof?) entry = zis.get_next_entry # empty_chmod640.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[2], entry.name) assert_equal(0, entry.size) - assert_equal(nil, zis.gets) + assert_nil(zis.gets) assert_equal(true, zis.eof?) entry = zis.get_next_entry # short.txt assert_equal(TestZipFile::TEST_ZIP2.entry_names[3], entry.name) diff --git a/test/ioextras/abstract_input_stream_test.rb b/test/ioextras/abstract_input_stream_test.rb index c0d9688a..3ae005d1 100644 --- a/test/ioextras/abstract_input_stream_test.rb +++ b/test/ioextras/abstract_input_stream_test.rb @@ -44,7 +44,7 @@ def test_gets assert_equal(2, @io.lineno) assert_equal(TEST_LINES[2], @io.gets) assert_equal(3, @io.lineno) - assert_equal(nil, @io.gets) + assert_nil(@io.gets) assert_equal(4, @io.lineno) end diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb index 57d63447..666a63a0 100644 --- a/test/local_entry_test.rb +++ b/test/local_entry_test.rb @@ -36,7 +36,7 @@ def test_read_date_time def test_read_local_entry_from_non_zip_file ::File.open('test/data/file2.txt') do |file| - assert_equal(nil, ::Zip::Entry.read_local_entry(file)) + assert_nil(::Zip::Entry.read_local_entry(file)) end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 02615712..c7cbfb95 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -134,7 +134,7 @@ def assert_stream_contents(zis, testZipFile) testZipFile.entry_names.each do |entryName| assert_next_entry(entryName, zis) end - assert_equal(nil, zis.get_next_entry) + assert_nil(zis.get_next_entry) end def assert_test_zip_contents(testZipFile) From 7c250c012798f80c2d42564b05c1f1e0d34b91cd Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 8 Jan 2017 15:37:41 +0900 Subject: [PATCH 2/3] Fix warning: `::[] is deprecated. Use ::new instead.` --- .simplecov | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.simplecov b/.simplecov index b205ee26..770d7dc6 100644 --- a/.simplecov +++ b/.simplecov @@ -1,9 +1,9 @@ require 'coveralls' -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ +SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter -] +]) SimpleCov.start do add_filter '/test' end From 960414aff06e4dac1895849348361b7505cb8ee6 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sun, 8 Jan 2017 15:38:14 +0900 Subject: [PATCH 3/3] Fix warnings: `constant ::Fixnum is deprecated` in Ruby 2.4 --- lib/zip/ioextras/abstract_output_stream.rb | 4 ++-- test/ioextras/fake_io_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/zip/ioextras/abstract_output_stream.rb b/lib/zip/ioextras/abstract_output_stream.rb index 1bfd553a..c1246f97 100644 --- a/lib/zip/ioextras/abstract_output_stream.rb +++ b/lib/zip/ioextras/abstract_output_stream.rb @@ -20,12 +20,12 @@ def printf(a_format_string, *params) def putc(an_object) self << case an_object - when Fixnum + when Integer an_object.chr when String an_object else - raise TypeError, 'putc: Only Fixnum and String supported' + raise TypeError, 'putc: Only Integer and String supported' end an_object end diff --git a/test/ioextras/fake_io_test.rb b/test/ioextras/fake_io_test.rb index 00726c48..612f442f 100644 --- a/test/ioextras/fake_io_test.rb +++ b/test/ioextras/fake_io_test.rb @@ -12,7 +12,7 @@ def test_kind_of? assert(obj.kind_of?(Object)) assert(obj.kind_of?(FakeIOUsingClass)) assert(obj.kind_of?(IO)) - assert(!obj.kind_of?(Fixnum)) + assert(!obj.kind_of?(Integer)) assert(!obj.kind_of?(String)) end end