From f4ce4cbad8855a482fd5d242cd90ea3ef26e4983 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Fri, 16 Jan 2026 08:43:13 +0000 Subject: [PATCH] fix tests for both frameworks --- .../SevenZip/SevenZipArchiveAsyncTests.cs | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs index cd6b67f2..d60c7a74 100644 --- a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs +++ b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs @@ -14,7 +14,11 @@ public class SevenZipArchiveAsyncTests : ArchiveTests public async Task SevenZipArchive_LZMA_AsyncStreamExtraction() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.LZMA.7z"); +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); +#else + await using var stream = File.OpenRead(testArchive); +#endif await using var archive = await ArchiveFactory.OpenAsyncArchive( new AsyncOnlyStream(stream) ); @@ -29,9 +33,21 @@ public class SevenZipArchiveAsyncTests : ArchiveTests Directory.CreateDirectory(targetDir); } +#if NETFRAMEWORK using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#else + await using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#endif +#if NETFRAMEWORK + using var targetStream = File.Create(targetPath); +#else await using var targetStream = File.Create(targetPath); +#endif +#if NETFRAMEWORK + await sourceStream.CopyToAsync(targetStream, 81920, CancellationToken.None); +#else await sourceStream.CopyToAsync(targetStream, CancellationToken.None); +#endif } VerifyFiles(); @@ -41,7 +57,11 @@ public class SevenZipArchiveAsyncTests : ArchiveTests public async Task SevenZipArchive_LZMA2_AsyncStreamExtraction() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.LZMA2.7z"); +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); +#else + await using var stream = File.OpenRead(testArchive); +#endif await using var archive = await ArchiveFactory.OpenAsyncArchive( new AsyncOnlyStream(stream) ); @@ -56,9 +76,21 @@ public class SevenZipArchiveAsyncTests : ArchiveTests Directory.CreateDirectory(targetDir); } +#if NETFRAMEWORK using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#else + await using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#endif +#if NETFRAMEWORK + using var targetStream = File.Create(targetPath); +#else await using var targetStream = File.Create(targetPath); +#endif +#if NETFRAMEWORK + await sourceStream.CopyToAsync(targetStream, 81920, CancellationToken.None); +#else await sourceStream.CopyToAsync(targetStream, CancellationToken.None); +#endif } VerifyFiles(); @@ -68,7 +100,11 @@ public class SevenZipArchiveAsyncTests : ArchiveTests public async Task SevenZipArchive_Solid_AsyncStreamExtraction() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.7z"); +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); +#else + await using var stream = File.OpenRead(testArchive); +#endif await using var archive = await ArchiveFactory.OpenAsyncArchive( new AsyncOnlyStream(stream) ); @@ -83,9 +119,21 @@ public class SevenZipArchiveAsyncTests : ArchiveTests Directory.CreateDirectory(targetDir); } +#if NETFRAMEWORK using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#else + await using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#endif +#if NETFRAMEWORK + using var targetStream = File.Create(targetPath); +#else await using var targetStream = File.Create(targetPath); +#endif +#if NETFRAMEWORK + await sourceStream.CopyToAsync(targetStream, 81920, CancellationToken.None); +#else await sourceStream.CopyToAsync(targetStream, CancellationToken.None); +#endif } VerifyFiles(); @@ -95,7 +143,11 @@ public class SevenZipArchiveAsyncTests : ArchiveTests public async Task SevenZipArchive_BZip2_AsyncStreamExtraction() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.BZip2.7z"); +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); +#else + await using var stream = File.OpenRead(testArchive); +#endif await using var archive = await ArchiveFactory.OpenAsyncArchive( new AsyncOnlyStream(stream) ); @@ -110,9 +162,21 @@ public class SevenZipArchiveAsyncTests : ArchiveTests Directory.CreateDirectory(targetDir); } +#if NETFRAMEWORK using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#else + await using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#endif +#if NETFRAMEWORK + using var targetStream = File.Create(targetPath); +#else await using var targetStream = File.Create(targetPath); +#endif +#if NETFRAMEWORK + await sourceStream.CopyToAsync(targetStream, 81920, CancellationToken.None); +#else await sourceStream.CopyToAsync(targetStream, CancellationToken.None); +#endif } VerifyFiles(); @@ -122,7 +186,11 @@ public class SevenZipArchiveAsyncTests : ArchiveTests public async Task SevenZipArchive_PPMd_AsyncStreamExtraction() { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.PPMd.7z"); +#if NETFRAMEWORK using var stream = File.OpenRead(testArchive); +#else + await using var stream = File.OpenRead(testArchive); +#endif await using var archive = await ArchiveFactory.OpenAsyncArchive( new AsyncOnlyStream(stream) ); @@ -137,9 +205,21 @@ public class SevenZipArchiveAsyncTests : ArchiveTests Directory.CreateDirectory(targetDir); } +#if NETFRAMEWORK using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#else + await using var sourceStream = await entry.OpenEntryStreamAsync(CancellationToken.None); +#endif +#if NETFRAMEWORK + using var targetStream = File.Create(targetPath); +#else await using var targetStream = File.Create(targetPath); +#endif +#if NETFRAMEWORK + await sourceStream.CopyToAsync(targetStream, 81920, CancellationToken.None); +#else await sourceStream.CopyToAsync(targetStream, CancellationToken.None); +#endif } VerifyFiles();