starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-22 23:15:20 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

FIXUP decouple UseReader from VerifyFiles

Browse Source
This commit is contained in:
Matt Kotsenas
2018-07-11 16:53:34 -07:00
parent 87a1440382
commit e9a6fed607
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/SharpCompress.Test/ArchiveTests.cs
View File

@@ -10,7 +10,7 @@ using Xunit;
namespace SharpCompress.Test
{
public class ArchiveTests : TestBase
public class ArchiveTests : ReaderTests
{
protected void ArchiveStreamReadExtractAll(string testArchive, CompressionType compression)
{
@@ -29,7 +29,7 @@ namespace SharpCompress.Test
Assert.True(archive.IsSolid);
using (var reader = archive.ExtractAllEntries())
{
ReaderTests.UseReader(this, reader, compression);
UseReader(reader, compression);
}
VerifyFiles();

2
tests/SharpCompress.Test/Rar/RarReaderTests.cs
View File

@@ -205,7 +205,7 @@ namespace SharpCompress.Test.Rar
Password = password
}))
{
UseReader(this, reader, CompressionType.Rar);
UseReader(reader, CompressionType.Rar);
}
}

6
tests/SharpCompress.Test/ReaderTests.cs
View File

@@ -28,7 +28,7 @@ namespace SharpCompress.Test
{
using (var reader = ReaderFactory.Open(testStream, new ReaderOptions { LeaveStreamOpen = leaveStreamOpen }))
{
UseReader(this, reader, expectedCompression);
UseReader(reader, expectedCompression);
protectedStream.ThrowOnDispose = false;
Assert.False(testStream.IsDisposed, "{nameof(testStream)} prematurely closed");
}
@@ -42,14 +42,14 @@ namespace SharpCompress.Test
}
}
public static void UseReader(TestBase test, IReader reader, CompressionType expectedCompression)
public void UseReader(IReader reader, CompressionType expectedCompression)
{
while (reader.MoveToNextEntry())
{
if (!reader.Entry.IsDirectory)
{
Assert.Equal(reader.Entry.CompressionType, expectedCompression);
reader.WriteEntryToDirectory(test.SCRATCH_FILES_PATH, new ExtractionOptions()
reader.WriteEntryToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions()
{
ExtractFullPath = true,
Overwrite = true