mirror of
https://github.com/adamhathcock/sharpcompress.git
synced 2026-09-24 16:05:27 +00:00
clean up seekable checks
This commit is contained in:
@@ -93,6 +93,24 @@ public class ArchiveFactoryTests : TestBase
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void OpenArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => ArchiveFactory.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async ValueTask OpenAsyncArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
await Assert.ThrowsAsync<ArgumentException>(() =>
|
||||
ArchiveFactory.OpenAsyncArchive(unreadable).AsTask()
|
||||
);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("Zip.deflate.zip", ArchiveType.Zip)]
|
||||
[InlineData("Tar.noEmptyDirs.tar", ArchiveType.Tar)]
|
||||
|
||||
@@ -137,6 +137,14 @@ public class GZipArchiveTests : ArchiveTests
|
||||
Assert.Throws<ArgumentException>(() => GZipArchive.OpenArchive([nonSeekable, seekable]));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GZipArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => GZipArchive.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GZip_Archive_NonSeekableStream()
|
||||
{
|
||||
|
||||
@@ -131,6 +131,14 @@ public class RarArchiveTests : ArchiveTests
|
||||
Assert.Throws<ArgumentException>(() => RarArchive.OpenArchive([nonSeekable, seekable]));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RarArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => RarArchive.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Rar5_ArchiveStreamRead() => ArchiveStreamRead("Rar5.rar");
|
||||
|
||||
|
||||
@@ -37,6 +37,14 @@ public class SevenZipArchiveTests : ArchiveTests
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SevenZipArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => SevenZipArchive.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SevenZipArchive_LZMAAES_StreamRead() =>
|
||||
ArchiveStreamRead(
|
||||
|
||||
@@ -32,6 +32,16 @@ public class TarArchiveAsyncTests : ArchiveTests
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async ValueTask TarArchiveOpenAsyncStream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var stream = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
await Assert.ThrowsAsync<ArgumentException>(() =>
|
||||
TarArchive.OpenAsyncArchive(stream).AsTask()
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async ValueTask Tar_FileName_Exactly_100_Characters_Async()
|
||||
{
|
||||
|
||||
@@ -34,6 +34,19 @@ public class TarArchiveTests : ArchiveTests
|
||||
Assert.Throws<ArgumentException>(() => ArchiveFactory.OpenArchive(stream));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TarArchiveStreamRead_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(
|
||||
File.OpenRead(Path.Combine(TEST_ARCHIVES_PATH, "Tar.tar")),
|
||||
false,
|
||||
true,
|
||||
true
|
||||
);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => TarArchive.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TarArchive_StreamCollection_Throws_On_NonSeekable_Stream()
|
||||
{
|
||||
|
||||
@@ -7,6 +7,7 @@ using SharpCompress.Archives.Zip;
|
||||
using SharpCompress.Common;
|
||||
using SharpCompress.Common.Zip;
|
||||
using SharpCompress.Readers;
|
||||
using SharpCompress.Test.Mocks;
|
||||
using SharpCompress.Writers;
|
||||
using SharpCompress.Writers.Zip;
|
||||
using Xunit;
|
||||
@@ -37,6 +38,14 @@ public class ZipArchiveTests : ArchiveTests
|
||||
Assert.Throws<ArgumentException>(() => ZipArchive.OpenArchive([nonSeekable, seekable]));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ZipArchive_Stream_Throws_On_Unreadable_Stream()
|
||||
{
|
||||
using var unreadable = new TestStream(new MemoryStream(), false, true, true);
|
||||
|
||||
Assert.Throws<ArgumentException>(() => ZipArchive.OpenArchive(unreadable));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Zip_Deflate_Streamed2_ArchiveStreamRead() =>
|
||||
ArchiveStreamRead("Zip.deflate.dd-.zip");
|
||||
|
||||
Reference in New Issue
Block a user