From 6401e1b3a1a4383108f14dcb38bfe80d755c0626 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 11 May 2019 19:52:34 +0100 Subject: [PATCH] More unit tests. --- DiscImageChef.Tests/Filesystems/F2FS.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/FAT16.cs | 21 ++++++++----- DiscImageChef.Tests/Filesystems/FAT32.cs | 20 +++++++----- DiscImageChef.Tests/Filesystems/HFS.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/HFSPlus.cs | 16 +++++----- DiscImageChef.Tests/Filesystems/HFSX.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/JFS2.cs | 19 +++++++----- DiscImageChef.Tests/Filesystems/MINIX.cs | 36 +++++++++++----------- DiscImageChef.Tests/Filesystems/NTFS.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/Reiser3.cs | 19 ++++++++---- DiscImageChef.Tests/Filesystems/UDF.cs | 29 +++++++++++------ DiscImageChef.Tests/Filesystems/XFS.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/btrfs.cs | 17 +++++----- DiscImageChef.Tests/Filesystems/exFAT.cs | 18 ++++++----- DiscImageChef.Tests/Filesystems/ext2.cs | 22 ++++++++----- 15 files changed, 179 insertions(+), 123 deletions(-) diff --git a/DiscImageChef.Tests/Filesystems/F2FS.cs b/DiscImageChef.Tests/Filesystems/F2FS.cs index 3e1b160e0..3bda25def 100644 --- a/DiscImageChef.Tests/Filesystems/F2FS.cs +++ b/DiscImageChef.Tests/Filesystems/F2FS.cs @@ -41,19 +41,22 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class F2Fs { - readonly string[] testfiles = {"linux.vdi.lz"}; + readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_f2fs_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {262144}; + readonly ulong[] sectors = {262144, 2097152}; - readonly uint[] sectorsize = {512}; + readonly uint[] sectorsize = {512, 512}; - readonly long[] clusters = {32512}; + readonly long[] clusters = {32512, 261888}; - readonly int[] clustersize = {4096}; + readonly int[] clustersize = {4096, 4096}; - readonly string[] volumename = {"VolumeLabel"}; + readonly string[] volumename = {"VolumeLabel", "DicSetter"}; - readonly string[] volumeserial = {"81bd3a4e-de0c-484c-becc-aaa479b2070a"}; + readonly string[] volumeserial = + { + "81bd3a4e-de0c-484c-becc-aaa479b2070a", "422bd2a8-68ab-6f45-9a04-9c264d07dd6e" + }; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/FAT16.cs b/DiscImageChef.Tests/Filesystems/FAT16.cs index ddfb11942..ce720f0dd 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16.cs @@ -323,7 +323,9 @@ namespace DiscImageChef.Tests.Filesystems "win98.vdi.lz", "winme.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "amigaos_3.9.vdi.lz", "aros.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "macos_7.5.3.vdi.lz", - "macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "ecs20_fstester.vdi.lz" + "macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "ecs20_fstester.vdi.lz", + "linux_2.2_umsdos16_flashdrive.vdi.lz", "linux_4.19_fat16_msdos_flashdrive.vdi.lz", + "linux_4.19_vfat16_flashdrive.vdi.lz" }; readonly ulong[] sectors = @@ -333,14 +335,15 @@ namespace DiscImageChef.Tests.Filesystems 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 262144, 1024128, 1024000, 1024000, - 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000 + 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000 }; readonly uint[] sectorsize = { 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512 + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512 }; readonly long[] clusters = @@ -349,7 +352,7 @@ namespace DiscImageChef.Tests.Filesystems 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63882, 63992, 63864, 63252, 63941, 63941, 63941, 63941, 63998, 63998, 63998, 63941, 63998, 63998, 63941, 63616, 63996, 65024, 63941, 63882, 63998, 63998, 31999, 63941, 63941, 63941, - 63941, 63882 + 63941, 63882, 63941, 63872, 63872 }; readonly int[] clustersize = @@ -357,7 +360,7 @@ namespace DiscImageChef.Tests.Filesystems 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, - 2048, 8192, 8192, 8192, 8192, 16384, 8192, 8192, 8192, 8192, 8192 + 2048, 8192, 8192, 8192, 8192, 16384, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192 }; readonly string[] volumename = @@ -370,7 +373,8 @@ namespace DiscImageChef.Tests.Filesystems "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VolumeLabel", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", - "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUME LABE" + "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUME LABE", "DICSETTER", + "DICSETTER", "DICSETTER" }; readonly string[] volumeserial = @@ -381,7 +385,8 @@ namespace DiscImageChef.Tests.Filesystems "E6B18414", "E6C63414", "1C069414", "1C059414", "1BE5B814", "3EF71EF4", "DAF97911", "305637BD", "275B0DE4", "09650DFC", "38270D18", "2E620D0C", "0B4F0EED", "0E122464", "3B5F0F02", "C84CB6F2", "D0E9AD4E", "C039A2EC", "501F9FA6", "9AAA4216", "00000000", "A132D985", "374D3BD1", "52BEA34A", - "3CF10E0D", "C6C30E0D", "44770E0D", "27761816", "27761816", "27761816", "27761816", "66AAF014" + "3CF10E0D", "C6C30E0D", "44770E0D", "27761816", "27761816", "27761816", "27761816", "66AAF014", + "5CC78D47", "A552A493", "FCC308A7" }; readonly string[] oemid = @@ -393,7 +398,7 @@ namespace DiscImageChef.Tests.Filesystems "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD 4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", "BeOS ", "mkfs.fat", "CDP 5.0", "MSWIN4.1", "BSD 4.4", "BSD 4.4", - "BSD4.4 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "IBM 4.50" + "BSD4.4 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "PCX 2.0 ", "IBM 4.50", null, "mkfs.fat", "mkfs.fat" }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT32.cs b/DiscImageChef.Tests/Filesystems/FAT32.cs index 9da076886..363ff3536 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32.cs @@ -154,51 +154,55 @@ namespace DiscImageChef.Tests.Filesystems "win2000.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win98se.vdi.lz", "win98.vdi.lz", "winme.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "aros.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "freedos_1.2.vdi.lz", - "ecs20_fstester.vdi.lz" + "ecs20_fstester.vdi.lz", "linux_2.2_umsdos32_flashdrive.vdi.lz", + "linux_4.19_fat32_msdos_flashdrive.vdi.lz", "linux_4.19_vfat32_flashdrive.vdi.lz" }; readonly ulong[] sectors = { 8388608, 8388608, 8388608, 4194304, 4194304, 8388608, 4194304, 4194304, 4194304, 4194304, 4194304, - 4194304, 4194304, 4194304, 262144, 4194304, 4194304, 4194304, 4194304, 8388608, 1024000 + 4194304, 4194304, 4194304, 262144, 4194304, 4194304, 4194304, 4194304, 8388608, 1024000, 1024000, + 1024000, 1024000 }; readonly uint[] sectorsize = { - 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512 + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512 }; readonly long[] clusters = { 1048233, 1048233, 1048233, 524287, 524016, 1048233, 524152, 524152, 524152, 524112, 524112, 524112, - 523520, 1048560, 260096, 524160, 524112, 524112, 65514, 1048233, 127744 + 523520, 1048560, 260096, 524160, 524112, 524112, 65514, 1048233, 127744, 127882, 127744, 127744 }; readonly int[] clustersize = { 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 512, 4096, 4096, - 4096, 32768, 4096, 4096 + 4096, 32768, 4096, 4096, 4096, 4096, 4096 }; readonly string[] volumename = { "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", - "VolumeLabel", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "Volume labe" + "VolumeLabel", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "VOLUMELABEL", "Volume labe", + "DICSETTER", "DICSETTER", "DICSETTER" }; readonly string[] volumeserial = { "5955996C", "1BFB1A43", "3B331809", "42D51EF1", "48073346", "EC62E6DE", "2A310DE4", "0C140DFC", "3E310D18", "0D3D0EED", "0E131162", "3F500F02", "82EB4C04", "00000000", "B488C502", "5CAC9B4E", - "41540E0E", "4E600E0F", "26E20E0F", "3E0C1BE8", "63084BBA" + "41540E0E", "4E600E0F", "26E20E0F", "3E0C1BE8", "63084BBA", "5CC7908D", "D1290612", "79BCA86E" }; readonly string[] oemid = { "DRDOS7.X", "IBM 7.1", "MSWIN4.1", "BSD 4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "BeOS ", "mkfs.fat", "MSWIN4.1", - "BSD 4.4", "BSD 4.4", "BSD4.4 ", "FRDOS4.1", "mkfs.fat" + "BSD 4.4", "BSD 4.4", "BSD4.4 ", "FRDOS4.1", "mkfs.fat", "mkdosfs", "mkfs.fat", "mkfs.fat" }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/HFS.cs b/DiscImageChef.Tests/Filesystems/HFS.cs index a77ae7b35..abd5f9f55 100644 --- a/DiscImageChef.Tests/Filesystems/HFS.cs +++ b/DiscImageChef.Tests/Filesystems/HFS.cs @@ -258,20 +258,23 @@ namespace DiscImageChef.Tests.Filesystems readonly string[] testfiles = { "linux.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz", - "darwin_8.0.1.vdi.lz" + "darwin_8.0.1.vdi.lz", "linux_4.19_hfs_flashdrive.vdi.lz" }; - readonly ulong[] sectors = {262144, 409600, 409600, 409600, 409600}; + readonly ulong[] sectors = {262144, 409600, 409600, 409600, 409600, 1024000}; - readonly uint[] sectorsize = {512, 512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512}; - readonly long[] clusters = {65018, 51145, 51145, 58452, 58502}; + readonly long[] clusters = {65018, 51145, 51145, 58452, 58502, 63870}; - readonly int[] clustersize = {2048, 4096, 4096, 3584, 3584}; + readonly int[] clustersize = {2048, 4096, 4096, 3584, 3584, 8192}; - readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"}; + readonly string[] volumename = + { + "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "DicSetter" + }; - readonly string[] volumeserial = {null, null, null, null, "81FE805D61458753"}; + readonly string[] volumeserial = {null, null, null, null, "81FE805D61458753", null}; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus.cs b/DiscImageChef.Tests/Filesystems/HFSPlus.cs index 99214790e..2b05dee49 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus.cs @@ -191,34 +191,34 @@ namespace DiscImageChef.Tests.Filesystems "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_1.4.1_wrapped.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1_journal.vdi.lz", - "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz" + "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz", "linux_4.19_hfs+_flashdrive.vdi.lz" }; readonly ulong[] sectors = { - 303104, 352256, 262144, 262144, 819200, 614400, 819200, 614400, 819200, 1228800, 819200, 614400 + 303104, 352256, 262144, 262144, 819200, 614400, 819200, 614400, 819200, 1228800, 819200, 614400, 1024000 }; - readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512}; readonly long[] clusters = { - 37878, 44021, 32512, 32512, 102178, 76708, 102178, 76708, 102178, 153592, 102392, 76774 + 37878, 44021, 32512, 32512, 102178, 76708, 102178, 76708, 102178, 153592, 102392, 76774, 127744 }; - readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096}; + readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096}; - readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null, null, null}; + readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null, null, null, null}; readonly string[] volumeserial = { "C84F550907D13F50", "016599F88029F73D", null, null, null, null, null, null, null, "F92964F9B3F64ABB", - "A8FAC484A0A2B177", "D5D5BF1346AD2B8D" + "A8FAC484A0A2B177", "D5D5BF1346AD2B8D", "B9BAC6856878A404" }; readonly string[] oemid = { - "10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0" + "10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "10.0", "H+Lx" }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/HFSX.cs b/DiscImageChef.Tests/Filesystems/HFSX.cs index 66124d87a..0cd42b63a 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX.cs @@ -159,25 +159,26 @@ namespace DiscImageChef.Tests.Filesystems readonly string[] testfiles = { "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz", - "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz" + "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "linux_4.19_hfsx_flashdrive.vdi.lz" }; - readonly ulong[] sectors = {393216, 409600, 262144, 262144, 1638400, 1433600}; + readonly ulong[] sectors = {393216, 409600, 262144, 262144, 1638400, 1433600, 1024000}; - readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512}; - readonly long[] clusters = {49140, 51187, 32512, 32512, 204792, 179192}; + readonly long[] clusters = {49140, 51187, 32512, 32512, 204792, 179192, 127744}; - readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096}; + readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096, 4096, 4096}; - readonly string[] volumename = {null, null, null, null, null, null}; + readonly string[] volumename = {null, null, null, null, null, null, null}; readonly string[] volumeserial = { - "C2BCCCE6DE5BC98D", "AC54CD78C75CC30F", null, null, "7559DD01BCFADD9A", "AEA39CFBBF14C0FF" + "C2BCCCE6DE5BC98D", "AC54CD78C75CC30F", null, null, "7559DD01BCFADD9A", "AEA39CFBBF14C0FF", + "5E4A8781D3C9286C" }; - readonly string[] oemid = {"10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0"}; + readonly string[] oemid = {"10.0", "HFSJ", "10.0", "10.0", "10.0", "10.0", "H+Lx"}; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/JFS2.cs b/DiscImageChef.Tests/Filesystems/JFS2.cs index a79fd11ed..73f626982 100644 --- a/DiscImageChef.Tests/Filesystems/JFS2.cs +++ b/DiscImageChef.Tests/Filesystems/JFS2.cs @@ -40,22 +40,27 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class Jfs2 { - readonly string[] testfiles = {"linux.vdi.lz", "linux_caseinsensitive.vdi.lz", "ecs20_fstester.vdi.lz"}; + readonly string[] testfiles = + { + "linux.vdi.lz", "linux_caseinsensitive.vdi.lz", "ecs20_fstester.vdi.lz", + "linux_4.19_jfs_flashdrive.vdi.lz", "linux_4.19_jfs_os2_flashdrive.vdi.lz" + }; - readonly ulong[] sectors = {262144, 262144, 1024000}; + readonly ulong[] sectors = {262144, 262144, 1024000, 1024000, 1024000}; - readonly uint[] sectorsize = {512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512}; - readonly long[] clusters = {257632, 257632, 1017512}; + readonly long[] clusters = {257632, 257632, 1017512, 1017416, 1017416}; - readonly int[] clustersize = {4096, 4096, 4096}; + readonly int[] clustersize = {4096, 4096, 4096, 4096, 4096}; - readonly string[] volumename = {"Volume labe", "Volume labe", "Volume labe"}; + readonly string[] volumename = {"Volume labe", "Volume labe", "Volume labe", "DicSetter", "DicSetter"}; readonly string[] volumeserial = { "8033b783-0cd1-1645-8ecc-f8f113ad6a47", "d6cd91e9-3899-7e40-8468-baab688ee2e2", - "f4077ce9-0000-0000-0000-000000007c10" + "f4077ce9-0000-0000-0000-000000007c10", "91746c77-eb51-7441-85e2-902c925969f8", + "08fc8e22-0201-894e-89c9-31ec3f546203" }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/MINIX.cs b/DiscImageChef.Tests/Filesystems/MINIX.cs index 92e458168..f058c7886 100644 --- a/DiscImageChef.Tests/Filesystems/MINIX.cs +++ b/DiscImageChef.Tests/Filesystems/MINIX.cs @@ -93,17 +93,17 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class MinixV1Mbr { - readonly string[] testfiles = {"linux.vdi.lz", "minix_3.1.2a.vdi.lz"}; + readonly string[] testfiles = {"linux.vdi.lz", "minix_3.1.2a.vdi.lz", "linux_4.19_minix1_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {262144, 102400}; + readonly ulong[] sectors = {262144, 102400, 131072}; - readonly uint[] sectorsize = {512, 512}; + readonly uint[] sectorsize = {512, 512, 512}; - readonly long[] clusters = {65535, 50399}; + readonly long[] clusters = {65535, 50399, 64512}; - readonly int[] clustersize = {1024, 1024}; + readonly int[] clustersize = {1024, 1024, 1024}; - readonly string[] types = {"Minix v1", "Minix 3 v1"}; + readonly string[] types = {"Minix v1", "Minix 3 v1", "Minix v1"}; [Test] public void Test() @@ -193,17 +193,17 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class MinixV2Mbr { - readonly string[] testfiles = {"minix_3.1.2a.vdi.lz"}; + readonly string[] testfiles = {"minix_3.1.2a.vdi.lz", "linux_4.19_minix2_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {1024000}; + readonly ulong[] sectors = {1024000, 1024000}; - readonly uint[] sectorsize = {512}; + readonly uint[] sectorsize = {512, 512}; - readonly long[] clusters = {511055}; + readonly long[] clusters = {511055, 510976}; - readonly int[] clustersize = {1024}; + readonly int[] clustersize = {1024, 1024}; - readonly string[] types = {"Minix 3 v2"}; + readonly string[] types = {"Minix 3 v2", "Minix v2"}; [Test] public void Test() @@ -293,17 +293,17 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class MinixV3Mbr { - readonly string[] testfiles = {"minix_3.1.2a.vdi.lz"}; + readonly string[] testfiles = {"minix_3.1.2a.vdi.lz", "linux_4.19_minix3_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {4194304}; + readonly ulong[] sectors = {4194304, 1024000}; - readonly uint[] sectorsize = {512}; + readonly uint[] sectorsize = {512, 512}; - readonly long[] clusters = {523151}; + readonly long[] clusters = {523151, 510976}; - readonly int[] clustersize = {4096}; + readonly int[] clustersize = {4096, 1024}; - readonly string[] types = {"Minix v3"}; + readonly string[] types = {"Minix v3", "Minix v3"}; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/NTFS.cs b/DiscImageChef.Tests/Filesystems/NTFS.cs index 5be33fe8c..064862ffc 100644 --- a/DiscImageChef.Tests/Filesystems/NTFS.cs +++ b/DiscImageChef.Tests/Filesystems/NTFS.cs @@ -97,26 +97,27 @@ namespace DiscImageChef.Tests.Filesystems readonly string[] testfiles = { "win10.vdi.lz", "win2000.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", - "winnt_4.00.vdi.lz", "winvista.vdi.lz", "linux.vdi.lz", "haiku_hrev51259.vdi.lz" + "winnt_4.00.vdi.lz", "winvista.vdi.lz", "linux.vdi.lz", "haiku_hrev51259.vdi.lz", + "linux_4.19_ntfs3g_flashdrive.vdi.lz" }; - readonly ulong[] sectors = {524288, 2097152, 1024000, 524288, 524288, 524288, 524288, 262144, 2097152}; + readonly ulong[] sectors = {524288, 2097152, 1024000, 524288, 524288, 524288, 524288, 262144, 2097152, 1024000}; - readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512}; - readonly long[] clusters = {65263, 1046511, 1023057, 524256, 524256, 524096, 64767, 32511, 261887}; + readonly long[] clusters = {65263, 1046511, 1023057, 524256, 524256, 524096, 64767, 32511, 261887, 127743}; - readonly int[] clustersize = {4096, 1024, 512, 512, 512, 512, 4096, 4096, 4096}; + readonly int[] clustersize = {4096, 1024, 512, 512, 512, 512, 4096, 4096, 4096, 4096}; - readonly string[] volumename = {null, null, null, null, null, null, null, null, null}; + readonly string[] volumename = {null, null, null, null, null, null, null, null, null, null}; readonly string[] volumeserial = { "C46C1B3C6C1B28A6", "8070C8EC70C8E9CC", "10CC6AC6CC6AA5A6", "7A14F50014F4BFE5", "24884447884419A6", - "822C288D2C287E73", "E20AF54B0AF51D6B", "065BB96B7C1BCFDA", "46EC796749C6FA66" + "822C288D2C287E73", "E20AF54B0AF51D6B", "065BB96B7C1BCFDA", "46EC796749C6FA66", "1FC3802B52F9611C" }; - readonly string[] oemid = {null, null, null, null, null, null, null, null, null}; + readonly string[] oemid = {null, null, null, null, null, null, null, null, null, null}; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/Reiser3.cs b/DiscImageChef.Tests/Filesystems/Reiser3.cs index adf0ca9d7..5d9826de0 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser3.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser3.cs @@ -40,17 +40,24 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class Reiser3 { - readonly string[] testfiles = {"linux_r3.5.vdi.lz", "linux_r3.6.vdi.lz"}; + readonly string[] testfiles = + { + "linux_r3.5.vdi.lz", "linux_r3.6.vdi.lz", "linux_4.19_reiser_3.5_flashdrive.vdi.lz", + "linux_4.19_reiser_3.6_flashdrive.vdi.lz" + }; - readonly ulong[] sectors = {262144, 262144}; + readonly ulong[] sectors = {262144, 262144, 1024000, 1024000}; - readonly uint[] sectorsize = {512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512}; - readonly long[] clusters = {32512, 32512}; + readonly long[] clusters = {32512, 32512, 127744, 127744}; - readonly int[] clustersize = {4096, 4096}; + readonly int[] clustersize = {4096, 4096, 4096, 4096}; - readonly string[] reiserversion = {"Reiser 3.5 filesystem", "Reiser 3.6 filesystem"}; + readonly string[] reiserversion = + { + "Reiser 3.5 filesystem", "Reiser 3.6 filesystem", "Reiser 3.5 filesystem", "Reiser 3.6 filesystem" + }; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/UDF.cs b/DiscImageChef.Tests/Filesystems/UDF.cs index 09d7998ee..47615bd86 100644 --- a/DiscImageChef.Tests/Filesystems/UDF.cs +++ b/DiscImageChef.Tests/Filesystems/UDF.cs @@ -44,36 +44,45 @@ namespace DiscImageChef.Tests.Filesystems "1.02/linux.vdi.lz", "1.02/macosx_10.11.vdi.lz", "1.50/linux.vdi.lz", "1.50/macosx_10.11.vdi.lz", "2.00/linux.vdi.lz", "2.00/macosx_10.11.vdi.lz", "2.01/linux.vdi.lz", "2.01/macosx_10.11.vdi.lz", "2.50/linux.vdi.lz", "2.50/macosx_10.11.vdi.lz", "2.60/macosx_10.11.vdi.lz", "1.50/solaris_7.vdi.lz", - "1.50/solaris_9.vdi.lz", "2.01/netbsd_7.1.vdi.lz" + "1.50/solaris_9.vdi.lz", "2.01/netbsd_7.1.vdi.lz", "1.02/linux_4.19_udf_1.02_flashdrive.vdi.lz", + "1.50/linux_4.19_udf_1.50_flashdrive.vdi.lz", "2.00/linux_4.19_udf_2.00_flashdrive.vdi.lz", + "2.01/linux_4.19_udf_2.01_flashdrive.vdi.lz" }; readonly ulong[] sectors = { 1024000, 204800, 1024000, 409600, 1024000, 614400, 1024000, 819200, 1024000, 1024000, 1228800, 8388608, - 8388608, 8388608 + 8388608, 8388608, 1024000, 1024000, 1024000, 1024000 }; - readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512}; + readonly uint[] sectorsize = + { + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512 + }; readonly long[] clusters = { 1024000, 204800, 1024000, 409600, 1024000, 614400, 1024000, 819200, 1024000, 1024000, 1228800, 8388608, - 8388608, 8388608 + 8388608, 8388608, 1024000, 1024000, 1024000, 1024000 }; - readonly int[] clustersize = {512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512}; + readonly int[] clustersize = + { + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512 + }; readonly string[] udfversion = { "UDF v1.02", "UDF v1.02", "UDF v1.50", "UDF v1.50", "UDF v2.00", "UDF v2.00", "UDF v2.01", "UDF v2.01", - "UDF v2.50", "UDF v2.50", "UDF v2.60", "UDF v1.50", "UDF v1.50", "UDF v2.01" + "UDF v2.50", "UDF v2.50", "UDF v2.60", "UDF v1.50", "UDF v1.50", "UDF v2.01", "UDF v2.01", "UDF v2.01", + "UDF v2.01", "UDF v2.01" }; readonly string[] volumename = { "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "Volume label", "*NoLabel*", - "*NoLabel*", "anonymous" + "*NoLabel*", "anonymous", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter", "DicSetter" }; readonly string[] volumeserial = @@ -83,7 +92,8 @@ namespace DiscImageChef.Tests.Filesystems "5D91CB4F (Mac OS X newfs_udf) UDF Volume Set", "595c5d0bee60c3bbLinuxUDF", "48847EB3 (Mac OS X newfs_udf) UDF Volume Set", "595c5d0e4f338552LinuxUDF", "709E84A1 (Mac OS X newfs_udf) UDF Volume Set", "78CE3237 (Mac OS X newfs_udf) UDF Volume Set", - "595EB2A9", "595EB55A", "7cc94d726669d773" + "595EB2A9", "595EB55A", "7cc94d726669d773", "5cc7882441a86e93LinuxUDF", "5cc78f8bba4dfe00LinuxUDF", + "5cc7f4183e0d5f7aLinuxUDF", "5cc8816fcb3a3b38LinuxUDF", "595EB55A", "7cc94d726669d773" }; readonly string[] oemid = @@ -91,7 +101,8 @@ namespace DiscImageChef.Tests.Filesystems "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Apple Mac OS X UDF FS", "*SUN SOLARIS UDF", "*SUN SOLARIS UDF", - "*NetBSD userland UDF" + "*NetBSD userland UDF", "*Linux UDFFS", "*Linux UDFFS", "*Linux UDFFS", "*Linux UDFFS", "*Linux UDFFS", + "*Linux UDFFS" }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/XFS.cs b/DiscImageChef.Tests/Filesystems/XFS.cs index 160ad9b0f..9992ea090 100644 --- a/DiscImageChef.Tests/Filesystems/XFS.cs +++ b/DiscImageChef.Tests/Filesystems/XFS.cs @@ -40,19 +40,22 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class XfsMbr { - readonly string[] testfiles = {"linux.vdi.lz"}; + readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_xfs_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {1048576}; + readonly ulong[] sectors = {1048576, 1024000}; - readonly uint[] sectorsize = {512}; + readonly uint[] sectorsize = {512, 512}; - readonly long[] clusters = {130816}; + readonly long[] clusters = {130816, 127744}; - readonly int[] clustersize = {4096}; + readonly int[] clustersize = {4096, 4096}; - readonly string[] volumename = {"Volume label"}; + readonly string[] volumename = {"Volume label", "DicSetter"}; - readonly string[] volumeserial = {"230075b7-9834-b44e-a257-982a058311d8"}; + readonly string[] volumeserial = + { + "230075b7-9834-b44e-a257-982a058311d8", "ed6b4d35-aa66-ce4a-9d8f-c56dbc6d7c8c" + }; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/btrfs.cs b/DiscImageChef.Tests/Filesystems/btrfs.cs index def17570e..762124688 100644 --- a/DiscImageChef.Tests/Filesystems/btrfs.cs +++ b/DiscImageChef.Tests/Filesystems/btrfs.cs @@ -41,19 +41,22 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class Btrfs { - readonly string[] testfiles = {"linux.vdi.lz"}; + readonly string[] testfiles = {"linux.vdi.lz", "linux_4.19_btrfs_flashdrive.vdi.lz"}; - readonly ulong[] sectors = {262144}; + readonly ulong[] sectors = {262144, 1024000}; - readonly uint[] sectorsize = {512}; + readonly uint[] sectorsize = {512, 512}; - readonly long[] clusters = {32512}; + readonly long[] clusters = {32512, 127744}; - readonly int[] clustersize = {4096}; + readonly int[] clustersize = {4096, 4096}; - readonly string[] volumename = {"VolumeLabel"}; + readonly string[] volumename = {"VolumeLabel", "btrfs"}; - readonly string[] volumeserial = {"a4fc5201-85cc-6840-8a68-998cab9ae897"}; + readonly string[] volumeserial = + { + "a4fc5201-85cc-6840-8a68-998cab9ae897", "5af44541-0605-f541-af6d-c229576707ab" + }; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/exFAT.cs b/DiscImageChef.Tests/Filesystems/exFAT.cs index bda4db6ec..49e49b545 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT.cs @@ -142,19 +142,23 @@ namespace DiscImageChef.Tests.Filesystems [TestFixture] public class ExFatMbr { - readonly string[] testfiles = {"linux.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "winvista.vdi.lz"}; + readonly string[] testfiles = + { + "linux.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "winvista.vdi.lz", + "linux_4.19_exfat_flashdrive.vdi.lz" + }; - readonly ulong[] sectors = {262144, 262144, 262144, 262144}; + readonly ulong[] sectors = {262144, 262144, 262144, 262144, 1024000}; - readonly uint[] sectorsize = {512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512}; - readonly long[] clusters = {32464, 32712, 32448, 32208}; + readonly long[] clusters = {32464, 32712, 32448, 32208, 15964}; - readonly int[] clustersize = {4096, 4096, 4096, 4096}; + readonly int[] clustersize = {4096, 4096, 4096, 4096, 32768}; - readonly string[] volumename = {null, null, null, null}; + readonly string[] volumename = {null, null, null, null, null}; - readonly string[] volumeserial = {"603565AC", "595AC21E", "20126663", "0AC5CA52"}; + readonly string[] volumeserial = {"603565AC", "595AC21E", "20126663", "0AC5CA52", "636E083B"}; [Test] public void Test() diff --git a/DiscImageChef.Tests/Filesystems/ext2.cs b/DiscImageChef.Tests/Filesystems/ext2.cs index 02210aa5f..c5db503e2 100644 --- a/DiscImageChef.Tests/Filesystems/ext2.cs +++ b/DiscImageChef.Tests/Filesystems/ext2.cs @@ -44,27 +44,33 @@ namespace DiscImageChef.Tests.Filesystems readonly string[] testfiles = { "linux_ext2.vdi.lz", "linux_ext3.vdi.lz", "linux_ext4.vdi.lz", "netbsd_7.1.vdi.lz", - "netbsd_7.1_r0.vdi.lz" + "netbsd_7.1_r0.vdi.lz", "linux_4.19_ext2_flashdrive.vdi.lz", "linux_4.19_ext3_flashdrive.vdi.lz", + "linux_4.19_ext4_flashdrive.vdi.lz" }; - readonly ulong[] sectors = {262144, 262144, 262144, 8388608, 2097152}; + readonly ulong[] sectors = {262144, 262144, 262144, 8388608, 2097152, 1024000, 1024000, 1024000}; - readonly uint[] sectorsize = {512, 512, 512, 512, 512}; + readonly uint[] sectorsize = {512, 512, 512, 512, 512, 512, 512, 512}; - readonly long[] clusters = {130048, 130048, 130048, 1046567, 260135}; + readonly long[] clusters = {130048, 130048, 130048, 1046567, 260135, 510976, 510976, 510976}; - readonly int[] clustersize = {1024, 1024, 1024, 4096, 4096}; + readonly int[] clustersize = {1024, 1024, 1024, 4096, 4096, 1024, 1024, 1024}; - readonly string[] volumename = {"VolumeLabel", "VolumeLabel", "VolumeLabel", "Volume label", "Volume label"}; + readonly string[] volumename = + { + "VolumeLabel", "VolumeLabel", "VolumeLabel", "Volume label", "Volume label", "DicSetter", "DicSetter", + "DicSetter" + }; readonly string[] volumeserial = { "8e3992cf-7d98-e44a-b753-0591a35913eb", "1b411516-5415-4b42-95e6-1a247056a960", "b2f8f305-770f-ad47-abe4-f0484aa319e9", "e72aee05-627b-11e7-a573-0800272a08ec", - "072756f2-627c-11e7-a573-0800272a08ec" + "072756f2-627c-11e7-a573-0800272a08ec", "f5b2500f-99fb-764b-a6c4-c4db0b98a653", + "a3914b55-260f-7245-8c72-7ccdf45436cb", "10413797-43d1-6545-8fbc-6ebc9d328be9" }; - readonly string[] extversion = {"ext2", "ext3", "ext4", "ext2", "ext2"}; + readonly string[] extversion = {"ext2", "ext3", "ext4", "ext2", "ext2", "ext2", "ext3", "ext4"}; [Test] public void Test()