mirror of
https://github.com/adamhathcock/sharpcompress.git
synced 2026-09-23 07:25:11 +00:00
fix tests for both frameworks
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user