From 7fbd751d274edfdbdf1f0398150259ff17296974 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Thu, 15 Jan 2026 13:00:05 +0000 Subject: [PATCH] change tests to work --- src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs | 2 +- .../Archives/IWritableArchiveCommonExtensions.cs | 7 +++++++ src/SharpCompress/Archives/IWritableArchiveOpenable.cs | 2 +- src/SharpCompress/Archives/Tar/TarArchive.Factory.cs | 2 +- src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs | 2 +- tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs | 2 +- .../Zip/Zip64VersionConsistencyTests.cs | 10 +++++----- tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs b/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs index 40771a23..4d413e63 100644 --- a/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs +++ b/src/SharpCompress/Archives/GZip/GZipArchive.Factory.cs @@ -17,7 +17,7 @@ namespace SharpCompress.Archives.GZip; public partial class GZipArchive #if NET8_0_OR_GREATER : IWritableArchiveOpenable, - IMultiArchiveOpenable + IMultiArchiveOpenable #endif { public static IWritableAsyncArchive OpenAsyncArchive( diff --git a/src/SharpCompress/Archives/IWritableArchiveCommonExtensions.cs b/src/SharpCompress/Archives/IWritableArchiveCommonExtensions.cs index 77a7f499..7f276ece 100644 --- a/src/SharpCompress/Archives/IWritableArchiveCommonExtensions.cs +++ b/src/SharpCompress/Archives/IWritableArchiveCommonExtensions.cs @@ -34,6 +34,13 @@ public static class IWritableArchiveCommonExtensions public IArchiveEntry AddEntry(string key, string file) => writableArchive.AddEntry(key, new FileInfo(file)); + public IArchiveEntry AddEntry( + string key, + Stream source, + long size = 0, + DateTime? modified = null + ) => writableArchive.AddEntry(key, source, false, size, modified); + public IArchiveEntry AddEntry(string key, FileInfo fileInfo) { if (!fileInfo.Exists) diff --git a/src/SharpCompress/Archives/IWritableArchiveOpenable.cs b/src/SharpCompress/Archives/IWritableArchiveOpenable.cs index a21f4e4a..b0b761a2 100644 --- a/src/SharpCompress/Archives/IWritableArchiveOpenable.cs +++ b/src/SharpCompress/Archives/IWritableArchiveOpenable.cs @@ -7,4 +7,4 @@ public interface IWritableArchiveOpenable public static abstract IWritableArchive CreateArchive(); public static abstract IWritableAsyncArchive CreateAsyncArchive(); } -#endif \ No newline at end of file +#endif diff --git a/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs b/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs index 27a32da9..f6e03f4f 100644 --- a/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs +++ b/src/SharpCompress/Archives/Tar/TarArchive.Factory.cs @@ -17,7 +17,7 @@ namespace SharpCompress.Archives.Tar; public partial class TarArchive #if NET8_0_OR_GREATER : IWritableArchiveOpenable, - IMultiArchiveOpenable + IMultiArchiveOpenable #endif { public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null) diff --git a/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs b/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs index 18b48463..bb51552e 100644 --- a/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs +++ b/src/SharpCompress/Archives/Zip/ZipArchive.Factory.cs @@ -15,7 +15,7 @@ namespace SharpCompress.Archives.Zip; public partial class ZipArchive #if NET8_0_OR_GREATER : IWritableArchiveOpenable, - IMultiArchiveOpenable + IMultiArchiveOpenable #endif { public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null) diff --git a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs index a4dfa7a2..0e6ef3e6 100644 --- a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs +++ b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs @@ -137,7 +137,7 @@ public class TarArchiveAsyncTests : ArchiveTests var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Tar.tar"); var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Tar.noEmptyDirs.tar"); - using (var archive = TarArchive.CreateAsyncArchive()) + await using (var archive = TarArchive.CreateAsyncArchive()) { archive.AddAllFromDirectory(ORIGINAL_FILES_PATH); var twopt = new TarWriterOptions(CompressionType.None, true); diff --git a/tests/SharpCompress.Test/Zip/Zip64VersionConsistencyTests.cs b/tests/SharpCompress.Test/Zip/Zip64VersionConsistencyTests.cs index b3a03342..fa26a76e 100644 --- a/tests/SharpCompress.Test/Zip/Zip64VersionConsistencyTests.cs +++ b/tests/SharpCompress.Test/Zip/Zip64VersionConsistencyTests.cs @@ -37,7 +37,7 @@ public class Zip64VersionConsistencyTests : WriterTests UseZip64 = true, }; - ZipArchive zipArchive = ZipArchive.CreateArchive(); + var zipArchive = ZipArchive.CreateArchive(); zipArchive.AddEntry("empty", new MemoryStream()); zipArchive.SaveTo(filename, writerOptions); @@ -141,7 +141,7 @@ public class Zip64VersionConsistencyTests : WriterTests UseZip64 = false, }; - ZipArchive zipArchive = ZipArchive.CreateArchive(); + var zipArchive = ZipArchive.CreateArchive(); zipArchive.AddEntry("empty", new MemoryStream()); zipArchive.SaveTo(filename, writerOptions); @@ -192,7 +192,7 @@ public class Zip64VersionConsistencyTests : WriterTests UseZip64 = false, }; - ZipArchive zipArchive = ZipArchive.CreateArchive(); + var zipArchive = ZipArchive.CreateArchive(); var data = new byte[100]; new Random(42).NextBytes(data); zipArchive.AddEntry("test.bin", new MemoryStream(data)); @@ -245,7 +245,7 @@ public class Zip64VersionConsistencyTests : WriterTests UseZip64 = false, }; - ZipArchive zipArchive = ZipArchive.CreateArchive(); + var zipArchive = ZipArchive.CreateArchive(); var data = new byte[100]; new Random(42).NextBytes(data); zipArchive.AddEntry("test.bin", new MemoryStream(data)); @@ -298,7 +298,7 @@ public class Zip64VersionConsistencyTests : WriterTests UseZip64 = true, }; - ZipArchive zipArchive = ZipArchive.CreateArchive(); + var zipArchive = ZipArchive.CreateArchive(); for (int i = 0; i < 5; i++) { var data = new byte[100]; diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs index 961cfccf..1d114f78 100644 --- a/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs +++ b/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs @@ -167,7 +167,7 @@ public class ZipArchiveAsyncTests : ArchiveTests var scratchPath = Path.Combine(SCRATCH_FILES_PATH, "Zip.deflate.noEmptyDirs.zip"); var unmodified = Path.Combine(TEST_ARCHIVES_PATH, "Zip.deflate.noEmptyDirs.zip"); - using (var archive = ZipArchive.CreateAsyncArchive()) + await using (var archive = (ZipArchive)ZipArchive.CreateAsyncArchive()) { archive.DeflateCompressionLevel = CompressionLevel.BestSpeed; archive.AddAllFromDirectory(ORIGINAL_FILES_PATH);