change tests to work

This commit is contained in:
Adam Hathcock
2026-01-15 13:00:05 +00:00
parent 85b28dfe68
commit 7fbd751d27
8 changed files with 18 additions and 11 deletions

View File

@@ -17,7 +17,7 @@ namespace SharpCompress.Archives.GZip;
public partial class GZipArchive
#if NET8_0_OR_GREATER
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableAsyncArchive OpenAsyncArchive(

View File

@@ -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)

View File

@@ -7,4 +7,4 @@ public interface IWritableArchiveOpenable
public static abstract IWritableArchive CreateArchive();
public static abstract IWritableAsyncArchive CreateAsyncArchive();
}
#endif
#endif

View File

@@ -17,7 +17,7 @@ namespace SharpCompress.Archives.Tar;
public partial class TarArchive
#if NET8_0_OR_GREATER
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)

View File

@@ -15,7 +15,7 @@ namespace SharpCompress.Archives.Zip;
public partial class ZipArchive
#if NET8_0_OR_GREATER
: IWritableArchiveOpenable,
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
IMultiArchiveOpenable<IWritableArchive, IWritableAsyncArchive>
#endif
{
public static IWritableArchive OpenArchive(string filePath, ReaderOptions? readerOptions = null)

View File

@@ -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);

View File

@@ -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];

View File

@@ -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);