Make sure tests that change Zip defaults reset properly.

This commit is contained in:
Robert Haines 2020-06-20 17:34:57 +01:00
parent 0620fba13d
commit 5201cd2ea3
6 changed files with 15 additions and 4 deletions

View File

@ -7,7 +7,7 @@ class ZipCaseSensitivityTest < MiniTest::Test
['test/data/file2.txt', 'testFILE.rb']] ['test/data/file2.txt', 'testFILE.rb']]
def teardown def teardown
::Zip.case_insensitive_match = false ::Zip.reset!
end end
# Ensure that everything functions normally when +case_insensitive_match = false+ # Ensure that everything functions normally when +case_insensitive_match = false+

View File

@ -8,6 +8,10 @@ class DeflaterTest < MiniTest::Test
DEFAULT_COMP_FILE = 'test/data/generated/compressiontest_default_compression.bin' DEFAULT_COMP_FILE = 'test/data/generated/compressiontest_default_compression.bin'
NO_COMP_FILE = 'test/data/generated/compressiontest_no_compression.bin' NO_COMP_FILE = 'test/data/generated/compressiontest_no_compression.bin'
def teardown
Zip.reset!
end
def test_output_operator def test_output_operator
txt = load_file('test/data/file2.txt') txt = load_file('test/data/file2.txt')
deflate(txt, DEFLATER_TEST_FILE) deflate(txt, DEFLATER_TEST_FILE)

View File

@ -5,12 +5,11 @@ class EncryptionTest < MiniTest::Test
INPUT_FILE1 = 'test/data/file1.txt' INPUT_FILE1 = 'test/data/file1.txt'
def setup def setup
@default_compression = Zip.default_compression
Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION
end end
def teardown def teardown
Zip.default_compression = @default_compression Zip.reset!
end end
def test_encrypt def test_encrypt

View File

@ -3,6 +3,10 @@ require 'test_helper'
class ZipEntryTest < MiniTest::Test class ZipEntryTest < MiniTest::Test
include ZipEntryData include ZipEntryData
def teardown
::Zip.reset!
end
def test_constructor_and_getters def test_constructor_and_getters
entry = ::Zip::Entry.new( entry = ::Zip::Entry.new(
TEST_ZIPFILE, TEST_NAME, TEST_ZIPFILE, TEST_NAME,

View File

@ -5,7 +5,7 @@ class ZipLocalEntryTest < MiniTest::Test
LEH_FILE = 'test/data/generated/localEntryHeader.bin' LEH_FILE = 'test/data/generated/localEntryHeader.bin'
def teardown def teardown
::Zip.write_zip64_support = false ::Zip.reset!
end end
def test_read_local_entry_header_of_first_test_zip_entry def test_read_local_entry_header_of_first_test_zip_entry

View File

@ -3,6 +3,10 @@ require 'test_helper'
class ZipUnicodeFileNamesAndComments < MiniTest::Test class ZipUnicodeFileNamesAndComments < MiniTest::Test
FILENAME = File.join(File.dirname(__FILE__), 'test1.zip') FILENAME = File.join(File.dirname(__FILE__), 'test1.zip')
def teardown
::Zip.reset!
end
def test_unicode_file_name def test_unicode_file_name
file_entrys = ['текстовыйфайл.txt', 'Résumé.txt', '슬레이어스휘.txt'] file_entrys = ['текстовыйфайл.txt', 'Résumé.txt', '슬레이어스휘.txt']
directory_entrys = ['папка/текстовыйфайл.txt', 'Résumé/Résumé.txt', '슬레이어스휘/슬레이어스휘.txt'] directory_entrys = ['папка/текстовыйфайл.txt', 'Résumé/Résumé.txt', '슬레이어스휘/슬레이어스휘.txt']