From f50a9b2a66b596161e72e3c49be59ac7944347cc Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 25 May 2021 03:09:48 +0100 Subject: [PATCH] Add fstester images created from Darwin, Mac OS X Server and MorphOS. --- Aaru.Tests/Filesystems/AFFS/APM.cs | 84 ++++++++++++++++ Aaru.Tests/Filesystems/AFFS/RDB.cs | 33 +++++++ Aaru.Tests/Filesystems/AFFS2/APM.cs | 63 ++++++++++++ Aaru.Tests/Filesystems/AFFS2/RDB.cs | 11 +++ Aaru.Tests/Filesystems/FAT12/APM.cs | 39 ++++++++ Aaru.Tests/Filesystems/FAT12/MBR.cs | 39 ++++++++ Aaru.Tests/Filesystems/FAT16/APM.cs | 51 ++++++++++ Aaru.Tests/Filesystems/FAT16/MBR.cs | 51 ++++++++++ Aaru.Tests/Filesystems/FAT16/RDB.cs | 12 +++ Aaru.Tests/Filesystems/FAT32/APM.cs | 39 ++++++++ Aaru.Tests/Filesystems/FAT32/MBR.cs | 39 ++++++++ Aaru.Tests/Filesystems/FAT32/Whole.cs | 13 --- Aaru.Tests/Filesystems/HFS+/APM.cs | 96 ++++++++++--------- Aaru.Tests/Filesystems/HFS+/MBR.cs | 80 +++++++--------- Aaru.Tests/Filesystems/HFS/APM.cs | 53 +++++++--- Aaru.Tests/Filesystems/HFS/MBR.cs | 61 +++++++----- Aaru.Tests/Filesystems/HFSX/APM.cs | 36 +++++-- Aaru.Tests/Filesystems/HFSX/MBR.cs | 36 +++++-- .../Filesystems/{PFS3.cs => PFS3/APM.cs} | 16 ++-- Aaru.Tests/Filesystems/PFS3/RDB.cs | 71 ++++++++++++++ Aaru.Tests/Filesystems/SFS/APM.cs | 60 ++++++++++++ Aaru.Tests/Filesystems/SFS/RDB.cs | 9 ++ Aaru.Tests/Filesystems/UFS/APM.cs | 92 ++++++++++++++---- Aaru.Tests/Filesystems/UFS/MBR.cs | 52 ++++++---- Aaru.Tests/Filesystems/UFS/NeXT.cs | 40 ++++++++ 25 files changed, 985 insertions(+), 191 deletions(-) create mode 100644 Aaru.Tests/Filesystems/AFFS/APM.cs create mode 100644 Aaru.Tests/Filesystems/AFFS2/APM.cs rename Aaru.Tests/Filesystems/{PFS3.cs => PFS3/APM.cs} (86%) create mode 100644 Aaru.Tests/Filesystems/PFS3/RDB.cs create mode 100644 Aaru.Tests/Filesystems/SFS/APM.cs diff --git a/Aaru.Tests/Filesystems/AFFS/APM.cs b/Aaru.Tests/Filesystems/AFFS/APM.cs new file mode 100644 index 000000000..09d8269d4 --- /dev/null +++ b/Aaru.Tests/Filesystems/AFFS/APM.cs @@ -0,0 +1,84 @@ +// /*************************************************************************** +// Aaru Data Preservation Suite +// ---------------------------------------------------------------------------- +// +// Filename : AFFS.cs +// Author(s) : Natalia Portillo +// +// Component : Aaru unit testing. +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2021 Natalia Portillo +// ****************************************************************************/ + +using System.IO; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filesystems; +using NUnit.Framework; + +namespace Aaru.Tests.Filesystems.AFFS +{ + [TestFixture] + public class APM : FilesystemTest + { + public APM() : base("Amiga FFS") {} + + public override string DataFolder => + Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (APM)"); + public override IFilesystem Plugin => new AmigaDOSPlugin(); + public override bool Partitions => true; + + public override FileSystemTest[] Tests => new[] + { + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262018, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D930192" + }, + new FileSystemTest + { + TestFile = "morphos_3.13_cache.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262018, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D9105B0" + }, + new FileSystemTest + { + TestFile = "morphos_3.13_intl.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262018, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D93031D" + } + }; + } +} \ No newline at end of file diff --git a/Aaru.Tests/Filesystems/AFFS/RDB.cs b/Aaru.Tests/Filesystems/AFFS/RDB.cs index 18c4240f6..32d9ae6f2 100644 --- a/Aaru.Tests/Filesystems/AFFS/RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS/RDB.cs @@ -122,6 +122,39 @@ namespace Aaru.Tests.Filesystems.AFFS ClusterSize = 1024, VolumeName = "Volume label", VolumeSerial = "A56CC133" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D93009A" + }, + new FileSystemTest + { + TestFile = "morphos_3.13_cache.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D9107DA" + }, + new FileSystemTest + { + TestFile = "morphos_3.13_intl.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "1D92FD23" } }; } diff --git a/Aaru.Tests/Filesystems/AFFS2/APM.cs b/Aaru.Tests/Filesystems/AFFS2/APM.cs new file mode 100644 index 000000000..71b38609e --- /dev/null +++ b/Aaru.Tests/Filesystems/AFFS2/APM.cs @@ -0,0 +1,63 @@ +// /*************************************************************************** +// Aaru Data Preservation Suite +// ---------------------------------------------------------------------------- +// +// Filename : AFFS2.cs +// Author(s) : Natalia Portillo +// +// Component : Aaru unit testing. +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2021 Natalia Portillo +// ****************************************************************************/ + +using System.IO; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filesystems; +using NUnit.Framework; + +namespace Aaru.Tests.Filesystems.AFFS2 +{ + [TestFixture] + public class APM : FilesystemTest + { + public APM() : base("Amiga FFS2") {} + + public override string DataFolder => + Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (APM)"); + + public override IFilesystem Plugin => new AmigaDOSPlugin(); + public override bool Partitions => true; + + public override FileSystemTest[] Tests => new[] + { + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262018, + ClusterSize = 512, + VolumeName = "Volume label", + VolumeSerial = "6144B870" + } + }; + } +} \ No newline at end of file diff --git a/Aaru.Tests/Filesystems/AFFS2/RDB.cs b/Aaru.Tests/Filesystems/AFFS2/RDB.cs index 3605c2549..87c84457d 100644 --- a/Aaru.Tests/Filesystems/AFFS2/RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS2/RDB.cs @@ -57,6 +57,17 @@ namespace Aaru.Tests.Filesystems.AFFS2 ClusterSize = 1024, VolumeName = "Volume label", VolumeSerial = "611D85E5" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512, + VolumeName = "VolumeLabel", + VolumeSerial = "D943AA14" } }; } diff --git a/Aaru.Tests/Filesystems/FAT12/APM.cs b/Aaru.Tests/Filesystems/FAT12/APM.cs index b66b0d94b..683a66734 100644 --- a/Aaru.Tests/Filesystems/FAT12/APM.cs +++ b/Aaru.Tests/Filesystems/FAT12/APM.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT12 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "60270BF5" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "7DDF1B02" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "FFCC1915" + }, new FileSystemTest { TestFile = "macosx_10.3.aif", diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs index 5c22b5c6b..78063628a 100644 --- a/Aaru.Tests/Filesystems/FAT12/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT12 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3016, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "AA180CF0" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "EC241B05" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 3064, + ClusterSize = 4096, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "64F5191A" + }, new FileSystemTest { TestFile = "compaqmsdos331.aif", diff --git a/Aaru.Tests/Filesystems/FAT16/APM.cs b/Aaru.Tests/Filesystems/FAT16/APM.cs index f53f56d57..c062de7f9 100644 --- a/Aaru.Tests/Filesystems/FAT16/APM.cs +++ b/Aaru.Tests/Filesystems/FAT16/APM.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT16 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "96AE0CF4" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "385C1B08" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "024F191D" + }, new FileSystemTest { TestFile = "macosx_10.3.aif", @@ -83,6 +122,18 @@ namespace Aaru.Tests.Filesystems.FAT16 SystemId = "BSD 4.4", VolumeName = "VOLUMELABEL", VolumeSerial = "063D1F09" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65504, + ClusterSize = 2048, + SystemId = "MSWIN4.1", + VolumeName = "VOLUMELABEL", + VolumeSerial = "519F5D1B" } }; } diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs index 5fc38759d..c4e95e278 100644 --- a/Aaru.Tests/Filesystems/FAT16/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT16 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65504, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "44B70CF7" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "1F2E1B0B" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65520, + ClusterSize = 2048, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "936619E5" + }, new FileSystemTest { TestFile = "drdos_3.40.aif", @@ -1254,6 +1293,18 @@ namespace Aaru.Tests.Filesystems.FAT16 ClusterSize = 2048, SystemId = "INSIGNIA", VolumeName = "VOLUMELABEL" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65533, + ClusterSize = 2048, + SystemId = "MSWIN4.1", + VolumeName = "VOLUMELABEL", + VolumeSerial = "519F5C06" } }; } diff --git a/Aaru.Tests/Filesystems/FAT16/RDB.cs b/Aaru.Tests/Filesystems/FAT16/RDB.cs index 64a5185ee..553cb1e6e 100644 --- a/Aaru.Tests/Filesystems/FAT16/RDB.cs +++ b/Aaru.Tests/Filesystems/FAT16/RDB.cs @@ -57,6 +57,18 @@ namespace Aaru.Tests.Filesystems.FAT16 SystemId = "CDP 5.0", VolumeName = "VOLUMELABEL", VolumeSerial = "374D40D1" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65484, + ClusterSize = 2048, + SystemId = "MSWIN4.1", + VolumeName = "VOLUMELABEL", + VolumeSerial = "519F5D8B" } }; } diff --git a/Aaru.Tests/Filesystems/FAT32/APM.cs b/Aaru.Tests/Filesystems/FAT32/APM.cs index e650e27fa..47f94010e 100644 --- a/Aaru.Tests/Filesystems/FAT32/APM.cs +++ b/Aaru.Tests/Filesystems/FAT32/APM.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT32 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262080, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "7C930CFA" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262080, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "44681B0D" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262080, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "72D719E8" + }, new FileSystemTest { TestFile = "macosx_10.3.aif", diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs index e191b1707..93e2430af 100644 --- a/Aaru.Tests/Filesystems/FAT32/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs @@ -45,6 +45,45 @@ namespace Aaru.Tests.Filesystems.FAT32 public override FileSystemTest[] Tests => new[] { + new FileSystemTest + { + TestFile = "darwin_6.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262017, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "03A50CFD" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262081, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "24981B10" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 262081, + ClusterSize = 512, + SystemId = "BSD 4.4", + VolumeName = "VOLUMELABEL", + VolumeSerial = "829119EB" + }, new FileSystemTest { TestFile = "drdos_7.03.aif", diff --git a/Aaru.Tests/Filesystems/FAT32/Whole.cs b/Aaru.Tests/Filesystems/FAT32/Whole.cs index a57051d51..82f62f931 100644 --- a/Aaru.Tests/Filesystems/FAT32/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT32/Whole.cs @@ -149,19 +149,6 @@ namespace Aaru.Tests.Filesystems.FAT32 SystemId = "mkdosfs", VolumeName = "VolumeLabel", VolumeSerial = "00000000" - }, - new FileSystemTest - { - TestFile = "linux_2.2.20_mf2hd_umsdos.img.lz", - MediaType = MediaType.DOS_35_HD, - Sectors = 2880, - SectorSize = 512, - Bootable = true, - Clusters = 2880, - ClusterSize = 512, - SystemId = "mkdosfs", - VolumeName = "VolumeLabel", - VolumeSerial = "00000000" } }; } diff --git a/Aaru.Tests/Filesystems/HFS+/APM.cs b/Aaru.Tests/Filesystems/HFS+/APM.cs index b946c65ea..59e41c4cb 100644 --- a/Aaru.Tests/Filesystems/HFS+/APM.cs +++ b/Aaru.Tests/Filesystems/HFS+/APM.cs @@ -45,7 +45,6 @@ namespace Aaru.Tests.Filesystems.HFSPlus public override IFilesystem Plugin => new AppleHFSPlus(); public override bool Partitions => true; - // Missing Darwin 1.4.1 public override FileSystemTest[] Tests => new[] { new FileSystemTest @@ -71,32 +70,42 @@ namespace Aaru.Tests.Filesystems.HFSPlus VolumeSerial = "33D4A309C8E7BD10" }, new FileSystemTest + { + TestFile = "darwin_1.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "10.0" + }, + new FileSystemTest + { + TestFile = "darwin_1.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "8.10" + }, + new FileSystemTest { TestFile = "darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102392, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0" }, new FileSystemTest { - TestFile = "darwin_1.3.1_wrapped.aif", + TestFile = "darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, + Sectors = 262144, SectorSize = 512, - Clusters = 76774, - ClusterSize = 4096, - SystemId = "10.0" - }, - new FileSystemTest - { - TestFile = "darwin_1.4.1_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76774, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0" }, @@ -104,54 +113,55 @@ namespace Aaru.Tests.Filesystems.HFSPlus { TestFile = "darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102392, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0" }, new FileSystemTest { - TestFile = "darwin_6.0.2_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76774, - ClusterSize = 4096, - SystemId = "10.0" + TestFile = "darwin_7.0.1_journal.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "DF8853FD178AE8BE" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "10.0", + VolumeSerial = "6FE2BC81D9725A6B" }, new FileSystemTest { TestFile = "darwin_8.0.1_journal.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1228800, + Sectors = 262144, SectorSize = 512, - Clusters = 153592, + Clusters = 32760, ClusterSize = 4096, - SystemId = "10.0", - VolumeSerial = "4D5140EB8F14A385" + SystemId = "HFSJ", + VolumeSerial = "06309CEDD929D53A" }, new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102392, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "0D592249833E2DC4" - }, - new FileSystemTest - { - TestFile = "darwin_8.0.1_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76774, - ClusterSize = 4096, - SystemId = "10.0", - VolumeSerial = "AA616146576BD9BC" + VolumeSerial = "4A3AE13A1F410E25" }, new FileSystemTest { diff --git a/Aaru.Tests/Filesystems/HFS+/MBR.cs b/Aaru.Tests/Filesystems/HFS+/MBR.cs index 2bac5c360..0d73d7d09 100644 --- a/Aaru.Tests/Filesystems/HFS+/MBR.cs +++ b/Aaru.Tests/Filesystems/HFS+/MBR.cs @@ -36,7 +36,6 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSPlus { - // Mising Darwin 6.0.2 wrapped [TestFixture] public class MBR : FilesystemTest { @@ -139,19 +138,9 @@ namespace Aaru.Tests.Filesystems.HFSPlus { TestFile = "darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102178, - ClusterSize = 4096, - SystemId = "10.0" - }, - new FileSystemTest - { - TestFile = "darwin_1.3.1_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76708, + Clusters = 32752, ClusterSize = 4096, SystemId = "10.0" }, @@ -159,19 +148,9 @@ namespace Aaru.Tests.Filesystems.HFSPlus { TestFile = "darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102178, - ClusterSize = 4096, - SystemId = "10.0" - }, - new FileSystemTest - { - TestFile = "darwin_1.4.1_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76708, + Clusters = 32752, ClusterSize = 4096, SystemId = "10.0" }, @@ -179,44 +158,55 @@ namespace Aaru.Tests.Filesystems.HFSPlus { TestFile = "darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102178, + Clusters = 32752, ClusterSize = 4096, SystemId = "10.0" }, new FileSystemTest { - TestFile = "darwin_8.0.1_journal.aif", + TestFile = "darwin_7.0.1_journal.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1228800, + Sectors = 262144, SectorSize = 512, - Clusters = 153592, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "B2B3DCFC3EBF92F9" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "F92964F9B3F64ABB" + VolumeSerial = "EF9142272A79F2C7" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1_journal.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "191CACE470B64449" }, new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 819200, + Sectors = 262144, SectorSize = 512, - Clusters = 102392, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "A8FAC484A0A2B177" - }, - new FileSystemTest - { - TestFile = "darwin_8.0.1_wrapped.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 614400, - SectorSize = 512, - Clusters = 76774, - ClusterSize = 4096, - SystemId = "10.0", - VolumeSerial = "D5D5BF1346AD2B8D" + VolumeSerial = "27E25570C58F3CDB" }, new FileSystemTest { diff --git a/Aaru.Tests/Filesystems/HFS/APM.cs b/Aaru.Tests/Filesystems/HFS/APM.cs index b3e5b2a18..96d3bda38 100644 --- a/Aaru.Tests/Filesystems/HFS/APM.cs +++ b/Aaru.Tests/Filesystems/HFS/APM.cs @@ -56,12 +56,22 @@ namespace Aaru.Tests.Filesystems.HFS VolumeName = "Volume label" }, new FileSystemTest + { + TestFile = "darwin_1.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32758, + ClusterSize = 4096, + VolumeName = "Volume label" + }, + new FileSystemTest { TestFile = "darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 51189, + Clusters = 32758, ClusterSize = 4096, VolumeName = "Volume label" }, @@ -69,9 +79,9 @@ namespace Aaru.Tests.Filesystems.HFS { TestFile = "darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 51189, + Clusters = 32758, ClusterSize = 4096, VolumeName = "Volume label" }, @@ -79,22 +89,33 @@ namespace Aaru.Tests.Filesystems.HFS { TestFile = "darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 58502, - ClusterSize = 3584, + Clusters = 65514, + ClusterSize = 2048, VolumeName = "Volume label" }, new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65514, + ClusterSize = 2048, + VolumeName = "Volume label", + VolumeSerial = "AE72FE7C300796B3" + }, + new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 58502, - ClusterSize = 3584, + Clusters = 65514, + ClusterSize = 2048, VolumeName = "Volume label", - VolumeSerial = "AAFE1382AF5AA898" + VolumeSerial = "5D4A28AA69D62082" }, new FileSystemTest { @@ -473,6 +494,16 @@ namespace Aaru.Tests.Filesystems.HFS Clusters = 65504, ClusterSize = 2048, VolumeName = "Volume label" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65499, + ClusterSize = 2048, + VolumeName = "VolumeLabel" } }; } diff --git a/Aaru.Tests/Filesystems/HFS/MBR.cs b/Aaru.Tests/Filesystems/HFS/MBR.cs index d8f04ac8e..0a2783a88 100644 --- a/Aaru.Tests/Filesystems/HFS/MBR.cs +++ b/Aaru.Tests/Filesystems/HFS/MBR.cs @@ -47,24 +47,24 @@ namespace Aaru.Tests.Filesystems.HFS { new FileSystemTest { - TestFile = "macosx_10.3.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 262144, - SectorSize = 512, - Clusters = 65528, - ClusterSize = 2048, - VolumeName = "Volume label", + TestFile = "macosx_10.3.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65528, + ClusterSize = 2048, + VolumeName = "Volume label", VolumeSerial = "5426B36FBE19CF1E" }, new FileSystemTest { - TestFile = "macosx_10.4.aif", - MediaType = MediaType.GENERIC_HDD, - Sectors = 262144, - SectorSize = 512, - Clusters = 65514, - ClusterSize = 2048, - VolumeName = "Volume label", + TestFile = "macosx_10.4.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65514, + ClusterSize = 2048, + VolumeName = "Volume label", VolumeSerial = "E7E1830009BA60A8" }, new FileSystemTest @@ -81,9 +81,9 @@ namespace Aaru.Tests.Filesystems.HFS { TestFile = "darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 51145, + Clusters = 32750, ClusterSize = 4096, VolumeName = "Volume label" }, @@ -91,9 +91,9 @@ namespace Aaru.Tests.Filesystems.HFS { TestFile = "darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 51145, + Clusters = 32750, ClusterSize = 4096, VolumeName = "Volume label" }, @@ -101,22 +101,33 @@ namespace Aaru.Tests.Filesystems.HFS { TestFile = "darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 58452, - ClusterSize = 3584, + Clusters = 65499, + ClusterSize = 2048, VolumeName = "Volume label" }, new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 65515, + ClusterSize = 2048, + VolumeName = "Volume label", + VolumeSerial = "8BF73DE208CD7E7B" + }, + new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 409600, + Sectors = 262144, SectorSize = 512, - Clusters = 58502, - ClusterSize = 3584, + Clusters = 65515, + ClusterSize = 2048, VolumeName = "Volume label", - VolumeSerial = "81FE805D61458753" + VolumeSerial = "D149994212CC652E" }, new FileSystemTest { diff --git a/Aaru.Tests/Filesystems/HFSX/APM.cs b/Aaru.Tests/Filesystems/HFSX/APM.cs index 41738ac70..7ac3a109a 100644 --- a/Aaru.Tests/Filesystems/HFSX/APM.cs +++ b/Aaru.Tests/Filesystems/HFSX/APM.cs @@ -91,25 +91,47 @@ namespace Aaru.Tests.Filesystems.HFSX }, new FileSystemTest { - TestFile = "darwin_8.0.1_journal.aif", + TestFile = "darwin_7.0.1_journal.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1638400, + Sectors = 262144, SectorSize = 512, - Clusters = 204792, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "675A390EBFDFC534" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "BB4ABD7E7E2FF5AF" + VolumeSerial = "EA0C27012D10135B" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1_journal.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "50059A9AA0119AD3" }, new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1433600, + Sectors = 262144, SectorSize = 512, - Clusters = 179192, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "E2F212D815EF77B5" + VolumeSerial = "BCA9EBC858957259" } }; } diff --git a/Aaru.Tests/Filesystems/HFSX/MBR.cs b/Aaru.Tests/Filesystems/HFSX/MBR.cs index 0acf9c151..16b5eb497 100644 --- a/Aaru.Tests/Filesystems/HFSX/MBR.cs +++ b/Aaru.Tests/Filesystems/HFSX/MBR.cs @@ -90,25 +90,47 @@ namespace Aaru.Tests.Filesystems.HFSX }, new FileSystemTest { - TestFile = "darwin_8.0.1_journal.aif", + TestFile = "darwin_7.0.1_journal.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1638400, + Sectors = 262144, SectorSize = 512, - Clusters = 204792, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "49296DD5D4998317" + }, + new FileSystemTest + { + TestFile = "darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "7559DD01BCFADD9A" + VolumeSerial = "6086D6721C36DB41" + }, + new FileSystemTest + { + TestFile = "darwin_8.0.1_journal.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 32760, + ClusterSize = 4096, + SystemId = "HFSJ", + VolumeSerial = "E6ADDA7180241419" }, new FileSystemTest { TestFile = "darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1433600, + Sectors = 262144, SectorSize = 512, - Clusters = 179192, + Clusters = 32760, ClusterSize = 4096, SystemId = "10.0", - VolumeSerial = "AEA39CFBBF14C0FF" + VolumeSerial = "EA6229EBC75E4F92" }, new FileSystemTest { diff --git a/Aaru.Tests/Filesystems/PFS3.cs b/Aaru.Tests/Filesystems/PFS3/APM.cs similarity index 86% rename from Aaru.Tests/Filesystems/PFS3.cs rename to Aaru.Tests/Filesystems/PFS3/APM.cs index dddeb26c4..a9a19afa6 100644 --- a/Aaru.Tests/Filesystems/PFS3.cs +++ b/Aaru.Tests/Filesystems/PFS3/APM.cs @@ -32,15 +32,15 @@ using Aaru.CommonTypes.Interfaces; using Aaru.Filesystems; using NUnit.Framework; -namespace Aaru.Tests.Filesystems +namespace Aaru.Tests.Filesystems.PFS3 { [TestFixture] - public class Pfs3 : FilesystemTest + public class APM : FilesystemTest { - public Pfs3() : base("PFS v3") {} + public APM() : base("PFS v3") {} public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", - "Professional File System 3"); + "Professional File System 3 (APM)"); public override IFilesystem Plugin => new PFS(); public override bool Partitions => true; @@ -48,13 +48,13 @@ namespace Aaru.Tests.Filesystems { new FileSystemTest { - TestFile = "uae.aif", + TestFile = "morphos_3.13.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024128, + Sectors = 262144, SectorSize = 512, - Clusters = 1023552, + Clusters = 262018, ClusterSize = 512, - VolumeName = "PFS" + VolumeName = "VolumeLabel" } }; } diff --git a/Aaru.Tests/Filesystems/PFS3/RDB.cs b/Aaru.Tests/Filesystems/PFS3/RDB.cs new file mode 100644 index 000000000..72dff1750 --- /dev/null +++ b/Aaru.Tests/Filesystems/PFS3/RDB.cs @@ -0,0 +1,71 @@ +// /*************************************************************************** +// Aaru Data Preservation Suite +// ---------------------------------------------------------------------------- +// +// Filename : PFS3.cs +// Author(s) : Natalia Portillo +// +// Component : Aaru unit testing. +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2021 Natalia Portillo +// ****************************************************************************/ + +using System.IO; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using Aaru.Filesystems; +using NUnit.Framework; + +namespace Aaru.Tests.Filesystems.PFS3 +{ + [TestFixture] + public class RDB : FilesystemTest + { + public RDB() : base("PFS v3") {} + + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", + "Professional File System 3 (RDB)"); + public override IFilesystem Plugin => new PFS(); + public override bool Partitions => true; + + public override FileSystemTest[] Tests => new[] + { + new FileSystemTest + { + TestFile = "uae.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 1024128, + SectorSize = 512, + Clusters = 1023552, + ClusterSize = 512, + VolumeName = "PFS" + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512, + VolumeName = "VolumeLabel" + } + }; + } +} \ No newline at end of file diff --git a/Aaru.Tests/Filesystems/SFS/APM.cs b/Aaru.Tests/Filesystems/SFS/APM.cs new file mode 100644 index 000000000..5ddc20bb0 --- /dev/null +++ b/Aaru.Tests/Filesystems/SFS/APM.cs @@ -0,0 +1,60 @@ +// /*************************************************************************** +// Aaru Data Preservation Suite +// ---------------------------------------------------------------------------- +// +// Filename : SFS_MBR.cs +// Author(s) : Natalia Portillo +// +// Component : Aaru unit testing. +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2021 Natalia Portillo +// ****************************************************************************/ + +using System.IO; +using Aaru.CommonTypes; +using Aaru.CommonTypes.Interfaces; +using NUnit.Framework; + +namespace Aaru.Tests.Filesystems.SFS +{ + [TestFixture] + public class APM : FilesystemTest + { + public APM() : base("SmartFileSystem") {} + + public override string DataFolder => + Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (APM)"); + + public override IFilesystem Plugin => new Aaru.Filesystems.SFS(); + public override bool Partitions => true; + + public override FileSystemTest[] Tests => new[] + { + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 262018, + ClusterSize = 512 + } + }; + } +} \ No newline at end of file diff --git a/Aaru.Tests/Filesystems/SFS/RDB.cs b/Aaru.Tests/Filesystems/SFS/RDB.cs index ef7a3116e..2cb6dc02d 100644 --- a/Aaru.Tests/Filesystems/SFS/RDB.cs +++ b/Aaru.Tests/Filesystems/SFS/RDB.cs @@ -81,6 +81,15 @@ namespace Aaru.Tests.Filesystems.SFS SectorSize = 512, Clusters = 511040, ClusterSize = 1024 + }, + new FileSystemTest + { + TestFile = "morphos_3.13.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 261936, + ClusterSize = 512 } }; } diff --git a/Aaru.Tests/Filesystems/UFS/APM.cs b/Aaru.Tests/Filesystems/UFS/APM.cs index 920525096..0ce468da8 100644 --- a/Aaru.Tests/Filesystems/UFS/APM.cs +++ b/Aaru.Tests/Filesystems/UFS/APM.cs @@ -95,12 +95,32 @@ namespace Aaru.Tests.Filesystems.UFS Type = "UFS" }, new FileSystemTest + { + TestFile = "ffs43/darwin_1.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ffs43/darwin_1.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest { TestFile = "ffs43/darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511488, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -108,9 +128,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511488, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -118,9 +138,19 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511488, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ffs43/darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -128,9 +158,29 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511488, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/darwin_1.0.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/darwin_1.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -138,9 +188,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102368, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -148,9 +198,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102368, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -158,9 +208,19 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102368, + Clusters = 131040, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -168,9 +228,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102368, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, diff --git a/Aaru.Tests/Filesystems/UFS/MBR.cs b/Aaru.Tests/Filesystems/UFS/MBR.cs index 2b26e1dc2..7e7b51198 100644 --- a/Aaru.Tests/Filesystems/UFS/MBR.cs +++ b/Aaru.Tests/Filesystems/UFS/MBR.cs @@ -69,9 +69,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511024, + Clusters = 131008, ClusterSize = 1024, Type = "UFS" }, @@ -79,9 +79,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511024, + Clusters = 131008, ClusterSize = 1024, Type = "UFS" }, @@ -89,9 +89,19 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511024, + Clusters = 131008, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ffs43/darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -99,9 +109,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ffs43/darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, - Clusters = 511488, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -189,9 +199,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_1.3.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102280, + Clusters = 131008, ClusterSize = 1024, Type = "UFS" }, @@ -199,9 +209,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_1.4.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102280, + Clusters = 131008, ClusterSize = 1024, Type = "UFS" }, @@ -209,9 +219,19 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_6.0.2.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102280, + Clusters = 131008, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "ufs1/darwin_7.0.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, @@ -219,9 +239,9 @@ namespace Aaru.Tests.Filesystems.UFS { TestFile = "ufs1/darwin_8.0.1.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 204800, + Sectors = 262144, SectorSize = 512, - Clusters = 102368, + Clusters = 131040, ClusterSize = 1024, Type = "UFS" }, diff --git a/Aaru.Tests/Filesystems/UFS/NeXT.cs b/Aaru.Tests/Filesystems/UFS/NeXT.cs index c1cc05503..d1253f3de 100644 --- a/Aaru.Tests/Filesystems/UFS/NeXT.cs +++ b/Aaru.Tests/Filesystems/UFS/NeXT.cs @@ -93,6 +93,46 @@ namespace Aaru.Tests.Filesystems.UFS Clusters = 130880, ClusterSize = 1024, Type = "UFS" + }, + new FileSystemTest + { + TestFile = "macosx_1.0.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 130912, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "macosx_1.1.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 130912, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "macosx_1.2.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 130912, + ClusterSize = 1024, + Type = "UFS" + }, + new FileSystemTest + { + TestFile = "macosx_1.2v3.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Clusters = 130912, + ClusterSize = 1024, + Type = "UFS" } }; }