From ebfa16f09f5253d12a2cd97b5dbfcf74cc9a776f Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Wed, 14 Jan 2026 14:12:53 +0000 Subject: [PATCH] more test fixes --- .../Rar/RarArchiveAsyncTests.cs | 3 ++- .../SevenZip/SevenZipArchiveAsyncTests.cs | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/SharpCompress.Test/Rar/RarArchiveAsyncTests.cs b/tests/SharpCompress.Test/Rar/RarArchiveAsyncTests.cs index acfe4c27..a700f8d5 100644 --- a/tests/SharpCompress.Test/Rar/RarArchiveAsyncTests.cs +++ b/tests/SharpCompress.Test/Rar/RarArchiveAsyncTests.cs @@ -6,6 +6,7 @@ using SharpCompress.Archives.Rar; using SharpCompress.Common; using SharpCompress.Compressors.LZMA.Utilites; using SharpCompress.Readers; +using SharpCompress.Test.Mocks; using Xunit; namespace SharpCompress.Test.Rar; @@ -649,7 +650,7 @@ public class RarArchiveAsyncTests : ArchiveTests { testArchive = Path.Combine(TEST_ARCHIVES_PATH, testArchive); using var stream = File.OpenRead(testArchive); - await using var archive = await ArchiveFactory.OpenAsync(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); Assert.True(await archive.IsSolidAsync()); await using (var reader = await archive.ExtractAllEntriesAsync()) { diff --git a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs index 7a8718ee..6c571ea1 100644 --- a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs +++ b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveAsyncTests.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using SharpCompress.Archives; using SharpCompress.Common; +using SharpCompress.Test.Mocks; using Xunit; namespace SharpCompress.Test.SevenZip; @@ -16,9 +17,9 @@ public class SevenZipArchiveAsyncTests : ArchiveTests { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.LZMA.7z"); using var stream = File.OpenRead(testArchive); - using var archive = ArchiveFactory.Open(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); - foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) + await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory)) { var targetPath = Path.Combine(SCRATCH_FILES_PATH, entry.Key!); var targetDir = Path.GetDirectoryName(targetPath); @@ -41,9 +42,9 @@ public class SevenZipArchiveAsyncTests : ArchiveTests { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.LZMA2.7z"); using var stream = File.OpenRead(testArchive); - using var archive = ArchiveFactory.Open(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); - foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) + await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory)) { var targetPath = Path.Combine(SCRATCH_FILES_PATH, entry.Key!); var targetDir = Path.GetDirectoryName(targetPath); @@ -66,9 +67,9 @@ public class SevenZipArchiveAsyncTests : ArchiveTests { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.7z"); using var stream = File.OpenRead(testArchive); - using var archive = ArchiveFactory.Open(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); - foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) + await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory)) { var targetPath = Path.Combine(SCRATCH_FILES_PATH, entry.Key!); var targetDir = Path.GetDirectoryName(targetPath); @@ -91,9 +92,9 @@ public class SevenZipArchiveAsyncTests : ArchiveTests { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.BZip2.7z"); using var stream = File.OpenRead(testArchive); - using var archive = ArchiveFactory.Open(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); - foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) + await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory)) { var targetPath = Path.Combine(SCRATCH_FILES_PATH, entry.Key!); var targetDir = Path.GetDirectoryName(targetPath); @@ -116,9 +117,9 @@ public class SevenZipArchiveAsyncTests : ArchiveTests { var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.PPMd.7z"); using var stream = File.OpenRead(testArchive); - using var archive = ArchiveFactory.Open(stream); + await using var archive = await ArchiveFactory.OpenAsync(new AsyncOnlyStream(stream)); - foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory)) + await foreach (var entry in archive.EntriesAsync.Where(entry => !entry.IsDirectory)) { var targetPath = Path.Combine(SCRATCH_FILES_PATH, entry.Key!); var targetDir = Path.GetDirectoryName(targetPath);