Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

File checker rework: a) bugs fixed, b) more robust detection, c) many tests added. #149

Open
TobiasKnauss wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

File checker rework: a) bugs fixed, b) more robust detection, c) many tests added. #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e6c9e1
Explicit definition of the Code Style settings (most likely not compl…
TobiasKnauss Dec 15, 2021
6f2b39d
Tests enhanced to demonstrate that the FileChecker is faulty.
TobiasKnauss Dec 15, 2021
1b887c1
FileChecker completely reworked.
TobiasKnauss Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 112 additions & 42 deletions SevenZip.Tests/FileCheckerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public FileCheckerTestData(string testDataFilePath, InArchiveFormat expectedForm
/// Path to archive file to test against.
/// </summary>
public string TestDataFilePath { get; }

public override string ToString()
{
// Used to get useful test results.
return ExpectedFormat.ToString();
return Path.GetFileName(TestDataFilePath) + "=" + ExpectedFormat;
}
}

Expand All @@ -43,40 +43,110 @@ public class FileCheckerTests
/// </summary>
public static List<FileCheckerTestData> TestData = new List<FileCheckerTestData>
{
new FileCheckerTestData(@"TestData\arj.arj", InArchiveFormat.Arj),
new FileCheckerTestData(@"TestData\bzip2.bz2", InArchiveFormat.BZip2),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Cab),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Chm),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Compound),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Cpio),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Deb),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Dmg),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Elf),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Flv),
new FileCheckerTestData(@"TestData\gzip.gz", InArchiveFormat.GZip),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Hfs),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Iso),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzh),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzma),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzw),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Msi),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Mslz),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Mub),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Nsis),
new FileCheckerTestData(@"TestData\", InArchiveFormat.PE),
new FileCheckerTestData(@"TestData\rar5.rar", InArchiveFormat.Rar),
new FileCheckerTestData(@"TestData\rar4.rar", InArchiveFormat.Rar4),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Rpm),
new FileCheckerTestData(@"TestData\7z_LZMA2.7z", InArchiveFormat.SevenZip),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Split),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Swf),
new FileCheckerTestData(@"TestData\tar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Udf),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Vhd),
new FileCheckerTestData(@"TestData\wim.wim", InArchiveFormat.Wim),
new FileCheckerTestData(@"TestData\xz.xz", InArchiveFormat.XZ),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Xar),
new FileCheckerTestData(@"TestData\zip.zip", InArchiveFormat.Zip)
new FileCheckerTestData(@"TestData\arj.arj", InArchiveFormat.Arj),
new FileCheckerTestData(@"TestData\bzip2.bz2", InArchiveFormat.BZip2),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Cab),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Chm),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Compound),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Cpio),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Deb),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Dmg),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Elf),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Flv),
new FileCheckerTestData(@"TestData\gzip.gz", InArchiveFormat.GZip),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Hfs),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Iso),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzh),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzma),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Lzw),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Msi),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Mslz),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Mub),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Nsis),
new FileCheckerTestData(@"TestData\", InArchiveFormat.PE),
new FileCheckerTestData(@"TestData\rar5.rar", InArchiveFormat.Rar),
new FileCheckerTestData(@"TestData\rar4.rar", InArchiveFormat.Rar4),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Rpm),
new FileCheckerTestData(@"TestData\7z_LZMA2.7z", InArchiveFormat.SevenZip),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Split),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Swf),
new FileCheckerTestData(@"TestData\tar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Udf),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Vhd),
new FileCheckerTestData(@"TestData\wim.wim", InArchiveFormat.Wim),
new FileCheckerTestData(@"TestData\xz.xz", InArchiveFormat.XZ),
new FileCheckerTestData(@"TestData\", InArchiveFormat.Xar),
new FileCheckerTestData(@"TestData\zip.zip", InArchiveFormat.Zip),

new FileCheckerTestData(@"TestData\7z\abc.7z", InArchiveFormat.SevenZip),

new FileCheckerTestData(@"TestData\sfx\abc_7z.exe", InArchiveFormat.SevenZip),

new FileCheckerTestData(@"TestData\tar\abc.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\abc.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\abc.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_pax.tar-with-wrong-extension.zip", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_ustar.tar-with-wrong-extension.zip", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZh.txt_v7.tar-with-wrong-extension.zip", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZhello.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZhello.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\BZhello.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\CD001.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\CD001.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\CD001.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\conectix.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\conectix.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\conectix.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_pax.tar-with-wrong-extension.flv", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_ustar.tar-with-wrong-extension.flv", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FLV.txt_v7.tar-with-wrong-extension.flv", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FWS.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FWS.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\FWS.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\H+.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\H+.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\H+.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSF.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSF.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSF.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSFREEFORPERSONALUSE.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSFREEFORPERSONALUSE.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\ITSFREEFORPERSONALUSE.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCF.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCF.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCF.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCFish.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCFish.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MSCFish.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZ.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZ.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZ.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZone.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZone.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\MZone.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\udf.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\udf.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\udf.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\x.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\x.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\x.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xar!.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xar!.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xar!.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_pax.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_ustar.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_v7.tar", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_pax.tar-with-wrong-extension.zip", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_ustar.tar-with-wrong-extension.zip", InArchiveFormat.Tar),
new FileCheckerTestData(@"TestData\tar\xyz.txt_v7.tar-with-wrong-extension.zip", InArchiveFormat.Tar),

new FileCheckerTestData(@"TestData\zip\abc.zip", InArchiveFormat.Zip)
};

[SetUp]
Expand All @@ -85,20 +155,20 @@ public void SetUp()
// Ensures we're in the correct working directory (for test data files).
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}

[TestCaseSource(nameof(TestData))]
public void CheckFileSignatureTest(FileCheckerTestData data)
{
if (!File.Exists(data.TestDataFilePath))
{
Assert.Ignore("No test data found for this format.");
var path = Directory.GetCurrentDirectory();
Assert.Ignore($"No test data found for this format in directory '{path}'.");
}
else
{
int ignored;
bool ignored2;
Assert.AreEqual(data.ExpectedFormat, FileChecker.CheckSignature(data.TestDataFilePath, out ignored, out ignored2));
Assert.AreEqual(data.ExpectedFormat,
FileChecker.CheckSignature(data.TestDataFilePath, out _, out _));
}
}
}
}
}
Loading