diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs index 74249f745..ea4e9cd70 100644 --- a/Aaru.Tests/Filesystems/FAT12/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs @@ -806,40 +806,40 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "freebsd_6.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16384, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 2044, + Clusters = 3016, ClusterSize = 4096, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "8FC80E0A" + VolumeSerial = "76D11EF0" }, new FileSystemTest { TestFile = "freebsd_7.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16384, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 2044, + Clusters = 3016, ClusterSize = 4096, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "34FA0E0B" + VolumeSerial = "52491EF0" }, new FileSystemTest { TestFile = "freebsd_8.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16384, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 2044, + Clusters = 3016, ClusterSize = 4096, SystemId = "BSD4.4 ", VolumeName = "VOLUMELABEL", - VolumeSerial = "02140E0B" + VolumeSerial = "DF9D1EEF" }, new FileSystemTest { @@ -853,6 +853,58 @@ namespace Aaru.Tests.Filesystems.FAT12 SystemId = "BSD 4.4", VolumeName = "NO NAME", VolumeSerial = "63C81AFB" + }, + new FileSystemTest + { + TestFile = "netbsd_1.6.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "84431CEB" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3063, + ClusterSize = 4096, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "7F161B1D" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "40961817" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "F01F07F2" } }; } diff --git a/Aaru.Tests/Filesystems/FAT12/Whole.cs b/Aaru.Tests/Filesystems/FAT12/Whole.cs index f5f356426..7617b8491 100644 --- a/Aaru.Tests/Filesystems/FAT12/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT12/Whole.cs @@ -5442,6 +5442,45 @@ namespace Aaru.Tests.Filesystems.FAT12 SystemId = "BSD 4.4", VolumeName = "NO NAME", VolumeSerial = "3E8C1A1F" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "2EE71B0B" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "80C21715" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "4E6B1F17" } }; } diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs index 8d00f5a51..ee9995d4d 100644 --- a/Aaru.Tests/Filesystems/FAT16/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs @@ -739,40 +739,40 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "freebsd_6.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63998, - ClusterSize = 8192, + Clusters = 65504, + ClusterSize = 2048, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "3CF10E0D" + VolumeSerial = "437B1EF6" }, new FileSystemTest { TestFile = "freebsd_7.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63998, - ClusterSize = 8192, + Clusters = 65504, + ClusterSize = 2048, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "C6C30E0D" + VolumeSerial = "BE841EF5" }, new FileSystemTest { TestFile = "freebsd_8.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 31999, - ClusterSize = 16384, + Clusters = 16376, + ClusterSize = 8192, SystemId = "BSD4.4 ", VolumeName = "VOLUMELABEL", - VolumeSerial = "44770E0D" + VolumeSerial = "E40B1EF6" }, new FileSystemTest { @@ -902,6 +902,58 @@ namespace Aaru.Tests.Filesystems.FAT16 SystemId = "BSD 4.4", VolumeName = "NO NAME", VolumeSerial = "1B3F1B00" + }, + new FileSystemTest + { + TestFile = "netbsd_1.6.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "80A91CF3" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 16380, + ClusterSize = 8192, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "40C91B1F" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 16380, + ClusterSize = 8192, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "8413181B" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "84E407F6" } }; } diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs index badbe992f..8099052c1 100644 --- a/Aaru.Tests/Filesystems/FAT32/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs @@ -256,27 +256,27 @@ namespace Aaru.Tests.Filesystems.FAT32 { TestFile = "freebsd_6.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 4194304, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 524112, + Clusters = 32752, ClusterSize = 4096, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "41540E0E" + VolumeSerial = "40931EFC" }, new FileSystemTest { TestFile = "freebsd_7.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 4194304, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 524112, + Clusters = 32752, ClusterSize = 4096, SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", - VolumeSerial = "4E600E0F" + VolumeSerial = "F4181EFC" }, new FileSystemTest { @@ -381,6 +381,58 @@ namespace Aaru.Tests.Filesystems.FAT32 SystemId = "BSD 4.4", VolumeName = "NO NAME", VolumeSerial = "837A1B05" + }, + new FileSystemTest + { + TestFile = "netbsd_1.6.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "CFAD1CF7" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 16380, + ClusterSize = 8192, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "A1CC1BED" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 131040, + ClusterSize = 1024, + SystemId = "NetBSD ", + VolumeName = "VOLUMELABEL", + VolumeSerial = "843A181F" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 32634, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "C27607FB" } }; } diff --git a/Aaru.Tests/Filesystems/HFS/APM.cs b/Aaru.Tests/Filesystems/HFS/APM.cs index 20c045b6b..02a4fcdfc 100644 --- a/Aaru.Tests/Filesystems/HFS/APM.cs +++ b/Aaru.Tests/Filesystems/HFS/APM.cs @@ -411,9 +411,29 @@ namespace Aaru.Tests.Filesystems.HFS }, new FileSystemTest { - TestFile = "vcpformatter_2.1.1.aif", + TestFile = "nextstep_3.3.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 54840, + Sectors = 262144, + SectorSize = 512, + Clusters = 54643, + ClusterSize = 512, + VolumeName = "Volume label" + }, + new FileSystemTest + { + TestFile = "openstep_4.0.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 54643, + ClusterSize = 512, + VolumeName = "Volume label" + }, + new FileSystemTest + { + TestFile = "openstep_4.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, SectorSize = 512, Clusters = 54643, ClusterSize = 512, diff --git a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs index 4ba46c064..078a73398 100644 --- a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs +++ b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs @@ -81,6 +81,32 @@ namespace Aaru.Tests.Filesystems.UDF._102 Type = "UDF v2.01", VolumeName = "DicSetter", VolumeSerial = "5cc7882441a86e93LinuxUDF" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v1.50", + VolumeName = "anonymous", + VolumeSerial = "47b062a138bcfb83" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v1.50", + VolumeName = "anonymous", + VolumeSerial = "382885b272e72ab8" } }; } diff --git a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs index af84302f6..cb2e58daf 100644 --- a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs +++ b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs @@ -94,6 +94,32 @@ namespace Aaru.Tests.Filesystems.UDF._150 Type = "UDF v2.01", VolumeName = "DicSetter", VolumeSerial = "5cc78f8bba4dfe00LinuxUDF" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v1.50", + VolumeName = "anonymous", + VolumeSerial = "441072592d72c6e9" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v1.50", + VolumeName = "anonymous", + VolumeSerial = "5b2ab9f9605af1ae" } }; } diff --git a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs index a69e1968d..f38f71831 100644 --- a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs +++ b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs @@ -73,14 +73,14 @@ namespace Aaru.Tests.Filesystems.UDF._201 { TestFile = "netbsd_7.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8388608, + Sectors = 262144, SectorSize = 512, - Clusters = 8388608, + Clusters = 262144, ClusterSize = 512, SystemId = "*NetBSD userland UDF", Type = "UDF v2.01", VolumeName = "anonymous", - VolumeSerial = "7cc94d726669d773" + VolumeSerial = "5bc935e11b089104" }, new FileSystemTest { @@ -94,6 +94,19 @@ namespace Aaru.Tests.Filesystems.UDF._201 Type = "UDF v2.01", VolumeName = "DicSetter", VolumeSerial = "5cc8816fcb3a3b38LinuxUDF" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v2.01", + VolumeName = "anonymous", + VolumeSerial = "60a80c385dda0f96" } }; } diff --git a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs index 7189ef062..53147846e 100644 --- a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs +++ b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs @@ -68,6 +68,32 @@ namespace Aaru.Tests.Filesystems.UDF._250 Type = "UDF v2.50", VolumeName = "Volume label", VolumeSerial = "709E84A1 (Mac OS X newfs_udf) UDF Volume Set" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v2.50", + VolumeName = "anonymous", + VolumeSerial = "672fe9a0114cdddb" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v2.50", + VolumeName = "anonymous", + VolumeSerial = "723d15a55a5d8156" } }; } diff --git a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs index 7974b8eca..f0d20e5a2 100644 --- a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs +++ b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs @@ -55,6 +55,32 @@ namespace Aaru.Tests.Filesystems.UDF._260 Type = "UDF v2.60", VolumeName = "Volume label", VolumeSerial = "78CE3237 (Mac OS X newfs_udf) UDF Volume Set" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v2.60", + VolumeName = "anonymous", + VolumeSerial = "10f24d1248067621" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262144, + ClusterSize = 512, + SystemId = "*NetBSD userland UDF", + Type = "UDF v2.60", + VolumeName = "anonymous", + VolumeSerial = "05f537510deab1e7" } }; } diff --git a/Aaru.Tests/Filesystems/UFS/MBR.cs b/Aaru.Tests/Filesystems/UFS/MBR.cs index 95b0b7c2f..c33070dcd 100644 --- a/Aaru.Tests/Filesystems/UFS/MBR.cs +++ b/Aaru.Tests/Filesystems/UFS/MBR.cs @@ -139,9 +139,19 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/netbsd_1.6.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511992, + Clusters = 130032, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ffs43/netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -149,13 +159,33 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/netbsd_7.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204768, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, new FileSystemTest + { + TestFile = "ffs43/netbsd_7.1_be.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ffs43/openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65504, + ClusterSize = 2048, + Type = "UFS" + }, + new FileSystemTest { TestFile = "ufs1/darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, @@ -229,29 +259,29 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/freebsd_6.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 2097152, + Sectors = 262144, SectorSize = 512, - Clusters = 262138, - ClusterSize = 4096, + Clusters = 65500, + ClusterSize = 2048, Type = "UFS" }, new FileSystemTest { TestFile = "ufs1/freebsd_7.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8388608, + Sectors = 262144, SectorSize = 512, - Clusters = 1048231, - ClusterSize = 4096, + Clusters = 65500, + ClusterSize = 2048, Type = "UFS" }, new FileSystemTest { TestFile = "ufs1/freebsd_8.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8388608, + Sectors = 262144, SectorSize = 512, - Clusters = 2096462, + Clusters = 65500, ClusterSize = 2048, Type = "UFS" }, @@ -259,19 +289,39 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/netbsd_1.6.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 2097152, + Sectors = 262144, SectorSize = 512, - Clusters = 524284, - ClusterSize = 2048, + Clusters = 130032, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, Type = "UFS" }, new FileSystemTest { TestFile = "ufs1/netbsd_7.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511968, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/netbsd_7.1_be.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -299,42 +349,75 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs2/freebsd_6.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16777216, + Sectors = 262144, SectorSize = 512, - Clusters = 2096472, - ClusterSize = 4096, + Clusters = 65500, + ClusterSize = 2048, Type = "UFS2", - VolumeName = "VolumeLabel" + VolumeName = "" }, new FileSystemTest { TestFile = "ufs2/freebsd_7.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16777216, + Sectors = 262144, SectorSize = 512, - Clusters = 2096472, - ClusterSize = 4096, + Clusters = 65500, + ClusterSize = 2048, Type = "UFS2", - VolumeName = "VolumeLabel" + VolumeName = "" }, new FileSystemTest { TestFile = "ufs2/freebsd_8.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 16777216, + Sectors = 262144, SectorSize = 512, - Clusters = 4192945, + Clusters = 65500, ClusterSize = 2048, Type = "UFS2", - VolumeName = "VolumeLabel" + VolumeName = "" }, new FileSystemTest { TestFile = "ufs2/netbsd_7.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 2097152, + Sectors = 262144, SectorSize = 512, - Clusters = 524272, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS2", + VolumeName = "" + }, + new FileSystemTest + { + TestFile = "ufs2/netbsd_7.1_be.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS2", + VolumeName = "" + }, + new FileSystemTest + { + TestFile = "ufs2/netbsd_6.1.5.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS2", + VolumeName = "" + }, + new FileSystemTest + { + TestFile = "ufs2/openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65254, ClusterSize = 2048, Type = "UFS2", VolumeName = "" @@ -360,6 +443,16 @@ namespace Aaru.Tests.Filesystems.UFS ClusterSize = 1024, Type = "UFS", VolumeName = null + }, + new FileSystemTest + { + TestFile = "ufs1/openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65504, + ClusterSize = 2048, + Type = "UFS" } }; } diff --git a/Aaru.Tests/Filesystems/UFS/NeXT.cs b/Aaru.Tests/Filesystems/UFS/NeXT.cs index 5c0f05102..c1cc05503 100644 --- a/Aaru.Tests/Filesystems/UFS/NeXT.cs +++ b/Aaru.Tests/Filesystems/UFS/NeXT.cs @@ -48,9 +48,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "nextstep_3.3.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204640, + Clusters = 130912, ClusterSize = 1024, Type = "UFS" }, @@ -58,9 +58,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "openstep_4.0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204640, + Clusters = 130912, ClusterSize = 1024, Type = "UFS" }, @@ -68,9 +68,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "openstep_4.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204640, + Clusters = 130912, ClusterSize = 1024, Type = "UFS" }, @@ -78,9 +78,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "rhapsody_dr1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204640, + Clusters = 130912, ClusterSize = 1024, Type = "UFS" }, @@ -88,9 +88,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "rhapsody_dr2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 204464, + Clusters = 130880, ClusterSize = 1024, Type = "UFS" } diff --git a/Aaru.Tests/Filesystems/UFS/Whole.cs b/Aaru.Tests/Filesystems/UFS/Whole.cs index 878cb1263..302088104 100644 --- a/Aaru.Tests/Filesystems/UFS/Whole.cs +++ b/Aaru.Tests/Filesystems/UFS/Whole.cs @@ -65,6 +65,16 @@ namespace Aaru.Tests.Filesystems.UFS Type = "UFS" }, new FileSystemTest + { + TestFile = "netbsd_1.6_mf2hd_ffs43.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest { TestFile = "att_unix_svr4v2.1_dsdd.img.lz", MediaType = MediaType.DOS_525_DS_DD_9, @@ -133,6 +143,130 @@ namespace Aaru.Tests.Filesystems.UFS Clusters = 2880, ClusterSize = 512, Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5_mf2hd_ffs43.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5_mf2hd_ufs2.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + VolumeName = "", + Type = "UFS2" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd_ffs43.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd_ufs2.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + VolumeName = "", + Type = "UFS2" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd_be.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd_ffs43_be.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1_mf2hd_ufs2_be.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 2880, + ClusterSize = 512, + VolumeName = "", + Type = "UFS2" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 720, + ClusterSize = 2048, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7_mf2hd_ffs43.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 720, + ClusterSize = 2048, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7_mf2hd_ufs2.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Clusters = 720, + ClusterSize = 2048, + VolumeName = "", + Type = "UFS2" } }; } diff --git a/Aaru.Tests/Filesystems/ext2.cs b/Aaru.Tests/Filesystems/ext2.cs index cbb2b4eb8..78c117a77 100644 --- a/Aaru.Tests/Filesystems/ext2.cs +++ b/Aaru.Tests/Filesystems/ext2.cs @@ -81,27 +81,75 @@ namespace Aaru.Tests.Filesystems }, new FileSystemTest { - TestFile = "netbsd_7.1.aif", + TestFile = "netbsd_6.1.5.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8388608, + Sectors = 262144, SectorSize = 512, - Clusters = 1046567, - ClusterSize = 4096, + Clusters = 131040, + ClusterSize = 1024, Type = "ext2", VolumeName = "Volume label", - VolumeSerial = "e72aee05-627b-11e7-a573-0800272a08ec" + VolumeSerial = "a4a95973-ab77-11eb-811f-08002792bfed" + }, + new FileSystemTest + { + TestFile = "netbsd_6.1.5_r0.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "ext2", + VolumeName = "Volume label", + VolumeSerial = "19b1dda1-ab75-11eb-a6ba-08002792bfed" + }, + new FileSystemTest + { + TestFile = "netbsd_7.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 130540, + ClusterSize = 1024, + Type = "ext2", + VolumeName = "Volume label", + VolumeSerial = "7f49b17e-ab5d-11eb-bc21-0800272a08ec" }, new FileSystemTest { TestFile = "netbsd_7.1_r0.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 2097152, + Sectors = 262144, SectorSize = 512, - Clusters = 260135, - ClusterSize = 4096, + Clusters = 131040, + ClusterSize = 1024, Type = "ext2", VolumeName = "Volume label", - VolumeSerial = "072756f2-627c-11e7-a573-0800272a08ec" + VolumeSerial = "e2601450-ab5c-11eb-a154-0800272a08ec" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "ext2", + VolumeName = "Volume label", + VolumeSerial = "0b2bb462-17ac-c444-8ff0-ab10537ae902" + }, + new FileSystemTest + { + TestFile = "openbsd_4.7_r0.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "ext2", + VolumeName = "Volume label", + VolumeSerial = "32e4de93-37f9-6747-9650-ae7b1f1bb901" }, new FileSystemTest {