From 631578c17513e60a1a72f71190307fc2c19094a8 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Fri, 19 May 2017 10:10:23 +0100 Subject: [PATCH] Update to next version. Stop Zip64 tests from running all the time and some clean up --- src/SharpCompress/SharpCompress.csproj | 5 +- .../SharpCompress.Test/Rar/RarArchiveTests.cs | 4 +- .../SharpCompress.Test/Rar/RarReaderTests.cs | 14 ++--- .../RewindableStreamTest.cs | 58 +++++++++---------- .../SharpCompress.Test.csproj | 5 +- tests/SharpCompress.Test/Zip/Zip64Tests.cs | 28 +++++---- .../SharpCompress.Test/Zip/ZipArchiveTests.cs | 4 +- .../SharpCompress.Test/Zip/ZipReaderTests.cs | 7 +-- 8 files changed, 68 insertions(+), 57 deletions(-) diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj index 1d28a102..48bf9708 100644 --- a/src/SharpCompress/SharpCompress.csproj +++ b/src/SharpCompress/SharpCompress.csproj @@ -3,7 +3,9 @@ SharpCompress - Pure C# Decompression/Compression en-US - 0.15.2 + 0.16.0 + 0.16.0.0 + 0.16.0.0 Adam Hathcock netstandard1.0;netstandard1.3 true @@ -18,6 +20,7 @@ https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt false false + SharpCompress is a compression library for NET Standard 1.0 that can unrar, decompress 7zip, zip/unzip, tar/untar bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented. diff --git a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs index aba37b87..fa1c399f 100644 --- a/tests/SharpCompress.Test/Rar/RarArchiveTests.cs +++ b/tests/SharpCompress.Test/Rar/RarArchiveTests.cs @@ -44,7 +44,7 @@ namespace SharpCompress.Test { if (!entry.IsDirectory) { - Assert.Equal(entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, entry.CompressionType); entry.WriteToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -189,7 +189,7 @@ namespace SharpCompress.Test ResetScratch(); using (var archive = RarArchive.Open(testArchives.Select(s => Path.Combine(TEST_ARCHIVES_PATH, s)) - .Select(p => File.OpenRead(p)))) + .Select(File.OpenRead))) { foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) { diff --git a/tests/SharpCompress.Test/Rar/RarReaderTests.cs b/tests/SharpCompress.Test/Rar/RarReaderTests.cs index 912692ec..d51366fa 100644 --- a/tests/SharpCompress.Test/Rar/RarReaderTests.cs +++ b/tests/SharpCompress.Test/Rar/RarReaderTests.cs @@ -36,7 +36,7 @@ namespace SharpCompress.Test VerifyFiles(); } - //[Fact] + [Fact] public void Rar_Multi_Reader_Encrypted() { var testArchives = new string[] { "EncryptedParts.part01.rar", @@ -149,7 +149,7 @@ namespace SharpCompress.Test { if (!reader.Entry.IsDirectory) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -172,7 +172,7 @@ namespace SharpCompress.Test { if (!reader.Entry.IsDirectory) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); using (var entryStream = reader.OpenEntryStream()) { string file = Path.GetFileName(reader.Entry.Key); @@ -207,7 +207,7 @@ namespace SharpCompress.Test { while (reader.MoveToNextEntry()) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -231,7 +231,7 @@ namespace SharpCompress.Test { while (reader.MoveToNextEntry()) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -262,7 +262,7 @@ namespace SharpCompress.Test { if (reader.Entry.Key.Contains("jpg")) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -287,7 +287,7 @@ namespace SharpCompress.Test { if (reader.Entry.Key.Contains("jpg")) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Rar); + Assert.Equal(CompressionType.Rar, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, diff --git a/tests/SharpCompress.Test/RewindableStreamTest.cs b/tests/SharpCompress.Test/RewindableStreamTest.cs index 991b1acf..52c58227 100644 --- a/tests/SharpCompress.Test/RewindableStreamTest.cs +++ b/tests/SharpCompress.Test/RewindableStreamTest.cs @@ -23,25 +23,25 @@ namespace SharpCompress.Test RewindableStream stream = new RewindableStream(ms); stream.StartRecording(); BinaryReader br = new BinaryReader(stream); - Assert.Equal(br.ReadInt32(), 1); - Assert.Equal(br.ReadInt32(), 2); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); + Assert.Equal(1, br.ReadInt32()); + Assert.Equal(2, br.ReadInt32()); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); stream.Rewind(true); stream.StartRecording(); - Assert.Equal(br.ReadInt32(), 1); - Assert.Equal(br.ReadInt32(), 2); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); - Assert.Equal(br.ReadInt32(), 5); - Assert.Equal(br.ReadInt32(), 6); - Assert.Equal(br.ReadInt32(), 7); + Assert.Equal(1, br.ReadInt32()); + Assert.Equal(2, br.ReadInt32()); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); + Assert.Equal(5, br.ReadInt32()); + Assert.Equal(6, br.ReadInt32()); + Assert.Equal(7, br.ReadInt32()); stream.Rewind(true); stream.StartRecording(); - Assert.Equal(br.ReadInt32(), 1); - Assert.Equal(br.ReadInt32(), 2); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); + Assert.Equal(1, br.ReadInt32()); + Assert.Equal(2, br.ReadInt32()); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); } [Fact] @@ -61,23 +61,23 @@ namespace SharpCompress.Test RewindableStream stream = new RewindableStream(ms); stream.StartRecording(); BinaryReader br = new BinaryReader(stream); - Assert.Equal(br.ReadInt32(), 1); - Assert.Equal(br.ReadInt32(), 2); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); + Assert.Equal(1, br.ReadInt32()); + Assert.Equal(2, br.ReadInt32()); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); stream.Rewind(true); - Assert.Equal(br.ReadInt32(), 1); - Assert.Equal(br.ReadInt32(), 2); + Assert.Equal(1, br.ReadInt32()); + Assert.Equal(2, br.ReadInt32()); stream.StartRecording(); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); - Assert.Equal(br.ReadInt32(), 5); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); + Assert.Equal(5, br.ReadInt32()); stream.Rewind(true); - Assert.Equal(br.ReadInt32(), 3); - Assert.Equal(br.ReadInt32(), 4); - Assert.Equal(br.ReadInt32(), 5); - Assert.Equal(br.ReadInt32(), 6); - Assert.Equal(br.ReadInt32(), 7); + Assert.Equal(3, br.ReadInt32()); + Assert.Equal(4, br.ReadInt32()); + Assert.Equal(5, br.ReadInt32()); + Assert.Equal(6, br.ReadInt32()); + Assert.Equal(7, br.ReadInt32()); } } } diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj index 32fb65df..90da286c 100644 --- a/tests/SharpCompress.Test/SharpCompress.Test.csproj +++ b/tests/SharpCompress.Test/SharpCompress.Test.csproj @@ -17,9 +17,10 @@ - + - + + diff --git a/tests/SharpCompress.Test/Zip/Zip64Tests.cs b/tests/SharpCompress.Test/Zip/Zip64Tests.cs index 4a4bf639..d626ae71 100644 --- a/tests/SharpCompress.Test/Zip/Zip64Tests.cs +++ b/tests/SharpCompress.Test/Zip/Zip64Tests.cs @@ -21,42 +21,48 @@ namespace SharpCompress.Test // 4GiB + 1 const long FOUR_GB_LIMIT = ((long)uint.MaxValue) + 1; - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] public void Zip64_Single_Large_File() { // One single file, requires zip64 RunSingleTest(1, FOUR_GB_LIMIT, set_zip64: true, forward_only: false); } - [Fact] - public void Zip64_Two_Large_Files() + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] + public void Zip64_Two_Large_Files() { // One single file, requires zip64 RunSingleTest(2, FOUR_GB_LIMIT, set_zip64: true, forward_only: false); - } + } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] public void Zip64_Two_Small_files() { // Multiple files, does not require zip64 RunSingleTest(2, FOUR_GB_LIMIT / 2, set_zip64: false, forward_only: false); } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] public void Zip64_Two_Small_files_stream() { // Multiple files, does not require zip64, and works with streams RunSingleTest(2, FOUR_GB_LIMIT / 2, set_zip64: false, forward_only: true); } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] public void Zip64_Two_Small_Files_Zip64() { // Multiple files, use zip64 even though it is not required RunSingleTest(2, FOUR_GB_LIMIT / 2, set_zip64: true, forward_only: false); } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("format", "zip64")] public void Zip64_Single_Large_File_Fail() { try @@ -70,7 +76,8 @@ namespace SharpCompress.Test } } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("zip64", "true")] public void Zip64_Single_Large_File_Zip64_Streaming_Fail() { try @@ -84,7 +91,8 @@ namespace SharpCompress.Test } } - [Fact] + [Fact(Skip = "Takes too long")] + [Trait("zip64", "true")] public void Zip64_Single_Large_File_Streaming_Fail() { try diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs index 257f6da9..d3d8832e 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveTests.cs @@ -358,7 +358,7 @@ namespace SharpCompress.Test count++; //Prints 3 - Assert.Equal(count, 3); + Assert.Equal(3, count); a.Dispose(); a = ZipArchive.Open(unmodified); @@ -382,7 +382,7 @@ namespace SharpCompress.Test foreach (var e in a.Entries) count3++; - Assert.Equal(count3, 3); + Assert.Equal(3, count3); } [Fact] diff --git a/tests/SharpCompress.Test/Zip/ZipReaderTests.cs b/tests/SharpCompress.Test/Zip/ZipReaderTests.cs index 35db1278..8f945a9f 100644 --- a/tests/SharpCompress.Test/Zip/ZipReaderTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipReaderTests.cs @@ -100,7 +100,7 @@ namespace SharpCompress.Test { if (!reader.Entry.IsDirectory) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.BZip2); + Assert.Equal(CompressionType.BZip2, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { ExtractFullPath = true, @@ -179,8 +179,7 @@ namespace SharpCompress.Test { if (!reader.Entry.IsDirectory) { - Assert.Equal(reader.Entry.CompressionType, - CompressionType.Unknown); + Assert.Equal(CompressionType.Unknown, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() { @@ -208,7 +207,7 @@ namespace SharpCompress.Test { if (!reader.Entry.IsDirectory) { - Assert.Equal(reader.Entry.CompressionType, CompressionType.Unknown); + Assert.Equal(CompressionType.Unknown, reader.Entry.CompressionType); reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions() {