From a603afc0eeafa45cd2349c250e69dfce69fe3b56 Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Sun, 19 Nov 2017 18:46:57 +0300 Subject: [PATCH] Rename some zip tests for consistency --- SWCompression.xcodeproj/project.pbxproj | 24 ++++++++++++------------ Tests/Test Files | 2 +- Tests/ZipTests.swift | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SWCompression.xcodeproj/project.pbxproj b/SWCompression.xcodeproj/project.pbxproj index e6503577..f859370b 100644 --- a/SWCompression.xcodeproj/project.pbxproj +++ b/SWCompression.xcodeproj/project.pbxproj @@ -302,7 +302,7 @@ 069DCEA31EB64D0300ADC374 /* test8.answer in Resources */ = {isa = PBXBuildFile; fileRef = 069DCE9A1EB64D0300ADC374 /* test8.answer */; }; 069DCEA41EB64D0300ADC374 /* test9.answer in Resources */ = {isa = PBXBuildFile; fileRef = 069DCE9B1EB64D0300ADC374 /* test9.answer */; }; 069EBC371F0837B7008D5EF3 /* test_zip_lzma.zip in Resources */ = {isa = PBXBuildFile; fileRef = 069EBC361F0837B7008D5EF3 /* test_zip_lzma.zip */; }; - 069F27701EDA0D5E00736269 /* TestUnicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = 069F276F1EDA0D5E00736269 /* TestUnicode.zip */; }; + 069F27701EDA0D5E00736269 /* test_unicode.zip in Resources */ = {isa = PBXBuildFile; fileRef = 069F276F1EDA0D5E00736269 /* test_unicode.zip */; }; 06A1727E1FA5C0D90048A89C /* LZMADecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A1727D1FA5C0D90048A89C /* LZMADecoder.swift */; }; 06A1727F1FA5C0D90048A89C /* LZMADecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A1727D1FA5C0D90048A89C /* LZMADecoder.swift */; }; 06A172801FA5C0D90048A89C /* LZMADecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06A1727D1FA5C0D90048A89C /* LZMADecoder.swift */; }; @@ -365,8 +365,8 @@ 06BB8F321E0C2C720079FB9E /* LZMA2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06BB8F2F1E0C2C720079FB9E /* LZMA2.swift */; }; 06BB8F331E0C2C720079FB9E /* LZMA2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06BB8F2F1E0C2C720079FB9E /* LZMA2.swift */; }; 06BD0D231E3D0C630054AA5C /* SWCompressionSourceCode.zip in Resources */ = {isa = PBXBuildFile; fileRef = 06BD0D201E3D0C630054AA5C /* SWCompressionSourceCode.zip */; }; - 06BD0D241E3D0C630054AA5C /* TestDataDescriptor.zip in Resources */ = {isa = PBXBuildFile; fileRef = 06BD0D211E3D0C630054AA5C /* TestDataDescriptor.zip */; }; - 06BD0D251E3D0C630054AA5C /* TestZip64.zip in Resources */ = {isa = PBXBuildFile; fileRef = 06BD0D221E3D0C630054AA5C /* TestZip64.zip */; }; + 06BD0D241E3D0C630054AA5C /* test_data_descriptor.zip in Resources */ = {isa = PBXBuildFile; fileRef = 06BD0D211E3D0C630054AA5C /* test_data_descriptor.zip */; }; + 06BD0D251E3D0C630054AA5C /* test_zip64.zip in Resources */ = {isa = PBXBuildFile; fileRef = 06BD0D221E3D0C630054AA5C /* test_zip64.zip */; }; 06BE1AD21DB410F100EE0F59 /* SWCompression.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06BE1AC81DB410F100EE0F59 /* SWCompression.framework */; }; 06CC187D1DE35269003532F5 /* test.zlib in Resources */ = {isa = PBXBuildFile; fileRef = 06CC185F1DE35269003532F5 /* test.zlib */; }; 06CC187F1DE35607003532F5 /* DeflateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CC187E1DE35607003532F5 /* DeflateTests.swift */; }; @@ -606,7 +606,7 @@ 069DCE9A1EB64D0300ADC374 /* test8.answer */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = test8.answer; sourceTree = ""; }; 069DCE9B1EB64D0300ADC374 /* test9.answer */ = {isa = PBXFileReference; lastKnownFileType = file; path = test9.answer; sourceTree = ""; }; 069EBC361F0837B7008D5EF3 /* test_zip_lzma.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_zip_lzma.zip; sourceTree = ""; }; - 069F276F1EDA0D5E00736269 /* TestUnicode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestUnicode.zip; sourceTree = ""; }; + 069F276F1EDA0D5E00736269 /* test_unicode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_unicode.zip; sourceTree = ""; }; 06A1727D1FA5C0D90048A89C /* LZMADecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LZMADecoder.swift; sourceTree = ""; }; 06A172821FA5D3770048A89C /* LZMA2Decoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LZMA2Decoder.swift; sourceTree = ""; }; 06A172871FA5DC460048A89C /* LZMAConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LZMAConstants.swift; sourceTree = ""; }; @@ -624,8 +624,8 @@ 06BAC5931F8CFF28002443F4 /* ZipEntryInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipEntryInfo.swift; sourceTree = ""; }; 06BB8F2F1E0C2C720079FB9E /* LZMA2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LZMA2.swift; sourceTree = ""; }; 06BD0D201E3D0C630054AA5C /* SWCompressionSourceCode.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SWCompressionSourceCode.zip; sourceTree = ""; }; - 06BD0D211E3D0C630054AA5C /* TestDataDescriptor.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestDataDescriptor.zip; sourceTree = ""; }; - 06BD0D221E3D0C630054AA5C /* TestZip64.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestZip64.zip; sourceTree = ""; }; + 06BD0D211E3D0C630054AA5C /* test_data_descriptor.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_data_descriptor.zip; sourceTree = ""; }; + 06BD0D221E3D0C630054AA5C /* test_zip64.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test_zip64.zip; sourceTree = ""; }; 06BE1AC81DB410F100EE0F59 /* SWCompression.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SWCompression.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 06BE1AD11DB410F100EE0F59 /* SWCompressionTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SWCompressionTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 06BE1AD81DB410F100EE0F59 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -925,10 +925,10 @@ 062313621F33B4280070A574 /* test_win.zip */, 0685E6231F123F0D008655AA /* test_zip_bzip2.zip */, 069EBC361F0837B7008D5EF3 /* test_zip_lzma.zip */, - 069F276F1EDA0D5E00736269 /* TestUnicode.zip */, + 069F276F1EDA0D5E00736269 /* test_unicode.zip */, 06BD0D201E3D0C630054AA5C /* SWCompressionSourceCode.zip */, - 06BD0D211E3D0C630054AA5C /* TestDataDescriptor.zip */, - 06BD0D221E3D0C630054AA5C /* TestZip64.zip */, + 06BD0D211E3D0C630054AA5C /* test_data_descriptor.zip */, + 06BD0D221E3D0C630054AA5C /* test_zip64.zip */, ); path = ZIP; sourceTree = ""; @@ -1362,7 +1362,7 @@ 0660C1321F3B3E6B002D42E4 /* test_7z_bzip2.7z in Resources */, 06D07AB01EB64EE800BC8C65 /* test5.xz in Resources */, 0623135D1F33B41B0070A574 /* test_empty_file.tar in Resources */, - 06BD0D241E3D0C630054AA5C /* TestDataDescriptor.zip in Resources */, + 06BD0D241E3D0C630054AA5C /* test_data_descriptor.zip in Resources */, 0691B9401EBE3E100037EE58 /* test.tar in Resources */, 062313681F33B4510070A574 /* test_win.7z in Resources */, 062313661F33B4280070A574 /* test_win.zip in Resources */, @@ -1375,7 +1375,7 @@ 06D07AB41EB64EE800BC8C65 /* test9.xz in Resources */, 06991C701E05A9F70030FF07 /* test9.lzma in Resources */, 06D3456A1F102E740057173F /* test_oldgnu.tar in Resources */, - 06BD0D251E3D0C630054AA5C /* TestZip64.zip in Resources */, + 06BD0D251E3D0C630054AA5C /* test_zip64.zip in Resources */, 06DD48A71F2D24EF00F45599 /* SWCompressionSourceCode.7z in Resources */, 066348D41F35E7F500F3DC7D /* test_all_timestamps.7z in Resources */, 066348CF1F35E54700F3DC7D /* test_multi_blocks.7z in Resources */, @@ -1435,7 +1435,7 @@ 06CC187D1DE35269003532F5 /* test.zlib in Resources */, 06D07A9B1EB64E7A00BC8C65 /* test3.bz2 in Resources */, 069DCE9C1EB64D0300ADC374 /* test1.answer in Resources */, - 069F27701EDA0D5E00736269 /* TestUnicode.zip in Resources */, + 069F27701EDA0D5E00736269 /* test_unicode.zip in Resources */, 069AC2181E02DE490041AC13 /* test8.lzma in Resources */, 068B36791ED0AC050016269E /* full_test.tar in Resources */, 069DCE8F1EB64B1500ADC374 /* test7.gz in Resources */, diff --git a/Tests/Test Files b/Tests/Test Files index 7e413e44..09379037 160000 --- a/Tests/Test Files +++ b/Tests/Test Files @@ -1 +1 @@ -Subproject commit 7e413e44cf3a94559f6a8e2236eeef9cefd88b0d +Subproject commit 0937903714057b05a8846b4d72c9d028f471c1b8 diff --git a/Tests/ZipTests.swift b/Tests/ZipTests.swift index ec55219a..0cbb33db 100644 --- a/Tests/ZipTests.swift +++ b/Tests/ZipTests.swift @@ -24,7 +24,7 @@ class ZipTests: XCTestCase { } func testZip64() throws { - guard let testData = Constants.data(forTest: "TestZip64", withType: ZipTests.testType) else { + guard let testData = Constants.data(forTest: "test_zip64", withType: ZipTests.testType) else { XCTFail("Unable to get test data.") return } @@ -34,7 +34,7 @@ class ZipTests: XCTestCase { } func testDataDescriptor() throws { - guard let testData = Constants.data(forTest: "TestDataDescriptor", withType: ZipTests.testType) else { + guard let testData = Constants.data(forTest: "test_data_descriptor", withType: ZipTests.testType) else { XCTFail("Unable to get test data.") return } @@ -44,7 +44,7 @@ class ZipTests: XCTestCase { } func testUnicode() throws { - guard let testData = Constants.data(forTest: "TestUnicode", withType: ZipTests.testType) else { + guard let testData = Constants.data(forTest: "test_unicode", withType: ZipTests.testType) else { XCTFail("Unable to get test data.") return }