From e9a6fed6079e8b7e98fbdc4768634ce84d62cc0a Mon Sep 17 00:00:00 2001 From: Matt Kotsenas Date: Wed, 11 Jul 2018 16:53:34 -0700 Subject: [PATCH] FIXUP decouple UseReader from VerifyFiles --- tests/SharpCompress.Test/ArchiveTests.cs | 4 ++-- tests/SharpCompress.Test/Rar/RarReaderTests.cs | 2 +- tests/SharpCompress.Test/ReaderTests.cs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/SharpCompress.Test/ArchiveTests.cs b/tests/SharpCompress.Test/ArchiveTests.cs index 716005fe..c75aab72 100644 --- a/tests/SharpCompress.Test/ArchiveTests.cs +++ b/tests/SharpCompress.Test/ArchiveTests.cs @@ -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(); diff --git a/tests/SharpCompress.Test/Rar/RarReaderTests.cs b/tests/SharpCompress.Test/Rar/RarReaderTests.cs index e0a2a30f..a4119f22 100644 --- a/tests/SharpCompress.Test/Rar/RarReaderTests.cs +++ b/tests/SharpCompress.Test/Rar/RarReaderTests.cs @@ -205,7 +205,7 @@ namespace SharpCompress.Test.Rar Password = password })) { - UseReader(this, reader, CompressionType.Rar); + UseReader(reader, CompressionType.Rar); } } diff --git a/tests/SharpCompress.Test/ReaderTests.cs b/tests/SharpCompress.Test/ReaderTests.cs index 68303c5f..1d8e2bfb 100644 --- a/tests/SharpCompress.Test/ReaderTests.cs +++ b/tests/SharpCompress.Test/ReaderTests.cs @@ -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