diff --git a/Aaru.Tests/Partitions/Acorn.cs b/Aaru.Tests/Partitions/Acorn.cs index 6f3dfdeef..d0c894283 100644 --- a/Aaru.Tests/Partitions/Acorn.cs +++ b/Aaru.Tests/Partitions/Acorn.cs @@ -37,60 +37,49 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Acorn"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "linux_ics.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Linux (ICS) - // TODO: Values are incorrect - new[] + new PartitionTest { - new Partition + TestFile = "linux_ics.aif", + Partitions = new[] { - Description = null, - Size = 31457280, - Name = null, - Type = "GEM", - Offset = 512, - Length = 61440, - Sequence = 0, - Start = 1 - }, - new Partition - { - Description = null, - Size = 41943040, - Name = null, - Type = "BGM", - Offset = 31457792, - Length = 81920, - Sequence = 1, - Start = 61441 - }, - new Partition - { - Description = null, - Size = 56402432, - Name = null, - Type = "LNX", - Offset = 73400832, - Length = 110161, - Sequence = 2, - Start = 143361 - }, - new Partition - { - Description = null, - Size = 43212800, - Name = null, - Type = "MAC", - Offset = 129803264, - Length = 84400, - Sequence = 3, - Start = 253522 + new Partition + { + Length = 61440, + Offset = 512, + Sequence = 0, + Size = 31457280, + Start = 1, + Type = "GEM" + }, + new Partition + { + Length = 81920, + Offset = 31457792, + Sequence = 1, + Size = 41943040, + Start = 61441, + Type = "BGM" + }, + new Partition + { + Length = 110161, + Offset = 73400832, + Sequence = 2, + Size = 56402432, + Start = 143361, + Type = "LNX" + }, + new Partition + { + Length = 84400, + Offset = 129803264, + Sequence = 3, + Size = 43212800, + Start = 253522, + Type = "MAC" + } } } }; diff --git a/Aaru.Tests/Partitions/AppleMap.cs b/Aaru.Tests/Partitions/AppleMap.cs index e8e99dbd5..2cc82fbb3 100644 --- a/Aaru.Tests/Partitions/AppleMap.cs +++ b/Aaru.Tests/Partitions/AppleMap.cs @@ -37,1985 +37,1831 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Apple Partition Map"); - - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "d2_driver.aif", "hdt_1.8_encrypted1.aif", "hdt_1.8_encrypted2.aif", "hdt_1.8_password.aif", "hdt_1.8.aif", - "linux.aif", "macos_1.1.aif", "macos_2.0.aif", "macos_4.2.aif", "macos_4.3.aif", "macos_6.0.2.aif", - "macos_6.0.3.aif", "macos_6.0.4.aif", "macos_6.0.5.aif", "macos_6.0.7.aif", "macos_6.0.8.aif", - "macos_6.0.aif", "macos_7.0.aif", "macos_7.1.1.aif", "macos_7.5.aif", "parted.aif", - "silverlining_2.2.1.aif", "speedtools_3.6.aif", "vcpformatter_2.1.1.aif" - }; - - public override Partition[][] Wanted => new[] - { - // D2 - new[] + new PartitionTest { - new Partition + TestFile = "d2_driver.aif", + Partitions = new[] { - Description = null, - Size = 1024, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 2, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 42496, - Name = "Macintosh", - Type = "Apple_Driver43", - Offset = 32768, - Length = 83, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 55808, - Name = "Empty", - Type = "Apple_Free", - Offset = 75264, - Length = 109, - Sequence = 2, - Start = 147 - }, - new Partition - { - Description = null, - Size = 26083328, - Name = "Volume label", - Type = "Apple_HFS", - Offset = 131072, - Length = 50944, - Sequence = 3, - Start = 256 + new Partition + { + Length = 2, + Offset = 32768, + Sequence = 0, + Size = 1024, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 83, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 42496, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 109, + Name = "Empty", + Offset = 75264, + Sequence = 2, + Size = 55808, + Start = 147, + Type = "Apple_Free" + }, + new Partition + { + Length = 50944, + Name = "Volume label", + Offset = 131072, + Sequence = 3, + Size = 26083328, + Start = 256, + Type = "Apple_HFS" + } } }, - - // HDT 1.8 Encryption Level 1 - new[] + new PartitionTest { - new Partition + TestFile = "hdt_1.8_encrypted1.aif", + Partitions = new[] { - Description = null, - Size = 7168, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 14, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "FWB Disk Driver", - Type = "Apple_Driver43", - Offset = 32768, - Length = 1024, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25657344, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 557056, - Length = 50112, - Sequence = 2, - Start = 1088 + new Partition + { + Length = 14, + Offset = 32768, + Sequence = 0, + Size = 7168, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 1024, + Name = "FWB Disk Driver", + Offset = 32768, + Sequence = 1, + Size = 524288, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 50112, + Name = "MacOS", + Offset = 557056, + Sequence = 2, + Size = 25657344, + Start = 1088, + Type = "Apple_HFS" + } } }, - - // HDT 1.8 Encryption Level 2 - new[] + new PartitionTest { - new Partition + TestFile = "hdt_1.8_encrypted2.aif", + Partitions = new[] { - Description = null, - Size = 7168, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 14, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "FWB Disk Driver", - Type = "Apple_Driver43", - Offset = 32768, - Length = 1024, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25657344, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 557056, - Length = 50112, - Sequence = 2, - Start = 1088 + new Partition + { + Length = 14, + Offset = 32768, + Sequence = 0, + Size = 7168, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 1024, + Name = "FWB Disk Driver", + Offset = 32768, + Sequence = 1, + Size = 524288, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 50112, + Name = "MacOS", + Offset = 557056, + Sequence = 2, + Size = 25657344, + Start = 1088, + Type = "Apple_HFS" + } } }, - - // HDT 1.8 with password - new[] + new PartitionTest { - new Partition + TestFile = "hdt_1.8_password.aif", + Partitions = new[] { - Description = null, - Size = 7168, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 14, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "FWB Disk Driver", - Type = "Apple_Driver43", - Offset = 32768, - Length = 1024, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25657344, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 557056, - Length = 50112, - Sequence = 2, - Start = 1088 + new Partition + { + Length = 14, + Offset = 32768, + Sequence = 0, + Size = 7168, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 1024, + Name = "FWB Disk Driver", + Offset = 32768, + Sequence = 1, + Size = 524288, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 50112, + Name = "MacOS", + Offset = 557056, + Sequence = 2, + Size = 25657344, + Start = 1088, + Type = "Apple_HFS" + } } }, - - // HDT 1.8 - new[] + new PartitionTest { - new Partition + TestFile = "hdt_1.8.aif", + Partitions = new[] { - Description = null, - Size = 7168, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 14, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "FWB Disk Driver", - Type = "Apple_Driver43", - Offset = 32768, - Length = 1024, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25657344, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 557056, - Length = 50112, - Sequence = 2, - Start = 1088 + new Partition + { + Length = 14, + Offset = 32768, + Sequence = 0, + Size = 7168, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 1024, + Name = "FWB Disk Driver", + Offset = 32768, + Sequence = 1, + Size = 524288, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 50112, + Name = "MacOS", + Offset = 557056, + Sequence = 2, + Size = 25657344, + Start = 1088, + Type = "Apple_HFS" + } } }, - - // Linux - new[] + new PartitionTest { - new Partition + TestFile = "linux.aif", + Partitions = new[] { - Description = null, - Size = 512, - Name = "Extra", - Type = "Apple_Free", - Offset = 32768, - Length = 1, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 819200, - Name = "bootstrap", - Type = "Apple_Bootstrap", - Offset = 33280, - Length = 1600, - Sequence = 1, - Start = 65 - }, - new Partition - { - Description = null, - Size = 512, - Name = "Extra", - Type = "Apple_Free", - Offset = 852480, - Length = 1, - Sequence = 2, - Start = 1665 - }, - new Partition - { - Description = null, - Size = 52428800, - Name = "Linux", - Type = "Apple_UNIX_SVR2", - Offset = 852992, - Length = 102400, - Sequence = 3, - Start = 1666 - }, - new Partition - { - Description = null, - Size = 20971520, - Name = "ProDOS", - Type = "Apple_PRODOS", - Offset = 53281792, - Length = 40960, - Sequence = 4, - Start = 104066 - }, - new Partition - { - Description = null, - Size = 52428800, - Name = "Macintosh", - Type = "Apple_HFS", - Offset = 74253312, - Length = 102400, - Sequence = 5, - Start = 145026 - }, - new Partition - { - Description = null, - Size = 7535616, - Name = "Extra", - Type = "Apple_Free", - Offset = 126682112, - Length = 14718, - Sequence = 6, - Start = 247426 + new Partition + { + Length = 1, + Name = "Extra", + Offset = 32768, + Sequence = 0, + Size = 512, + Start = 64, + Type = "Apple_Free" + }, + new Partition + { + Length = 1600, + Name = "bootstrap", + Offset = 33280, + Sequence = 1, + Size = 819200, + Start = 65, + Type = "Apple_Bootstrap" + }, + new Partition + { + Length = 1, + Name = "Extra", + Offset = 852480, + Sequence = 2, + Size = 512, + Start = 1665, + Type = "Apple_Free" + }, + new Partition + { + Length = 102400, + Name = "Linux", + Offset = 852992, + Sequence = 3, + Size = 52428800, + Start = 1666, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 40960, + Name = "ProDOS", + Offset = 53281792, + Sequence = 4, + Size = 20971520, + Start = 104066, + Type = "Apple_PRODOS" + }, + new Partition + { + Length = 102400, + Name = "Macintosh", + Offset = 74253312, + Sequence = 5, + Size = 52428800, + Start = 145026, + Type = "Apple_HFS" + }, + new Partition + { + Length = 14718, + Name = "Extra", + Offset = 126682112, + Sequence = 6, + Size = 7535616, + Start = 247426, + Type = "Apple_Free" + } } }, - - // Mac OS 1.1 - new[] + new PartitionTest { - new Partition + TestFile = "macos_1.1.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 2048, - Length = 10, - Sequence = 0, - Start = 4 - }, - new Partition - { - Description = null, - Size = 21403648, - Name = "Macintosh", - Type = "Apple_HFS", - Offset = 8192, - Length = 41804, - Sequence = 1, - Start = 16 + new Partition + { + Length = 10, + Offset = 2048, + Sequence = 0, + Size = 5120, + Start = 4, + Type = "Apple_Driver" + }, + new Partition + { + Length = 41804, + Name = "Macintosh", + Offset = 8192, + Sequence = 1, + Size = 21403648, + Start = 16, + Type = "Apple_HFS" + } } }, - - // Mac OS 2.0 - new[] + new PartitionTest { - new Partition + TestFile = "macos_2.0.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 2048, - Length = 10, - Sequence = 0, - Start = 4 - }, - new Partition - { - Description = null, - Size = 19950080, - Name = "Macintosh", - Type = "Apple_HFS", - Offset = 8192, - Length = 38965, - Sequence = 1, - Start = 16 + new Partition + { + Length = 10, + Offset = 2048, + Sequence = 0, + Size = 5120, + Start = 4, + Type = "Apple_Driver" + }, + new Partition + { + Length = 38965, + Name = "Macintosh", + Offset = 8192, + Sequence = 1, + Size = 19950080, + Start = 16, + Type = "Apple_HFS" + } } }, - - // Mac OS 4.2 - new[] + new PartitionTest { - new Partition + TestFile = "macos_4.2.aif", + Partitions = new[] { - Description = null, - Size = 5632, - Name = null, - Type = "Apple_Driver", - Offset = 2048, - Length = 11, - Sequence = 0, - Start = 4 - }, - new Partition - { - Description = null, - Size = 19950080, - Name = "Macintosh", - Type = "Apple_HFS", - Offset = 8192, - Length = 38965, - Sequence = 1, - Start = 16 + new Partition + { + Length = 11, + Offset = 2048, + Sequence = 0, + Size = 5632, + Start = 4, + Type = "Apple_Driver" + }, + new Partition + { + Length = 38965, + Name = "Macintosh", + Offset = 8192, + Sequence = 1, + Size = 19950080, + Start = 16, + Type = "Apple_HFS" + } } }, - - // Mac OS 4.3 - new[] + new PartitionTest { - new Partition + TestFile = "macos_4.3.aif", + Partitions = new[] { - Description = null, - Size = 5632, - Name = null, - Type = "Apple_Driver", - Offset = 2048, - Length = 11, - Sequence = 0, - Start = 4 - }, - new Partition - { - Description = null, - Size = 19950080, - Name = "Macintosh", - Type = "Apple_HFS", - Offset = 8192, - Length = 38965, - Sequence = 1, - Start = 16 + new Partition + { + Length = 11, + Offset = 2048, + Sequence = 0, + Size = 5632, + Start = 4, + Type = "Apple_Driver" + }, + new Partition + { + Length = 38965, + Name = "Macintosh", + Offset = 8192, + Sequence = 1, + Size = 19950080, + Start = 16, + Type = "Apple_HFS" + } } }, - - // Mac OS 6.0.2 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.2.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 3203072, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 6256, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 3252224, - Length = 1024, - Sequence = 3, - Start = 6352 - }, - new Partition - { - Description = null, - Size = 1048576, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 3776512, - Length = 2048, - Sequence = 4, - Start = 7376 - }, - new Partition - { - Description = null, - Size = 2191360, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 4825088, - Length = 4280, - Sequence = 5, - Start = 9424 - }, - new Partition - { - Description = null, - Size = 1217024, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 7016448, - Length = 2377, - Sequence = 6, - Start = 13704 - }, - new Partition - { - Description = null, - Size = 1572864, - Name = "Eschatology 2", - Type = "Apple_UNIX_SVR2", - Offset = 8233472, - Length = 3072, - Sequence = 7, - Start = 16081 - }, - new Partition - { - Description = null, - Size = 1310720, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 9806336, - Length = 2560, - Sequence = 8, - Start = 19153 - }, - new Partition - { - Description = null, - Size = 2550272, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 11117056, - Length = 4981, - Sequence = 9, - Start = 21713 - }, - new Partition - { - Description = null, - Size = 2048000, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 13667328, - Length = 4000, - Sequence = 10, - Start = 26694 - }, - new Partition - { - Description = null, - Size = 1296384, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 15715328, - Length = 2532, - Sequence = 11, - Start = 30694 - }, - new Partition - { - Description = null, - Size = 1364992, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 17011712, - Length = 2666, - Sequence = 12, - Start = 33226 - }, - new Partition - { - Description = null, - Size = 3986432, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 18376704, - Length = 7786, - Sequence = 13, - Start = 35892 - }, - new Partition - { - Description = null, - Size = 5714944, - Name = "Extra", - Type = "Apple_Free", - Offset = 22363136, - Length = 11162, - Sequence = 14, - Start = 43678 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 6256, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 3203072, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 1024, + Name = "Scratch", + Offset = 3252224, + Sequence = 3, + Size = 524288, + Start = 6352, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 2048, + Name = "Eschatology 1", + Offset = 3776512, + Sequence = 4, + Size = 1048576, + Start = 7376, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4280, + Name = "A/UX Root", + Offset = 4825088, + Sequence = 5, + Size = 2191360, + Start = 9424, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2377, + Name = "Swap", + Offset = 7016448, + Sequence = 6, + Size = 1217024, + Start = 13704, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3072, + Name = "Eschatology 2", + Offset = 8233472, + Sequence = 7, + Size = 1572864, + Start = 16081, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2560, + Name = "Root file system", + Offset = 9806336, + Sequence = 8, + Size = 1310720, + Start = 19153, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4981, + Name = "Usr file system", + Offset = 11117056, + Sequence = 9, + Size = 2550272, + Start = 21713, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4000, + Name = "Random A/UX fs", + Offset = 13667328, + Sequence = 10, + Size = 2048000, + Start = 26694, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2532, + Name = "Random A/UX fs", + Offset = 15715328, + Sequence = 11, + Size = 1296384, + Start = 30694, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2666, + Name = "Usr file system", + Offset = 17011712, + Sequence = 12, + Size = 1364992, + Start = 33226, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 7786, + Name = "Usr file system", + Offset = 18376704, + Sequence = 13, + Size = 3986432, + Start = 35892, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 11162, + Name = "Extra", + Offset = 22363136, + Sequence = 14, + Size = 5714944, + Start = 43678, + Type = "Apple_Free" + } } }, - - // Mac OS 6.0.3 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.3.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 5948928, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 11619, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 1029632, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 5998080, - Length = 2011, - Sequence = 3, - Start = 11715 - }, - new Partition - { - Description = null, - Size = 2455552, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 7027712, - Length = 4796, - Sequence = 4, - Start = 13726 - }, - new Partition - { - Description = null, - Size = 3932160, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 9483264, - Length = 7680, - Sequence = 5, - Start = 18522 - }, - new Partition - { - Description = null, - Size = 4194304, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 13415424, - Length = 8192, - Sequence = 6, - Start = 26202 - }, - new Partition - { - Description = null, - Size = 587776, - Name = "Eschatology 2", - Type = "Apple_UNIX_SVR2", - Offset = 17609728, - Length = 1148, - Sequence = 7, - Start = 34394 - }, - new Partition - { - Description = null, - Size = 6537216, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 18197504, - Length = 12768, - Sequence = 8, - Start = 35542 - }, - new Partition - { - Description = null, - Size = 1766400, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 24734720, - Length = 3450, - Sequence = 9, - Start = 48310 - }, - new Partition - { - Description = null, - Size = 18432, - Name = "Extra", - Type = "Apple_Free", - Offset = 26501120, - Length = 36, - Sequence = 10, - Start = 51760 - }, - new Partition - { - Description = null, - Size = 1558528, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 26519552, - Length = 3044, - Sequence = 11, - Start = 51796 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 11619, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 5948928, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 2011, + Name = "Scratch", + Offset = 5998080, + Sequence = 3, + Size = 1029632, + Start = 11715, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 4796, + Name = "Eschatology 1", + Offset = 7027712, + Sequence = 4, + Size = 2455552, + Start = 13726, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 7680, + Name = "A/UX Root", + Offset = 9483264, + Sequence = 5, + Size = 3932160, + Start = 18522, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 8192, + Name = "Swap", + Offset = 13415424, + Sequence = 6, + Size = 4194304, + Start = 26202, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1148, + Name = "Eschatology 2", + Offset = 17609728, + Sequence = 7, + Size = 587776, + Start = 34394, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 12768, + Name = "Root file system", + Offset = 18197504, + Sequence = 8, + Size = 6537216, + Start = 35542, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3450, + Name = "Usr file system", + Offset = 24734720, + Sequence = 9, + Size = 1766400, + Start = 48310, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 36, + Name = "Extra", + Offset = 26501120, + Sequence = 10, + Size = 18432, + Start = 51760, + Type = "Apple_Free" + }, + new Partition + { + Length = 3044, + Name = "Random A/UX fs", + Offset = 26519552, + Sequence = 11, + Size = 1558528, + Start = 51796, + Type = "Apple_UNIX_SVR2" + } } }, - - // Mac OS 6.0.4 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.4.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 3932160, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 7680, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 3197440, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 3981312, - Length = 6245, - Sequence = 3, - Start = 7776 - }, - new Partition - { - Description = null, - Size = 3197440, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 7178752, - Length = 6245, - Sequence = 4, - Start = 14021 - }, - new Partition - { - Description = null, - Size = 2626560, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 10376192, - Length = 5130, - Sequence = 5, - Start = 20266 - }, - new Partition - { - Description = null, - Size = 1370112, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 13002752, - Length = 2676, - Sequence = 6, - Start = 25396 - }, - new Partition - { - Description = null, - Size = 2944512, - Name = "Eschatology 2", - Type = "Apple_UNIX_SVR2", - Offset = 14372864, - Length = 5751, - Sequence = 7, - Start = 28072 - }, - new Partition - { - Description = null, - Size = 2776576, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 17317376, - Length = 5423, - Sequence = 8, - Start = 33823 - }, - new Partition - { - Description = null, - Size = 2892800, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 20093952, - Length = 5650, - Sequence = 9, - Start = 39246 - }, - new Partition - { - Description = null, - Size = 3433472, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 22986752, - Length = 6706, - Sequence = 10, - Start = 44896 - }, - new Partition - { - Description = null, - Size = 1657856, - Name = "Extra", - Type = "Apple_Free", - Offset = 26420224, - Length = 3238, - Sequence = 11, - Start = 51602 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 7680, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 3932160, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 6245, + Name = "Scratch", + Offset = 3981312, + Sequence = 3, + Size = 3197440, + Start = 7776, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 6245, + Name = "Eschatology 1", + Offset = 7178752, + Sequence = 4, + Size = 3197440, + Start = 14021, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5130, + Name = "A/UX Root", + Offset = 10376192, + Sequence = 5, + Size = 2626560, + Start = 20266, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2676, + Name = "Swap", + Offset = 13002752, + Sequence = 6, + Size = 1370112, + Start = 25396, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5751, + Name = "Eschatology 2", + Offset = 14372864, + Sequence = 7, + Size = 2944512, + Start = 28072, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5423, + Name = "Root file system", + Offset = 17317376, + Sequence = 8, + Size = 2776576, + Start = 33823, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5650, + Name = "Usr file system", + Offset = 20093952, + Sequence = 9, + Size = 2892800, + Start = 39246, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 6706, + Name = "Random A/UX fs", + Offset = 22986752, + Sequence = 10, + Size = 3433472, + Start = 44896, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3238, + Name = "Extra", + Offset = 26420224, + Sequence = 11, + Size = 1657856, + Start = 51602, + Type = "Apple_Free" + } } }, - - // Mac OS 6.0.5 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.5.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 4096, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 342528, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 2146304, - Length = 669, - Sequence = 3, - Start = 4192 - }, - new Partition - { - Description = null, - Size = 1417216, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 2488832, - Length = 2768, - Sequence = 4, - Start = 4861 - }, - new Partition - { - Description = null, - Size = 1830912, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 3906048, - Length = 3576, - Sequence = 5, - Start = 7629 - }, - new Partition - { - Description = null, - Size = 1448960, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 5736960, - Length = 2830, - Sequence = 6, - Start = 11205 - }, - new Partition - { - Description = null, - Size = 2687488, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 7185920, - Length = 5249, - Sequence = 7, - Start = 14035 - }, - new Partition - { - Description = null, - Size = 2565632, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 9873408, - Length = 5011, - Sequence = 8, - Start = 19284 - }, - new Partition - { - Description = null, - Size = 1954816, - Name = "Unreserved 1", - Type = "Apple_UNIX_SVR2", - Offset = 12439040, - Length = 3818, - Sequence = 9, - Start = 24295 - }, - new Partition - { - Description = null, - Size = 3543040, - Name = "Unreserved 2", - Type = "Apple_UNIX_SVR2", - Offset = 14393856, - Length = 6920, - Sequence = 10, - Start = 28113 - }, - new Partition - { - Description = null, - Size = 2565632, - Name = "Unreserved 3", - Type = "Apple_UNIX_SVR2", - Offset = 17936896, - Length = 5011, - Sequence = 11, - Start = 35033 - }, - new Partition - { - Description = null, - Size = 2932224, - Name = "Unreserved 4", - Type = "Apple_UNIX_SVR2", - Offset = 20502528, - Length = 5727, - Sequence = 12, - Start = 40044 - }, - new Partition - { - Description = null, - Size = 1221632, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 23434752, - Length = 2386, - Sequence = 13, - Start = 45771 - }, - new Partition - { - Description = null, - Size = 3421696, - Name = "Extra", - Type = "Apple_Free", - Offset = 24656384, - Length = 6683, - Sequence = 14, - Start = 48157 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 4096, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 2097152, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 669, + Name = "Scratch", + Offset = 2146304, + Sequence = 3, + Size = 342528, + Start = 4192, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 2768, + Name = "Eschatology 1", + Offset = 2488832, + Sequence = 4, + Size = 1417216, + Start = 4861, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3576, + Name = "A/UX Root", + Offset = 3906048, + Sequence = 5, + Size = 1830912, + Start = 7629, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2830, + Name = "Swap", + Offset = 5736960, + Sequence = 6, + Size = 1448960, + Start = 11205, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5249, + Name = "Root file system", + Offset = 7185920, + Sequence = 7, + Size = 2687488, + Start = 14035, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5011, + Name = "Usr file system", + Offset = 9873408, + Sequence = 8, + Size = 2565632, + Start = 19284, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3818, + Name = "Unreserved 1", + Offset = 12439040, + Sequence = 9, + Size = 1954816, + Start = 24295, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 6920, + Name = "Unreserved 2", + Offset = 14393856, + Sequence = 10, + Size = 3543040, + Start = 28113, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5011, + Name = "Unreserved 3", + Offset = 17936896, + Sequence = 11, + Size = 2565632, + Start = 35033, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5727, + Name = "Unreserved 4", + Offset = 20502528, + Sequence = 12, + Size = 2932224, + Start = 40044, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2386, + Name = "Random A/UX fs", + Offset = 23434752, + Sequence = 13, + Size = 1221632, + Start = 45771, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 6683, + Name = "Extra", + Offset = 24656384, + Sequence = 14, + Size = 3421696, + Start = 48157, + Type = "Apple_Free" + } } }, - - // Mac OS 6.0.7 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.7.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 14013952, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 27371, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 1492992, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 14063104, - Length = 2916, - Sequence = 3, - Start = 27467 - }, - new Partition - { - Description = null, - Size = 919040, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 15556096, - Length = 1795, - Sequence = 4, - Start = 30383 - }, - new Partition - { - Description = null, - Size = 1302016, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 16475136, - Length = 2543, - Sequence = 5, - Start = 32178 - }, - new Partition - { - Description = null, - Size = 1796608, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 17777152, - Length = 3509, - Sequence = 6, - Start = 34721 - }, - new Partition - { - Description = null, - Size = 1943552, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 19573760, - Length = 3796, - Sequence = 7, - Start = 38230 - }, - new Partition - { - Description = null, - Size = 2186752, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 21517312, - Length = 4271, - Sequence = 8, - Start = 42026 - }, - new Partition - { - Description = null, - Size = 524288, - Name = "Unreserved 1", - Type = "Apple_UNIX_SVR2", - Offset = 23704064, - Length = 1024, - Sequence = 9, - Start = 46297 - }, - new Partition - { - Description = null, - Size = 655360, - Name = "Unreserved 2", - Type = "Apple_UNIX_SVR2", - Offset = 24228352, - Length = 1280, - Sequence = 10, - Start = 47321 - }, - new Partition - { - Description = null, - Size = 798208, - Name = "Unreserved 3", - Type = "Apple_UNIX_SVR2", - Offset = 24883712, - Length = 1559, - Sequence = 11, - Start = 48601 - }, - new Partition - { - Description = null, - Size = 143360, - Name = "Extra", - Type = "Apple_Free", - Offset = 25681920, - Length = 280, - Sequence = 12, - Start = 50160 - }, - new Partition - { - Description = null, - Size = 2252800, - Name = "Unreserved 4", - Type = "Apple_UNIX_SVR2", - Offset = 25825280, - Length = 4400, - Sequence = 13, - Start = 50440 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 27371, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 14013952, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 2916, + Name = "Eschatology 1", + Offset = 14063104, + Sequence = 3, + Size = 1492992, + Start = 27467, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1795, + Name = "A/UX Root", + Offset = 15556096, + Sequence = 4, + Size = 919040, + Start = 30383, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2543, + Name = "Swap", + Offset = 16475136, + Sequence = 5, + Size = 1302016, + Start = 32178, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3509, + Name = "Root file system", + Offset = 17777152, + Sequence = 6, + Size = 1796608, + Start = 34721, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3796, + Name = "Usr file system", + Offset = 19573760, + Sequence = 7, + Size = 1943552, + Start = 38230, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4271, + Name = "Random A/UX fs", + Offset = 21517312, + Sequence = 8, + Size = 2186752, + Start = 42026, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1024, + Name = "Unreserved 1", + Offset = 23704064, + Sequence = 9, + Size = 524288, + Start = 46297, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1280, + Name = "Unreserved 2", + Offset = 24228352, + Sequence = 10, + Size = 655360, + Start = 47321, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1559, + Name = "Unreserved 3", + Offset = 24883712, + Sequence = 11, + Size = 798208, + Start = 48601, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 280, + Name = "Extra", + Offset = 25681920, + Sequence = 12, + Size = 143360, + Start = 50160, + Type = "Apple_Free" + }, + new Partition + { + Length = 4400, + Name = "Unreserved 4", + Offset = 25825280, + Sequence = 13, + Size = 2252800, + Start = 50440, + Type = "Apple_UNIX_SVR2" + } } }, - - // Mac OS 6.0.8 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.8.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 4575744, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 8937, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 1143808, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 4624896, - Length = 2234, - Sequence = 3, - Start = 9033 - }, - new Partition - { - Description = null, - Size = 3020800, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 5768704, - Length = 5900, - Sequence = 4, - Start = 11267 - }, - new Partition - { - Description = null, - Size = 1615872, - Name = "Unreserved 1", - Type = "Apple_UNIX_SVR2", - Offset = 8789504, - Length = 3156, - Sequence = 5, - Start = 17167 - }, - new Partition - { - Description = null, - Size = 1384960, - Name = "Unreserved 3", - Type = "Apple_UNIX_SVR2", - Offset = 10405376, - Length = 2705, - Sequence = 6, - Start = 20323 - }, - new Partition - { - Description = null, - Size = 952832, - Name = "Unreserved 4", - Type = "Apple_UNIX_SVR2", - Offset = 11790336, - Length = 1861, - Sequence = 7, - Start = 23028 - }, - new Partition - { - Description = null, - Size = 1246208, - Name = "Extra", - Type = "Apple_Free", - Offset = 12743168, - Length = 2434, - Sequence = 8, - Start = 24889 - }, - new Partition - { - Description = null, - Size = 1495040, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 13989376, - Length = 2920, - Sequence = 9, - Start = 27323 - }, - new Partition - { - Description = null, - Size = 1615872, - Name = "Unreserved 2", - Type = "Apple_UNIX_SVR2", - Offset = 15484416, - Length = 3156, - Sequence = 10, - Start = 30243 - }, - new Partition - { - Description = null, - Size = 2885120, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 17100288, - Length = 5635, - Sequence = 11, - Start = 33399 - }, - new Partition - { - Description = null, - Size = 2308096, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 19985408, - Length = 4508, - Sequence = 12, - Start = 39034 - }, - new Partition - { - Description = null, - Size = 3693056, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 22293504, - Length = 7213, - Sequence = 13, - Start = 43542 - }, - new Partition - { - Description = null, - Size = 2091520, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 25986560, - Length = 4085, - Sequence = 14, - Start = 50755 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 8937, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 4575744, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 2234, + Name = "Scratch", + Offset = 4624896, + Sequence = 3, + Size = 1143808, + Start = 9033, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 5900, + Name = "Eschatology 1", + Offset = 5768704, + Sequence = 4, + Size = 3020800, + Start = 11267, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3156, + Name = "Unreserved 1", + Offset = 8789504, + Sequence = 5, + Size = 1615872, + Start = 17167, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2705, + Name = "Unreserved 3", + Offset = 10405376, + Sequence = 6, + Size = 1384960, + Start = 20323, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 1861, + Name = "Unreserved 4", + Offset = 11790336, + Sequence = 7, + Size = 952832, + Start = 23028, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2434, + Name = "Extra", + Offset = 12743168, + Sequence = 8, + Size = 1246208, + Start = 24889, + Type = "Apple_Free" + }, + new Partition + { + Length = 2920, + Name = "Random A/UX fs", + Offset = 13989376, + Sequence = 9, + Size = 1495040, + Start = 27323, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 3156, + Name = "Unreserved 2", + Offset = 15484416, + Sequence = 10, + Size = 1615872, + Start = 30243, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5635, + Name = "Usr file system", + Offset = 17100288, + Sequence = 11, + Size = 2885120, + Start = 33399, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4508, + Name = "Root file system", + Offset = 19985408, + Sequence = 12, + Size = 2308096, + Start = 39034, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 7213, + Name = "Swap", + Offset = 22293504, + Sequence = 13, + Size = 3693056, + Start = 43542, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4085, + Name = "A/UX Root", + Offset = 25986560, + Sequence = 14, + Size = 2091520, + Start = 50755, + Type = "Apple_UNIX_SVR2" + } } }, - - // Mac OS 6.0 - new[] + new PartitionTest { - new Partition + TestFile = "macos_6.0.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 4096, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 2146304, - Length = 4096, - Sequence = 3, - Start = 4192 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 4243456, - Length = 4096, - Sequence = 4, - Start = 8288 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 6340608, - Length = 4096, - Sequence = 5, - Start = 12384 - }, - new Partition - { - Description = null, - Size = 1048576, - Name = "Swap", - Type = "Apple_UNIX_SVR2", - Offset = 8437760, - Length = 2048, - Sequence = 6, - Start = 16480 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "Eschatology 2", - Type = "Apple_UNIX_SVR2", - Offset = 9486336, - Length = 4096, - Sequence = 7, - Start = 18528 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 11583488, - Length = 4096, - Sequence = 8, - Start = 22624 - }, - new Partition - { - Description = null, - Size = 2310144, - Name = "Usr file system", - Type = "Apple_UNIX_SVR2", - Offset = 13680640, - Length = 4512, - Sequence = 9, - Start = 26720 - }, - new Partition - { - Description = null, - Size = 5416960, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 15990784, - Length = 10580, - Sequence = 10, - Start = 31232 - }, - new Partition - { - Description = null, - Size = 4096, - Name = "Extra", - Type = "Apple_Free", - Offset = 21407744, - Length = 8, - Sequence = 11, - Start = 41812 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 4096, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 2097152, + Start = 96, + Type = "Apple_HFS" + }, + new Partition + { + Length = 4096, + Name = "Scratch", + Offset = 2146304, + Sequence = 3, + Size = 2097152, + Start = 4192, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 4096, + Name = "Eschatology 1", + Offset = 4243456, + Sequence = 4, + Size = 2097152, + Start = 8288, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4096, + Name = "A/UX Root", + Offset = 6340608, + Sequence = 5, + Size = 2097152, + Start = 12384, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 2048, + Name = "Swap", + Offset = 8437760, + Sequence = 6, + Size = 1048576, + Start = 16480, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4096, + Name = "Eschatology 2", + Offset = 9486336, + Sequence = 7, + Size = 2097152, + Start = 18528, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4096, + Name = "Root file system", + Offset = 11583488, + Sequence = 8, + Size = 2097152, + Start = 22624, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4512, + Name = "Usr file system", + Offset = 13680640, + Sequence = 9, + Size = 2310144, + Start = 26720, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 10580, + Name = "Random A/UX fs", + Offset = 15990784, + Sequence = 10, + Size = 5416960, + Start = 31232, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 8, + Name = "Extra", + Offset = 21407744, + Sequence = 11, + Size = 4096, + Start = 41812, + Type = "Apple_Free" + } } }, - - // Mac OS 7.0 - new[] + new PartitionTest { - new Partition + TestFile = "macos_7.0.aif", + Partitions = new[] { - Description = null, - Size = 5120, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 10, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 3073024, - Name = "Scratch", - Type = "Apple_Scratch", - Offset = 49152, - Length = 6002, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 2726400, - Name = "Root file system", - Type = "Apple_UNIX_SVR2", - Offset = 3122176, - Length = 5325, - Sequence = 3, - Start = 6098 - }, - new Partition - { - Description = null, - Size = 3180544, - Name = "Extra", - Type = "Apple_Free", - Offset = 5848576, - Length = 6212, - Sequence = 4, - Start = 11423 - }, - new Partition - { - Description = null, - Size = 4203520, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 9029120, - Length = 8210, - Sequence = 5, - Start = 17635 - }, - new Partition - { - Description = null, - Size = 2613248, - Name = "Extra", - Type = "Apple_Free", - Offset = 13232640, - Length = 5104, - Sequence = 6, - Start = 25845 - }, - new Partition - { - Description = null, - Size = 5262336, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 15845888, - Length = 10278, - Sequence = 7, - Start = 30949 - }, - new Partition - { - Description = null, - Size = 1707520, - Name = "Eschatology 1", - Type = "Apple_UNIX_SVR2", - Offset = 21108224, - Length = 3335, - Sequence = 8, - Start = 41227 - }, - new Partition - { - Description = null, - Size = 5262336, - Name = "Extra", - Type = "Apple_Free", - Offset = 22815744, - Length = 10278, - Sequence = 9, - Start = 44562 + new Partition + { + Length = 10, + Offset = 32768, + Sequence = 0, + Size = 5120, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 6002, + Name = "Scratch", + Offset = 49152, + Sequence = 2, + Size = 3073024, + Start = 96, + Type = "Apple_Scratch" + }, + new Partition + { + Length = 5325, + Name = "Root file system", + Offset = 3122176, + Sequence = 3, + Size = 2726400, + Start = 6098, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 6212, + Name = "Extra", + Offset = 5848576, + Sequence = 4, + Size = 3180544, + Start = 11423, + Type = "Apple_Free" + }, + new Partition + { + Length = 8210, + Name = "Random A/UX fs", + Offset = 9029120, + Sequence = 5, + Size = 4203520, + Start = 17635, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 5104, + Name = "Extra", + Offset = 13232640, + Sequence = 6, + Size = 2613248, + Start = 25845, + Type = "Apple_Free" + }, + new Partition + { + Length = 10278, + Name = "MacOS", + Offset = 15845888, + Sequence = 7, + Size = 5262336, + Start = 30949, + Type = "Apple_HFS" + }, + new Partition + { + Length = 3335, + Name = "Eschatology 1", + Offset = 21108224, + Sequence = 8, + Size = 1707520, + Start = 41227, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 10278, + Name = "Extra", + Offset = 22815744, + Sequence = 9, + Size = 5262336, + Start = 44562, + Type = "Apple_Free" + } } }, - - // Mac OS 7.1.1 - new[] + new PartitionTest { - new Partition + TestFile = "macos_7.1.1.aif", + Partitions = new[] { - Description = null, - Size = 8704, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 17, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver43", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 1486848, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 49152, - Length = 2904, - Sequence = 2, - Start = 96 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "ProDOS", - Type = "Apple_PRODOS", - Offset = 1536000, - Length = 4096, - Sequence = 3, - Start = 3000 - }, - new Partition - { - Description = null, - Size = 1564160, - Name = "Extra", - Type = "Apple_Free", - Offset = 3633152, - Length = 3055, - Sequence = 4, - Start = 7096 - }, - new Partition - { - Description = null, - Size = 2097152, - Name = "ProDOS", - Type = "Apple_PRODOS", - Offset = 5197312, - Length = 4096, - Sequence = 5, - Start = 10151 - }, - new Partition - { - Description = null, - Size = 5148160, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 7294464, - Length = 10055, - Sequence = 6, - Start = 14247 - }, - new Partition - { - Description = null, - Size = 4406784, - Name = "Extra", - Type = "Apple_Free", - Offset = 12442624, - Length = 8607, - Sequence = 7, - Start = 24302 - }, - new Partition - { - Description = null, - Size = 2485760, - Name = "Random A/UX fs", - Type = "Apple_UNIX_SVR2", - Offset = 16849408, - Length = 4855, - Sequence = 8, - Start = 32909 - }, - new Partition - { - Description = null, - Size = 4746240, - Name = "Extra", - Type = "Apple_Free", - Offset = 19335168, - Length = 9270, - Sequence = 9, - Start = 37764 - }, - new Partition - { - Description = null, - Size = 3996672, - Name = "A/UX Root", - Type = "Apple_UNIX_SVR2", - Offset = 24081408, - Length = 7806, - Sequence = 10, - Start = 47034 + new Partition + { + Length = 17, + Offset = 32768, + Sequence = 0, + Size = 8704, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 2904, + Name = "Random A/UX fs", + Offset = 49152, + Sequence = 2, + Size = 1486848, + Start = 96, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 4096, + Name = "ProDOS", + Offset = 1536000, + Sequence = 3, + Size = 2097152, + Start = 3000, + Type = "Apple_PRODOS" + }, + new Partition + { + Length = 3055, + Name = "Extra", + Offset = 3633152, + Sequence = 4, + Size = 1564160, + Start = 7096, + Type = "Apple_Free" + }, + new Partition + { + Length = 4096, + Name = "ProDOS", + Offset = 5197312, + Sequence = 5, + Size = 2097152, + Start = 10151, + Type = "Apple_PRODOS" + }, + new Partition + { + Length = 10055, + Name = "MacOS", + Offset = 7294464, + Sequence = 6, + Size = 5148160, + Start = 14247, + Type = "Apple_HFS" + }, + new Partition + { + Length = 8607, + Name = "Extra", + Offset = 12442624, + Sequence = 7, + Size = 4406784, + Start = 24302, + Type = "Apple_Free" + }, + new Partition + { + Length = 4855, + Name = "Random A/UX fs", + Offset = 16849408, + Sequence = 8, + Size = 2485760, + Start = 32909, + Type = "Apple_UNIX_SVR2" + }, + new Partition + { + Length = 9270, + Name = "Extra", + Offset = 19335168, + Sequence = 9, + Size = 4746240, + Start = 37764, + Type = "Apple_Free" + }, + new Partition + { + Length = 7806, + Name = "A/UX Root", + Offset = 24081408, + Sequence = 10, + Size = 3996672, + Start = 47034, + Type = "Apple_UNIX_SVR2" + } } }, - - // Mac OS 7.5 - new[] + new PartitionTest { - new Partition + TestFile = "macos_7.5.aif", + Partitions = new[] { - Description = null, - Size = 9216, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 18, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver43", - Offset = 32768, - Length = 32, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 28028928, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 49152, - Length = 54744, - Sequence = 2, - Start = 96 + new Partition + { + Length = 18, + Offset = 32768, + Sequence = 0, + Size = 9216, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 16384, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 54744, + Name = "MacOS", + Offset = 49152, + Sequence = 2, + Size = 28028928, + Start = 96, + Type = "Apple_HFS" + } } }, - - // GNU Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Size = 2064384, - Name = "Extra", - Type = "Apple_Free", - Offset = 32768, - Length = 4032, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 47185920, - Name = "untitled", - Type = "Apple_HFS", - Offset = 2097152, - Length = 92160, - Sequence = 1, - Start = 4096 - }, - new Partition - { - Description = null, - Size = 84934656, - Name = "untitled", - Type = "Apple_UNIX_SVR2", - Offset = 49283072, - Length = 165888, - Sequence = 2, - Start = 96256 + new Partition + { + Length = 4032, + Name = "Extra", + Offset = 32768, + Sequence = 0, + Size = 2064384, + Start = 64, + Type = "Apple_Free" + }, + new Partition + { + Length = 92160, + Name = "untitled", + Offset = 2097152, + Sequence = 1, + Size = 47185920, + Start = 4096, + Type = "Apple_HFS" + }, + new Partition + { + Length = 165888, + Name = "untitled", + Offset = 49283072, + Sequence = 2, + Size = 84934656, + Start = 96256, + Type = "Apple_UNIX_SVR2" + } } }, - - // Silverlining 2.2.1 - new[] + new PartitionTest { - new Partition + TestFile = "silverlining_2.2.1.aif", + Partitions = new[] { - Description = null, - Size = 3072, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 6, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 65536, - Name = "Macintosh_SL", - Type = "Apple_Driver43", - Offset = 32768, - Length = 128, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25088, - Name = null, - Type = "Apple_Driver", - Offset = 98304, - Length = 49, - Sequence = 2, - Start = 192 - }, - new Partition - { - Description = null, - Size = 65536, - Name = "Macintosh_SL", - Type = "Apple_Driver_ATA", - Offset = 98304, - Length = 128, - Sequence = 3, - Start = 192 - }, - new Partition - { - Description = null, - Size = 25804800, - Name = "Untitled #1", - Type = "Apple_HFS", - Offset = 163840, - Length = 50400, - Sequence = 4, - Start = 320 - }, - new Partition - { - Description = null, - Size = 237568, - Name = "Extra", - Type = "Apple_Free", - Offset = 25968640, - Length = 464, - Sequence = 5, - Start = 50720 + new Partition + { + Length = 6, + Offset = 32768, + Sequence = 0, + Size = 3072, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 128, + Name = "Macintosh_SL", + Offset = 32768, + Sequence = 1, + Size = 65536, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 49, + Offset = 98304, + Sequence = 2, + Size = 25088, + Start = 192, + Type = "Apple_Driver" + }, + new Partition + { + Length = 128, + Name = "Macintosh_SL", + Offset = 98304, + Sequence = 3, + Size = 65536, + Start = 192, + Type = "Apple_Driver_ATA" + }, + new Partition + { + Length = 50400, + Name = "Untitled #1", + Offset = 163840, + Sequence = 4, + Size = 25804800, + Start = 320, + Type = "Apple_HFS" + }, + new Partition + { + Length = 464, + Name = "Extra", + Offset = 25968640, + Sequence = 5, + Size = 237568, + Start = 50720, + Type = "Apple_Free" + } } }, - - // Hard Disk Speed Tools 3.6 - new[] + new PartitionTest { - new Partition + TestFile = "speedtools_3.6.aif", + Partitions = new[] { - Description = null, - Size = 13824, - Name = null, - Type = "Apple_Driver", - Offset = 32768, - Length = 27, - Sequence = 0, - Start = 64 - }, - new Partition - { - Description = null, - Size = 51200, - Name = "Macintosh", - Type = "Apple_Driver43", - Offset = 32768, - Length = 100, - Sequence = 1, - Start = 64 - }, - new Partition - { - Description = null, - Size = 25165824, - Name = "untitled", - Type = "Apple_HFS", - Offset = 83968, - Length = 49152, - Sequence = 2, - Start = 164 - }, - new Partition - { - Description = null, - Size = 963584, - Name = "Extra", - Type = "Apple_Free", - Offset = 25249792, - Length = 1882, - Sequence = 3, - Start = 49316 + new Partition + { + Length = 27, + Offset = 32768, + Sequence = 0, + Size = 13824, + Start = 64, + Type = "Apple_Driver" + }, + new Partition + { + Length = 100, + Name = "Macintosh", + Offset = 32768, + Sequence = 1, + Size = 51200, + Start = 64, + Type = "Apple_Driver43" + }, + new Partition + { + Length = 49152, + Name = "untitled", + Offset = 83968, + Sequence = 2, + Size = 25165824, + Start = 164, + Type = "Apple_HFS" + }, + new Partition + { + Length = 1882, + Name = "Extra", + Offset = 25249792, + Sequence = 3, + Size = 963584, + Start = 49316, + Type = "Apple_Free" + } } }, - - // VCP Formatter 2.1.1 - new[] + new PartitionTest { - new Partition + TestFile = "vcpformatter_2.1.1.aif", + Partitions = new[] { - Description = null, - Size = 12288, - Name = null, - Type = "Apple_Driver", - Offset = 57344, - Length = 24, - Sequence = 0, - Start = 112 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Macintosh", - Type = "Apple_Driver", - Offset = 57344, - Length = 32, - Sequence = 1, - Start = 112 - }, - new Partition - { - Description = null, - Size = 16384, - Name = "Extra", - Type = "Apple_Free", - Offset = 73728, - Length = 32, - Sequence = 2, - Start = 144 - }, - new Partition - { - Description = null, - Size = 27986944, - Name = "MacOS", - Type = "Apple_HFS", - Offset = 90112, - Length = 54662, - Sequence = 3, - Start = 176 - }, - - // TODO: ADFS tries to read past this partition... - new Partition - { - Description = null, - Size = 1024, - Name = "Extra", - Type = "Apple_Free", - Offset = 28077056, - Length = 2, - Sequence = 4, - Start = 54838 + new Partition + { + Length = 24, + Offset = 57344, + Sequence = 0, + Size = 12288, + Start = 112, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Macintosh", + Offset = 57344, + Sequence = 1, + Size = 16384, + Start = 112, + Type = "Apple_Driver" + }, + new Partition + { + Length = 32, + Name = "Extra", + Offset = 73728, + Sequence = 2, + Size = 16384, + Start = 144, + Type = "Apple_Free" + }, + new Partition + { + Length = 54662, + Name = "MacOS", + Offset = 90112, + Sequence = 3, + Size = 27986944, + Start = 176, + Type = "Apple_HFS" + }, + new Partition + { + Length = 2, + Name = "Extra", + Offset = 28077056, + Sequence = 4, + Size = 1024, + Start = 54838, + Type = "Apple_Free" + } } } }; diff --git a/Aaru.Tests/Partitions/Atari.cs b/Aaru.Tests/Partitions/Atari.cs index 567bf03a1..b4d486256 100644 --- a/Aaru.Tests/Partitions/Atari.cs +++ b/Aaru.Tests/Partitions/Atari.cs @@ -36,279 +36,234 @@ namespace Aaru.Tests.Partitions public class Atari : PartitionSchemeTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Atari ST"); - - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "linux_ahdi.aif", "linux_icd.aif", "tos_1.04.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Linux (AHDI) - new[] + new PartitionTest { - new Partition + TestFile = "linux_ahdi.aif", + Partitions = new[] { - Description = null, - Size = 31457280, - Name = null, - Type = "GEM", - Offset = 512, - Length = 61440, - Sequence = 0, - Start = 1 - }, - new Partition - { - Description = null, - Size = 41943040, - Name = null, - Type = "BGM", - Offset = 31457792, - Length = 81920, - Sequence = 1, - Start = 61441 - }, - new Partition - { - Description = null, - Size = 56402432, - Name = null, - Type = "LNX", - Offset = 73400832, - Length = 110161, - Sequence = 2, - Start = 143361 - }, - new Partition - { - Description = null, - Size = 43212800, - Name = null, - Type = "MAC", - Offset = 129803264, - Length = 84400, - Sequence = 3, - Start = 253522 - }, - new Partition - { - Description = null, - Size = 57671680, - Name = null, - Type = "MIX", - Offset = 173016064, - Length = 112640, - Sequence = 4, - Start = 337922 - }, - new Partition - { - Description = null, - Size = 62914560, - Name = null, - Type = "MNX", - Offset = 230687744, - Length = 122880, - Sequence = 5, - Start = 450562 - }, - new Partition - { - Description = null, - Size = 73400320, - Name = null, - Type = "RAW", - Offset = 293602304, - Length = 143360, - Sequence = 6, - Start = 573442 - }, - new Partition - { - Description = null, - Size = 78643200, - Name = null, - Type = "SWP", - Offset = 367002624, - Length = 153600, - Sequence = 7, - Start = 716802 - }, - new Partition - { - Description = null, - Size = 1048576, - Name = null, - Type = "UNX", - Offset = 445645824, - Length = 2048, - Sequence = 8, - Start = 870402 - }, - new Partition - { - Description = null, - Size = 77593600, - Name = null, - Type = "LNX", - Offset = 446694400, - Length = 151550, - Sequence = 9, - Start = 872450 + new Partition + { + Length = 61440, + Offset = 512, + Sequence = 0, + Size = 31457280, + Start = 1, + Type = "GEM" + }, + new Partition + { + Length = 81920, + Offset = 31457792, + Sequence = 1, + Size = 41943040, + Start = 61441, + Type = "BGM" + }, + new Partition + { + Length = 110161, + Offset = 73400832, + Sequence = 2, + Size = 56402432, + Start = 143361, + Type = "LNX" + }, + new Partition + { + Length = 84400, + Offset = 129803264, + Sequence = 3, + Size = 43212800, + Start = 253522, + Type = "MAC" + }, + new Partition + { + Length = 112640, + Offset = 173016064, + Sequence = 4, + Size = 57671680, + Start = 337922, + Type = "MIX" + }, + new Partition + { + Length = 122880, + Offset = 230687744, + Sequence = 5, + Size = 62914560, + Start = 450562, + Type = "MNX" + }, + new Partition + { + Length = 143360, + Offset = 293602304, + Sequence = 6, + Size = 73400320, + Start = 573442, + Type = "RAW" + }, + new Partition + { + Length = 153600, + Offset = 367002624, + Sequence = 7, + Size = 78643200, + Start = 716802, + Type = "SWP" + }, + new Partition + { + Length = 2048, + Offset = 445645824, + Sequence = 8, + Size = 1048576, + Start = 870402, + Type = "UNX" + }, + new Partition + { + Length = 151550, + Offset = 446694400, + Sequence = 9, + Size = 77593600, + Start = 872450, + Type = "LNX" + } } }, - - // Linux (ICD) - new[] + new PartitionTest { - new Partition + TestFile = "linux_icd.aif", + Partitions = new[] { - Description = null, - Size = 15728640, - Name = null, - Type = "GEM", - Offset = 512, - Length = 30720, - Sequence = 0, - Start = 1 - }, - new Partition - { - Description = null, - Size = 20971520, - Name = null, - Type = "UNX", - Offset = 15729152, - Length = 40960, - Sequence = 1, - Start = 30721 - }, - new Partition - { - Description = null, - Size = 31457280, - Name = null, - Type = "LNX", - Offset = 36700672, - Length = 61440, - Sequence = 2, - Start = 71681 - }, - new Partition - { - Description = null, - Size = 41943040, - Name = null, - Type = "BGM", - Offset = 68157952, - Length = 81920, - Sequence = 3, - Start = 133121 - }, - new Partition - { - Description = null, - Size = 52428800, - Name = null, - Type = "MAC", - Offset = 110100992, - Length = 102400, - Sequence = 4, - Start = 215041 - }, - new Partition - { - Description = null, - Size = 62914560, - Name = null, - Type = "MIX", - Offset = 162529792, - Length = 122880, - Sequence = 5, - Start = 317441 - }, - new Partition - { - Description = null, - Size = 83886080, - Name = null, - Type = "SWP", - Offset = 225444352, - Length = 163840, - Sequence = 6, - Start = 440321 - }, - new Partition - { - Description = null, - Size = 103809024, - Name = null, - Type = "MNX", - Offset = 309330432, - Length = 202752, - Sequence = 7, - Start = 604161 - }, - new Partition - { - Description = null, - Size = 104857600, - Name = null, - Type = "LNX", - Offset = 413139456, - Length = 204800, - Sequence = 8, - Start = 806913 + new Partition + { + Length = 30720, + Offset = 512, + Sequence = 0, + Size = 15728640, + Start = 1, + Type = "GEM" + }, + new Partition + { + Length = 40960, + Offset = 15729152, + Sequence = 1, + Size = 20971520, + Start = 30721, + Type = "UNX" + }, + new Partition + { + Length = 61440, + Offset = 36700672, + Sequence = 2, + Size = 31457280, + Start = 71681, + Type = "LNX" + }, + new Partition + { + Length = 81920, + Offset = 68157952, + Sequence = 3, + Size = 41943040, + Start = 133121, + Type = "BGM" + }, + new Partition + { + Length = 102400, + Offset = 110100992, + Sequence = 4, + Size = 52428800, + Start = 215041, + Type = "MAC" + }, + new Partition + { + Length = 122880, + Offset = 162529792, + Sequence = 5, + Size = 62914560, + Start = 317441, + Type = "MIX" + }, + new Partition + { + Length = 163840, + Offset = 225444352, + Sequence = 6, + Size = 83886080, + Start = 440321, + Type = "SWP" + }, + new Partition + { + Length = 202752, + Offset = 309330432, + Sequence = 7, + Size = 103809024, + Start = 604161, + Type = "MNX" + }, + new Partition + { + Length = 204800, + Offset = 413139456, + Sequence = 8, + Size = 104857600, + Start = 806913, + Type = "LNX" + } } }, - - // TOS 1.04 - new[] + new PartitionTest { - new Partition + TestFile = "tos_1.04.aif", + Partitions = new[] { - Description = null, - Size = 7340032, - Name = null, - Type = "GEM", - Offset = 1024, - Length = 14336, - Sequence = 0, - Start = 2 - }, - new Partition - { - Description = null, - Size = 7340032, - Name = null, - Type = "GEM", - Offset = 7341056, - Length = 14336, - Sequence = 1, - Start = 14338 - }, - new Partition - { - Description = null, - Size = 7340032, - Name = null, - Type = "GEM", - Offset = 14681088, - Length = 14336, - Sequence = 2, - Start = 28674 - }, - new Partition - { - Description = null, - Size = 7339008, - Name = null, - Type = "GEM", - Offset = 22021120, - Length = 14334, - Sequence = 3, - Start = 43010 + new Partition + { + Length = 14336, + Offset = 1024, + Sequence = 0, + Size = 7340032, + Start = 2, + Type = "GEM" + }, + new Partition + { + Length = 14336, + Offset = 7341056, + Sequence = 1, + Size = 7340032, + Start = 14338, + Type = "GEM" + }, + new Partition + { + Length = 14336, + Offset = 14681088, + Sequence = 2, + Size = 7340032, + Start = 28674, + Type = "GEM" + }, + new Partition + { + Length = 14334, + Offset = 22021120, + Sequence = 3, + Size = 7339008, + Start = 43010, + Type = "GEM" + } } } }; diff --git a/Aaru.Tests/Partitions/BSD.cs b/Aaru.Tests/Partitions/BSD.cs index 19044f5e2..b15866612 100644 --- a/Aaru.Tests/Partitions/BSD.cs +++ b/Aaru.Tests/Partitions/BSD.cs @@ -37,357 +37,295 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "BSD slices"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "parted.aif", "netbsd_1.6.aif", "netbsd_6.1.5.aif", "netbsd_7.1.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Size = 38797312, - Name = null, - Type = "FAT", - Offset = 1048576, - Length = 75776, - Sequence = 0, - Start = 2048 - }, - new Partition - { - Description = null, - Size = 19922944, - Name = null, - Type = "FAT", - Offset = 40894464, - Length = 38912, - Sequence = 1, - Start = 79872 - }, - new Partition - { - Description = null, - Size = 48234496, - Name = null, - Type = "FAT", - Offset = 61865984, - Length = 94208, - Sequence = 2, - Start = 120832 + new Partition + { + Length = 75776, + Offset = 1048576, + Sequence = 0, + Size = 38797312, + Start = 2048, + Type = "FAT" + }, + new Partition + { + Length = 38912, + Offset = 40894464, + Sequence = 1, + Size = 19922944, + Start = 79872, + Type = "FAT" + }, + new Partition + { + Length = 94208, + Offset = 61865984, + Sequence = 2, + Size = 48234496, + Start = 120832, + Type = "FAT" + } } }, - - // NetBSD 1.6 - new[] + new PartitionTest { - new Partition + TestFile = "netbsd_1.6.aif", + Partitions = new[] { - Description = null, - Size = 10453504, - Name = null, - Type = "FAT", - Offset = 516096, - Length = 20417, - Sequence = 0, - Start = 1008 - }, - new Partition - { - Description = null, - Size = 209715200, - Name = null, - Type = "FAT", - Offset = 11354112, - Length = 409600, - Sequence = 1, - Start = 22176 - }, - new Partition - { - Description = null, - Size = 805306368, - Name = null, - Type = "FAT", - Offset = 221405184, - Length = 1572864, - Sequence = 2, - Start = 432432 - }, - new Partition - { - Description = null, - Size = 747656192, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 1027031040, - Length = 1460266, - Sequence = 3, - Start = 2005920 - }, - new Partition - { - Description = null, - Size = 268435456, - Name = null, - Type = "4.4LFS", - Offset = 1774854144, - Length = 524288, - Sequence = 4, - Start = 3466512 - }, - new Partition - { - Description = null, - Size = 103743488, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 2043740160, - Length = 202624, - Sequence = 5, - Start = 3991680 + new Partition + { + Length = 20417, + Offset = 516096, + Sequence = 0, + Size = 10453504, + Start = 1008, + Type = "FAT" + }, + new Partition + { + Length = 409600, + Offset = 11354112, + Sequence = 1, + Size = 209715200, + Start = 22176, + Type = "FAT" + }, + new Partition + { + Length = 1572864, + Offset = 221405184, + Sequence = 2, + Size = 805306368, + Start = 432432, + Type = "FAT" + }, + new Partition + { + Length = 1460266, + Offset = 1027031040, + Sequence = 3, + Size = 747656192, + Start = 2005920, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 524288, + Offset = 1774854144, + Sequence = 4, + Size = 268435456, + Start = 3466512, + Type = "4.4LFS" + }, + new Partition + { + Length = 202624, + Offset = 2043740160, + Sequence = 5, + Size = 103743488, + Start = 3991680, + Type = "4.2BSD Fast File System" + } } }, - - // NetBSD 6.1.5 - new[] + new PartitionTest { - new Partition + TestFile = "netbsd_6.1.5.aif", + Partitions = new[] { - Description = null, - Size = 10485760, - Name = null, - Type = "FAT", - Offset = 516096, - Length = 20480, - Sequence = 0, - Start = 1008 - }, - new Partition - { - Description = null, - Size = 104857600, - Name = null, - Type = "FAT", - Offset = 11354112, - Length = 204800, - Sequence = 1, - Start = 22176 - }, - new Partition - { - Description = null, - Size = 209715200, - Name = null, - Type = "FAT", - Offset = 116637696, - Length = 409600, - Sequence = 2, - Start = 227808 - }, - new Partition - { - Description = null, - Size = 40771584, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 326688768, - Length = 79632, - Sequence = 3, - Start = 638064 - }, - new Partition - { - Description = null, - Size = 419430400, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 367460352, - Length = 819200, - Sequence = 4, - Start = 717696 - }, - new Partition - { - Description = null, - Size = 471859200, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 787562496, - Length = 921600, - Sequence = 5, - Start = 1538208 - }, - - // Type conflicts between DragonFly and NetBSD, really is Apple UFS - new Partition - { - Description = null, - Size = 78643200, - Name = null, - Type = "Hammer", - Offset = 1259790336, - Length = 153600, - Sequence = 6, - Start = 2460528 - }, - new Partition - { - Description = null, - Size = 99614720, - Name = null, - Type = "UNIX 7th Edition", - Offset = 1338753024, - Length = 194560, - Sequence = 7, - Start = 2614752 - }, - new Partition - { - Description = null, - Size = 244318208, - Name = null, - Type = "4.4LFS", - Offset = 1438875648, - Length = 477184, - Sequence = 8, - Start = 2810304 - }, - - // Type conflicts, really is Linux ext2 - new Partition - { - Description = null, - Size = 463978496, - Name = null, - Type = "Digital LSM Public Region", - Offset = 1683505152, - Length = 906208, - Sequence = 9, - Start = 3288096 + new Partition + { + Length = 20480, + Offset = 516096, + Sequence = 0, + Size = 10485760, + Start = 1008, + Type = "FAT" + }, + new Partition + { + Length = 204800, + Offset = 11354112, + Sequence = 1, + Size = 104857600, + Start = 22176, + Type = "FAT" + }, + new Partition + { + Length = 409600, + Offset = 116637696, + Sequence = 2, + Size = 209715200, + Start = 227808, + Type = "FAT" + }, + new Partition + { + Length = 79632, + Offset = 326688768, + Sequence = 3, + Size = 40771584, + Start = 638064, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 819200, + Offset = 367460352, + Sequence = 4, + Size = 419430400, + Start = 717696, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 921600, + Offset = 787562496, + Sequence = 5, + Size = 471859200, + Start = 1538208, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 153600, + Offset = 1259790336, + Sequence = 6, + Size = 78643200, + Start = 2460528, + Type = "Hammer" + }, + new Partition + { + Length = 194560, + Offset = 1338753024, + Sequence = 7, + Size = 99614720, + Start = 2614752, + Type = "UNIX 7th Edition" + }, + new Partition + { + Length = 477184, + Offset = 1438875648, + Sequence = 8, + Size = 244318208, + Start = 2810304, + Type = "4.4LFS" + }, + new Partition + { + Length = 906208, + Offset = 1683505152, + Sequence = 9, + Size = 463978496, + Start = 3288096, + Type = "Digital LSM Public Region" + } } }, - - // NetBSD 7.1 - new[] + new PartitionTest { - new Partition + TestFile = "netbsd_7.1.aif", + Partitions = new[] { - Description = null, - Size = 10321920, - Name = null, - Type = "FAT", - Offset = 516096, - Length = 20160, - Sequence = 0, - Start = 1008 - }, - new Partition - { - Description = null, - Size = 104767488, - Name = null, - Type = "FAT", - Offset = 11354112, - Length = 204624, - Sequence = 1, - Start = 22176 - }, - new Partition - { - Description = null, - Size = 209534976, - Name = null, - Type = "FAT", - Offset = 116637696, - Length = 409248, - Sequence = 2, - Start = 227808 - }, - new Partition - { - Description = null, - Size = 40255488, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 326688768, - Length = 78624, - Sequence = 3, - Start = 638064 - }, - new Partition - { - Description = null, - Size = 419069952, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 367460352, - Length = 818496, - Sequence = 4, - Start = 717696 - }, - new Partition - { - Description = null, - Size = 471711744, - Name = null, - Type = "4.2BSD Fast File System", - Offset = 787562496, - Length = 921312, - Sequence = 5, - Start = 1538208 - }, - - // Type conflicts between DragonFly and NetBSD, really is Apple UFS - new Partition - { - Description = null, - Size = 78446592, - Name = null, - Type = "Hammer", - Offset = 1259790336, - Length = 153216, - Sequence = 6, - Start = 2460528 - }, - new Partition - { - Description = null, - Size = 99606528, - Name = null, - Type = "UNIX 7th Edition", - Offset = 1338753024, - Length = 194544, - Sequence = 7, - Start = 2614752 - }, - new Partition - { - Description = null, - Size = 243597312, - Name = null, - Type = "4.4LFS", - Offset = 1438875648, - Length = 475776, - Sequence = 8, - Start = 2810304 - }, - - // Type conflicts, really is Linux ext2 - new Partition - { - Description = null, - Size = 463970304, - Name = null, - Type = "Digital LSM Public Region", - Offset = 1683505152, - Length = 906192, - Sequence = 9, - Start = 3288096 + new Partition + { + Length = 20160, + Offset = 516096, + Sequence = 0, + Size = 10321920, + Start = 1008, + Type = "FAT" + }, + new Partition + { + Length = 204624, + Offset = 11354112, + Sequence = 1, + Size = 104767488, + Start = 22176, + Type = "FAT" + }, + new Partition + { + Length = 409248, + Offset = 116637696, + Sequence = 2, + Size = 209534976, + Start = 227808, + Type = "FAT" + }, + new Partition + { + Length = 78624, + Offset = 326688768, + Sequence = 3, + Size = 40255488, + Start = 638064, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 818496, + Offset = 367460352, + Sequence = 4, + Size = 419069952, + Start = 717696, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 921312, + Offset = 787562496, + Sequence = 5, + Size = 471711744, + Start = 1538208, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 153216, + Offset = 1259790336, + Sequence = 6, + Size = 78446592, + Start = 2460528, + Type = "Hammer" + }, + new Partition + { + Length = 194544, + Offset = 1338753024, + Sequence = 7, + Size = 99606528, + Start = 2614752, + Type = "UNIX 7th Edition" + }, + new Partition + { + Length = 475776, + Offset = 1438875648, + Sequence = 8, + Size = 243597312, + Start = 2810304, + Type = "4.4LFS" + }, + new Partition + { + Length = 906192, + Offset = 1683505152, + Sequence = 9, + Size = 463970304, + Start = 3288096, + Type = "Digital LSM Public Region" + } } } }; diff --git a/Aaru.Tests/Partitions/GPT.cs b/Aaru.Tests/Partitions/GPT.cs index 519bde0ce..cef9ba022 100644 --- a/Aaru.Tests/Partitions/GPT.cs +++ b/Aaru.Tests/Partitions/GPT.cs @@ -38,119 +38,110 @@ namespace Aaru.Tests.Partitions public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "GUID Partition Table"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "linux.aif", "parted.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Linux - new[] + new PartitionTest { - new Partition + TestFile = "linux.aif", + Partitions = new[] { - Description = null, - Size = 10485760, - Name = "EFI System", - Type = "EFI System", - Offset = 1048576, - Length = 20480, - Sequence = 0, - Start = 2048 - }, - new Partition - { - Description = null, - Size = 15728640, - Name = "Microsoft basic data", - Type = "Microsoft Basic data", - Offset = 11534336, - Length = 30720, - Sequence = 1, - Start = 22528 - }, - new Partition - { - Description = null, - Size = 20971520, - Name = "Apple label", - Type = "Apple Label", - Offset = 27262976, - Length = 40960, - Sequence = 2, - Start = 53248 - }, - new Partition - { - Description = null, - Size = 26214400, - Name = "Solaris /usr & Mac ZFS", - Type = "Solaris /usr or Apple ZFS", - Offset = 48234496, - Length = 51200, - Sequence = 3, - Start = 94208 - }, - new Partition - { - Description = null, - Size = 31457280, - Name = "FreeBSD ZFS", - Type = "FreeBSD ZFS", - Offset = 74448896, - Length = 61440, - Sequence = 4, - Start = 145408 - }, - new Partition - { - Description = null, - Size = 28294656, - Name = "HP-UX data", - Type = "HP-UX Data", - Offset = 105906176, - Length = 55263, - Sequence = 5, - Start = 206848 + new Partition + { + Length = 20480, + Name = "EFI System", + Offset = 1048576, + Sequence = 0, + Size = 10485760, + Start = 2048, + Type = "EFI System" + }, + new Partition + { + Length = 30720, + Name = "Microsoft basic data", + Offset = 11534336, + Sequence = 1, + Size = 15728640, + Start = 22528, + Type = "Microsoft Basic data" + }, + new Partition + { + Length = 40960, + Name = "Apple label", + Offset = 27262976, + Sequence = 2, + Size = 20971520, + Start = 53248, + Type = "Apple Label" + }, + new Partition + { + Length = 51200, + Name = "Solaris /usr & Mac ZFS", + Offset = 48234496, + Sequence = 3, + Size = 26214400, + Start = 94208, + Type = "Solaris /usr or Apple ZFS" + }, + new Partition + { + Length = 61440, + Name = "FreeBSD ZFS", + Offset = 74448896, + Sequence = 4, + Size = 31457280, + Start = 145408, + Type = "FreeBSD ZFS" + }, + new Partition + { + Length = 55263, + Name = "HP-UX data", + Offset = 105906176, + Sequence = 5, + Size = 28294656, + Start = 206848, + Type = "HP-UX Data" + } } }, - - // Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Size = 42991616, - Name = "", - Type = "Apple HFS", - Offset = 1048576, - Length = 83968, - Sequence = 0, - Start = 2048 - }, - new Partition - { - Description = null, - Size = 52428800, - Name = "", - Type = "Linux filesystem", - Offset = 44040192, - Length = 102400, - Sequence = 1, - Start = 86016 - }, - new Partition - { - Description = null, - Size = 36700160, - Name = "", - Type = "Microsoft Basic data", - Offset = 96468992, - Length = 71680, - Sequence = 2, - Start = 188416 + new Partition + { + Length = 83968, + Name = "", + Offset = 1048576, + Sequence = 0, + Size = 42991616, + Start = 2048, + Type = "Apple HFS" + }, + new Partition + { + Length = 102400, + Name = "", + Offset = 44040192, + Sequence = 1, + Size = 52428800, + Start = 86016, + Type = "Linux filesystem" + }, + new Partition + { + Length = 71680, + Name = "", + Offset = 96468992, + Sequence = 2, + Size = 36700160, + Start = 188416, + Type = "Microsoft Basic data" + } } } }; diff --git a/Aaru.Tests/Partitions/MBR.cs b/Aaru.Tests/Partitions/MBR.cs index 1baeb0cfb..49224e25a 100644 --- a/Aaru.Tests/Partitions/MBR.cs +++ b/Aaru.Tests/Partitions/MBR.cs @@ -38,1951 +38,2013 @@ namespace Aaru.Tests.Partitions public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Master Boot Record"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "concurrentdos_6.0.aif", "darwin_1.4.1.aif", "darwin_6.0.2.aif", "darwin_8.0.1.aif", "drdos_3.40.aif", - "drdos_3.41.aif", "drdos_5.00.aif", "drdos_6.00.aif", "drdos_7.02.aif", "drdos_7.03.aif", "drdos_8.0.aif", - "linux.aif", "macosx_10.3.aif", "macosx_10.4.aif", "msdos_3.30a.aif", "msdos_5.00.aif", "msdos_6.00.aif", - "msdos_6.20.aif", "msdos_6.21.aif", "msdos_6.22.aif", "multiuserdos_7.22r04.aif", "novelldos_7.00.aif", - "opendos_7.01.aif", "parted.aif", "pcdos_2000.aif", "pcdos_2.00.aif", "pcdos_2.10.aif", "pcdos_3.00.aif", - "pcdos_3.10.aif", "pcdos_3.30.aif", "pcdos_4.00.aif", "pcdos_5.00.aif", "pcdos_6.10.aif", "win95.aif", - "win96osr25.aif", "winnt_3.10.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Concurrent DOS 6.0 - new[] + new PartitionTest { - new Partition + TestFile = "concurrentdos_6.0.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x04", - Length = 100800, - Sequence = 0, - Start = 1008 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 99792, - Sequence = 1, - Start = 102816 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 100800, - Sequence = 2, - Start = 202608 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 303408, - Sequence = 3, - Start = 352800 + new Partition + { + Length = 100800, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 1008, + Type = "0x04" + }, + new Partition + { + Length = 99792, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 102816, + Type = "0x04" + }, + new Partition + { + Length = 100800, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 202608, + Type = "0x04" + }, + new Partition + { + Length = 303408, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 352800, + Type = "0x04" + } } }, - - // Darwin 1.4.1 - new[] + new PartitionTest { - new Partition + TestFile = "darwin_1.4.1.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x07", - Length = 409248, - Sequence = 0, - Start = 409248 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xA8", - Length = 204624, - Sequence = 1, - Start = 818496 + new Partition + { + Length = 409248, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 409248, + Type = "0x07" + }, + new Partition + { + Length = 204624, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 818496, + Type = "0xA8" + } } }, - - // Darwin 6.0.2 - new[] + new PartitionTest { - new Partition + TestFile = "darwin_6.0.2.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0xA8", - Length = 204561, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAB", - Length = 81648, - Sequence = 1, - Start = 204624 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245952, - Sequence = 2, - Start = 286272 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 488880, - Sequence = 3, - Start = 532224 + new Partition + { + Length = 204561, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0xA8" + }, + new Partition + { + Length = 81648, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 204624, + Type = "0xAB" + }, + new Partition + { + Length = 245952, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 286272, + Type = "0x06" + }, + new Partition + { + Length = 488880, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 532224, + Type = "0x06" + } } }, - - // Darwin 8.0.1 - new[] + new PartitionTest { - new Partition + TestFile = "darwin_8.0.1.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 150000, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 176000, - Sequence = 1, - Start = 150063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xA8", - Length = 350000, - Sequence = 2, - Start = 326063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x0C", - Length = 347937, - Sequence = 3, - Start = 676063 + new Partition + { + Length = 150000, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 176000, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 150063, + Type = "0xAF" + }, + new Partition + { + Length = 350000, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 326063, + Type = "0xA8" + }, + new Partition + { + Length = 347937, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 676063, + Type = "0x0C" + } } }, - - // DR-DOS 3.40 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_3.40.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 100800, - Sequence = 0, - Start = 1008 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 402129, - Sequence = 1, - Start = 101871 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 152145, - Sequence = 2, - Start = 504063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 365841, - Sequence = 3, - Start = 656271 + new Partition + { + Length = 100800, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 1008, + Type = "0x06" + }, + new Partition + { + Length = 402129, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 101871, + Type = "0x06" + }, + new Partition + { + Length = 152145, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 504063, + Type = "0x06" + }, + new Partition + { + Length = 365841, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 656271, + Type = "0x06" + } } }, - - // DR-DOS 3.41 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_3.41.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 126945, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 124929, - Sequence = 1, - Start = 127071 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 101745, - Sequence = 2, - Start = 252063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 668241, - Sequence = 3, - Start = 353871 + new Partition + { + Length = 126945, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 124929, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 127071, + Type = "0x06" + }, + new Partition + { + Length = 101745, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 252063, + Type = "0x06" + }, + new Partition + { + Length = 668241, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 353871, + Type = "0x06" + } } }, - - // DR-DOS 5.00 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_5.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 128016, - Sequence = 0, - Start = 124992 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 99729, - Sequence = 1, - Start = 253071 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 100737, - Sequence = 2, - Start = 352863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 313425, - Sequence = 3, - Start = 453663 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 254961, - Sequence = 4, - Start = 767151 + new Partition + { + Length = 128016, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 124992, + Type = "0x06" + }, + new Partition + { + Length = 99729, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 253071, + Type = "0x06" + }, + new Partition + { + Length = 100737, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 352863, + Type = "0x06" + }, + new Partition + { + Length = 313425, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 453663, + Type = "0x06" + }, + new Partition + { + Length = 254961, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 767151, + Type = "0x06" + } } }, - - // DR-DOS 6.00 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_6.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 101745, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 18081, - Sequence = 1, - Start = 102879 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 130977, - Sequence = 2, - Start = 121023 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 202545, - Sequence = 3, - Start = 252063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 567441, - Sequence = 4, - Start = 454671 + new Partition + { + Length = 101745, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 18081, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 102879, + Type = "0x01" + }, + new Partition + { + Length = 130977, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 121023, + Type = "0x06" + }, + new Partition + { + Length = 202545, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 252063, + Type = "0x06" + }, + new Partition + { + Length = 567441, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 454671, + Type = "0x06" + } } }, - - // DR-DOS 7.02 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_7.02.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 102753, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 307377, - Sequence = 1, - Start = 102879 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 384993, - Sequence = 2, - Start = 410319 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 17073, - Sequence = 3, - Start = 795375 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 209601, - Sequence = 4, - Start = 812511 + new Partition + { + Length = 102753, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 102879, + Type = "0x06" + }, + new Partition + { + Length = 384993, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 410319, + Type = "0x06" + }, + new Partition + { + Length = 17073, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 795375, + Type = "0x01" + }, + new Partition + { + Length = 209601, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 812511, + Type = "0x06" + } } }, - - // DR-DOS 7.03 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_7.03.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 202545, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 141057, - Sequence = 1, - Start = 202671 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 152145, - Sequence = 2, - Start = 352863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 364833, - Sequence = 3, - Start = 505071 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 152145, - Sequence = 4, - Start = 869967 + new Partition + { + Length = 202545, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 141057, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 202671, + Type = "0x06" + }, + new Partition + { + Length = 152145, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 352863, + Type = "0x06" + }, + new Partition + { + Length = 364833, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 505071, + Type = "0x06" + }, + new Partition + { + Length = 152145, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 869967, + Type = "0x06" + } } }, - - // DR-DOS 8.0 - new[] + new PartitionTest { - new Partition + TestFile = "drdos_8.0.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 138033, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 303345, - Sequence = 2, - Start = 352863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 249921, - Sequence = 3, - Start = 656271 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 115857, - Sequence = 4, - Start = 906255 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 138033, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x06" + }, + new Partition + { + Length = 303345, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 352863, + Type = "0x06" + }, + new Partition + { + Length = 249921, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 656271, + Type = "0x06" + }, + new Partition + { + Length = 115857, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 906255, + Type = "0x06" + } } }, - - // Linux - new[] + new PartitionTest { - new Partition + TestFile = "linux.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x04", - Length = 20480, - Sequence = 0, - Start = 2048 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x24", - Length = 40960, - Sequence = 1, - Start = 22528 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xA7", - Length = 61440, - Sequence = 2, - Start = 65536 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x42", - Length = 81920, - Sequence = 3, - Start = 129024 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x83", - Length = 49152, - Sequence = 4, - Start = 212992 + new Partition + { + Length = 20480, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 2048, + Type = "0x04" + }, + new Partition + { + Length = 40960, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 22528, + Type = "0x24" + }, + new Partition + { + Length = 61440, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 65536, + Type = "0xA7" + }, + new Partition + { + Length = 81920, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 129024, + Type = "0x42" + }, + new Partition + { + Length = 49152, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 212992, + Type = "0x83" + } } }, - - // Mac OS X 10.3 - new[] + new PartitionTest { - new Partition + TestFile = "macosx_10.3.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0xA8", - Length = 204800, - Sequence = 0, - Start = 8 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 102400, - Sequence = 1, - Start = 204816 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x0B", - Length = 102400, - Sequence = 2, - Start = 307224 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 204800, - Sequence = 3, - Start = 409632 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 204800, - Sequence = 4, - Start = 614440 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 204752, - Sequence = 5, - Start = 819248 + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 8, + Type = "0xA8" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 204816, + Type = "0xAF" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 307224, + Type = "0x0B" + }, + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 409632, + Type = "0xAF" + }, + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 614440, + Type = "0xAF" + }, + new Partition + { + Length = 204752, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 819248, + Type = "0xAF" + } } }, - - // Mac OS X 10.4 - new[] + new PartitionTest { - new Partition + TestFile = "macosx_10.4.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0xAF", - Length = 102400, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 204800, - Sequence = 1, - Start = 102501 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x0B", - Length = 204800, - Sequence = 2, - Start = 307314 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xA8", - Length = 204800, - Sequence = 3, - Start = 512127 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 102400, - Sequence = 4, - Start = 716940 - }, - new Partition - { - Description = null, - Name = null, - Type = "0xAF", - Length = 204622, - Sequence = 5, - Start = 819378 + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0xAF" + }, + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 102501, + Type = "0xAF" + }, + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 307314, + Type = "0x0B" + }, + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 512127, + Type = "0xA8" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 716940, + Type = "0x06" + }, + new Partition + { + Length = 204622, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 819378, + Type = "0xAF" + } } }, - - // MS-DOS 3.30A - new[] + new PartitionTest { - new Partition + TestFile = "msdos_3.30a.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 1, - Start = 65583 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 2, - Start = 131103 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 3, - Start = 196623 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 4, - Start = 262143 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 5, - Start = 327663 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 6, - Start = 393183 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 7, - Start = 458703 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 8, - Start = 524223 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 9, - Start = 589743 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 10, - Start = 655263 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 11, - Start = 720783 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 12, - Start = 786303 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 13, - Start = 851823 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 14, - Start = 917343 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 39249, - Sequence = 15, - Start = 982863 + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 65583, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 131103, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 196623, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 262143, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 327663, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 393183, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 458703, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 524223, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 9, + Size = 0, + Start = 589743, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 10, + Size = 0, + Start = 655263, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 11, + Size = 0, + Start = 720783, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 12, + Size = 0, + Start = 786303, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 13, + Size = 0, + Start = 851823, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 14, + Size = 0, + Start = 917343, + Type = "0x04" + }, + new Partition + { + Length = 39249, + Offset = 0, + Sequence = 15, + Size = 0, + Start = 982863, + Type = "0x04" + } } }, - - // MS-DOS 5.00 - new[] + new PartitionTest { - new Partition + TestFile = "msdos_5.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 102753, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 31185, - Sequence = 1, - Start = 102879 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 41265, - Sequence = 2, - Start = 134127 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 51345, - Sequence = 3, - Start = 175455 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 61425, - Sequence = 4, - Start = 226863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 72513, - Sequence = 5, - Start = 288351 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 82593, - Sequence = 6, - Start = 360927 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 92673, - Sequence = 7, - Start = 443583 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 102753, - Sequence = 8, - Start = 536319 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 112833, - Sequence = 9, - Start = 639135 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 122913, - Sequence = 10, - Start = 752031 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 134001, - Sequence = 11, - Start = 875007 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 13041, - Sequence = 12, - Start = 1009071 + new Partition + { + Length = 102753, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 31185, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 102879, + Type = "0x01" + }, + new Partition + { + Length = 41265, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 134127, + Type = "0x04" + }, + new Partition + { + Length = 51345, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 175455, + Type = "0x04" + }, + new Partition + { + Length = 61425, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 226863, + Type = "0x04" + }, + new Partition + { + Length = 72513, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 288351, + Type = "0x06" + }, + new Partition + { + Length = 82593, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 360927, + Type = "0x06" + }, + new Partition + { + Length = 92673, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 443583, + Type = "0x06" + }, + new Partition + { + Length = 102753, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 536319, + Type = "0x06" + }, + new Partition + { + Length = 112833, + Offset = 0, + Sequence = 9, + Size = 0, + Start = 639135, + Type = "0x06" + }, + new Partition + { + Length = 122913, + Offset = 0, + Sequence = 10, + Size = 0, + Start = 752031, + Type = "0x06" + }, + new Partition + { + Length = 134001, + Offset = 0, + Sequence = 11, + Size = 0, + Start = 875007, + Type = "0x06" + }, + new Partition + { + Length = 13041, + Offset = 0, + Sequence = 12, + Size = 0, + Start = 1009071, + Type = "0x01" + } } }, - - // MS-DOS 6.00 - new[] + new PartitionTest { - new Partition + TestFile = "msdos_6.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x04", - Length = 51345, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 72513, - Sequence = 1, - Start = 51471 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 92673, - Sequence = 2, - Start = 124047 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 112833, - Sequence = 3, - Start = 216783 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 134001, - Sequence = 4, - Start = 329679 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 154161, - Sequence = 5, - Start = 463743 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 178353, - Sequence = 6, - Start = 617967 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 184401, - Sequence = 7, - Start = 796383 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 41265, - Sequence = 8, - Start = 980847 + new Partition + { + Length = 51345, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x04" + }, + new Partition + { + Length = 72513, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 51471, + Type = "0x06" + }, + new Partition + { + Length = 92673, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 124047, + Type = "0x06" + }, + new Partition + { + Length = 112833, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 216783, + Type = "0x06" + }, + new Partition + { + Length = 134001, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 329679, + Type = "0x06" + }, + new Partition + { + Length = 154161, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 463743, + Type = "0x06" + }, + new Partition + { + Length = 178353, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 617967, + Type = "0x06" + }, + new Partition + { + Length = 184401, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 796383, + Type = "0x06" + }, + new Partition + { + Length = 41265, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 980847, + Type = "0x04" + } } }, - - // MS-DOS 6.20 - new[] + new PartitionTest { - new Partition + TestFile = "msdos_6.20.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 225729, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 2, - Start = 431487 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 267057, - Sequence = 3, - Start = 677439 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 61425, - Sequence = 4, - Start = 944559 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 16065, - Sequence = 5, - Start = 1006047 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 225729, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 431487, + Type = "0x06" + }, + new Partition + { + Length = 267057, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 677439, + Type = "0x06" + }, + new Partition + { + Length = 61425, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 944559, + Type = "0x04" + }, + new Partition + { + Length = 16065, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 1006047, + Type = "0x01" + } } }, - - // MS-DOS 6.21 - new[] + new PartitionTest { - new Partition + TestFile = "msdos_6.21.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 225729, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 2, - Start = 431487 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 267057, - Sequence = 3, - Start = 677439 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 51345, - Sequence = 4, - Start = 944559 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 6993, - Sequence = 5, - Start = 995967 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 19089, - Sequence = 6, - Start = 1003023 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 225729, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 431487, + Type = "0x06" + }, + new Partition + { + Length = 267057, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 677439, + Type = "0x06" + }, + new Partition + { + Length = 51345, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 944559, + Type = "0x04" + }, + new Partition + { + Length = 6993, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 995967, + Type = "0x01" + }, + new Partition + { + Length = 19089, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 1003023, + Type = "0x01" + } } }, - - // MS-DOS 6.22 - new[] + new PartitionTest { - new Partition + TestFile = "msdos_6.22.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 1, - Start = 246015 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 307377, - Sequence = 2, - Start = 451647 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 225729, - Sequence = 3, - Start = 759087 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 37233, - Sequence = 4, - Start = 984879 + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 246015, + Type = "0x06" + }, + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 451647, + Type = "0x06" + }, + new Partition + { + Length = 225729, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 759087, + Type = "0x06" + }, + new Partition + { + Length = 37233, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 984879, + Type = "0x04" + } } }, - - // Multiuser DOS 7.22 release 04 - new[] + new PartitionTest { - new Partition + TestFile = "multiuserdos_7.22r04.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 152145, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 99729, - Sequence = 1, - Start = 152271 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 202545, - Sequence = 2, - Start = 252063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 1953, - Sequence = 3, - Start = 454671 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 565425, - Sequence = 4, - Start = 456687 + new Partition + { + Length = 152145, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 99729, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 152271, + Type = "0x06" + }, + new Partition + { + Length = 202545, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 252063, + Type = "0x06" + }, + new Partition + { + Length = 1953, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 454671, + Type = "0x01" + }, + new Partition + { + Length = 565425, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 456687, + Type = "0x06" + } } }, - - // Novell DOS 7.0 - new[] + new PartitionTest { - new Partition + TestFile = "novelldos_7.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 252945, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 4977, - Sequence = 1, - Start = 253071 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 202545, - Sequence = 2, - Start = 352863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 348705, - Sequence = 3, - Start = 555471 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 117873, - Sequence = 4, - Start = 904239 + new Partition + { + Length = 252945, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 4977, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 253071, + Type = "0x01" + }, + new Partition + { + Length = 202545, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 352863, + Type = "0x06" + }, + new Partition + { + Length = 348705, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 555471, + Type = "0x06" + }, + new Partition + { + Length = 117873, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 904239, + Type = "0x06" + } } }, - - // OpenDOS 7.01 - new[] + new PartitionTest { - new Partition + TestFile = "opendos_7.01.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 307377, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 4977, - Sequence = 1, - Start = 307503 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 40257, - Sequence = 2, - Start = 312543 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 202545, - Sequence = 3, - Start = 352863 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 466641, - Sequence = 4, - Start = 555471 + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 4977, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 307503, + Type = "0x01" + }, + new Partition + { + Length = 40257, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 312543, + Type = "0x04" + }, + new Partition + { + Length = 202545, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 352863, + Type = "0x06" + }, + new Partition + { + Length = 466641, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 555471, + Type = "0x06" + } } }, - - // Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x83", - Length = 67584, - Sequence = 0, - Start = 4096 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x07", - Length = 59392, - Sequence = 1, - Start = 73728 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 129024, - Sequence = 2, - Start = 133120 + new Partition + { + Length = 67584, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 4096, + Type = "0x83" + }, + new Partition + { + Length = 59392, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 73728, + Type = "0x07" + }, + new Partition + { + Length = 129024, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 133120, + Type = "0x06" + } } }, - - // PC-DOS 2000 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_2000.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 225729, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 2, - Start = 431487 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 287217, - Sequence = 3, - Start = 677439 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 57393, - Sequence = 4, - Start = 964719 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 225729, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 431487, + Type = "0x06" + }, + new Partition + { + Length = 287217, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 677439, + Type = "0x06" + }, + new Partition + { + Length = 57393, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 964719, + Type = "0x04" + } } }, - - // PC-DOS 2.00 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_2.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x01", - Length = 1022111, - Sequence = 0, - Start = 1 + new Partition + { + Length = 1022111, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 1, + Type = "0x01" + } } }, - - // PC-DOS 2.10 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_2.10.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x01", - Length = 1022111, - Sequence = 0, - Start = 1 + new Partition + { + Length = 1022111, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 1, + Type = "0x01" + } } }, - - // PC-DOS 3.00 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_3.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x01", - Length = 66465, - Sequence = 0, - Start = 63 + new Partition + { + Length = 66465, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x01" + } } }, - - // PC-DOS 3.10 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_3.10.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x01", - Length = 66465, - Sequence = 0, - Start = 63 + new Partition + { + Length = 66465, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x01" + } } }, - - // PC-DOS 3.30 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_3.30.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 1, - Start = 65583 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 2, - Start = 131103 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 3, - Start = 196623 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 4, - Start = 262143 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 5, - Start = 327663 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 6, - Start = 393183 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 7, - Start = 458703 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 8, - Start = 524223 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 9, - Start = 589743 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 10, - Start = 655263 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 11, - Start = 720783 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 12, - Start = 786303 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 13, - Start = 851823 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 65457, - Sequence = 14, - Start = 917343 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x04", - Length = 39249, - Sequence = 15, - Start = 982863 + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 65583, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 131103, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 196623, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 262143, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 327663, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 393183, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 458703, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 524223, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 9, + Size = 0, + Start = 589743, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 10, + Size = 0, + Start = 655263, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 11, + Size = 0, + Start = 720783, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 12, + Size = 0, + Start = 786303, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 13, + Size = 0, + Start = 851823, + Type = "0x04" + }, + new Partition + { + Length = 65457, + Offset = 0, + Sequence = 14, + Size = 0, + Start = 917343, + Type = "0x04" + }, + new Partition + { + Length = 39249, + Offset = 0, + Sequence = 15, + Size = 0, + Start = 982863, + Type = "0x04" + } } }, - - // PC-DOS 4.00 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_4.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 25137, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 2, - Start = 230895 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 307377, - Sequence = 3, - Start = 476847 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 237825, - Sequence = 4, - Start = 784287 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 25137, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x01" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 230895, + Type = "0x06" + }, + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 476847, + Type = "0x06" + }, + new Partition + { + Length = 237825, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 784287, + Type = "0x06" + } } }, - - // PC-DOS 5.00 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_5.00.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 25137, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 2, - Start = 230895 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 287217, - Sequence = 3, - Start = 476847 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 257985, - Sequence = 4, - Start = 764127 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 25137, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x01" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 230895, + Type = "0x06" + }, + new Partition + { + Length = 287217, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 476847, + Type = "0x06" + }, + new Partition + { + Length = 257985, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 764127, + Type = "0x06" + } } }, - - // PC-DOS 6.10 - new[] + new PartitionTest { - new Partition + TestFile = "pcdos_6.10.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 25137, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 225729, - Sequence = 2, - Start = 230895 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 3, - Start = 456687 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 319473, - Sequence = 4, - Start = 702639 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 25137, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x01" + }, + new Partition + { + Length = 225729, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 230895, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 456687, + Type = "0x06" + }, + new Partition + { + Length = 319473, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 702639, + Type = "0x06" + } } }, - - // Windows 95 - new[] + new PartitionTest { - new Partition + TestFile = "win95.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 205569, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 1, - Start = 205695 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 267057, - Sequence = 2, - Start = 451647 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 287217, - Sequence = 3, - Start = 718767 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 17073, - Sequence = 4, - Start = 1006047 + new Partition + { + Length = 205569, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 205695, + Type = "0x06" + }, + new Partition + { + Length = 267057, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 451647, + Type = "0x06" + }, + new Partition + { + Length = 287217, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 718767, + Type = "0x06" + }, + new Partition + { + Length = 17073, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 1006047, + Type = "0x01" + } } }, - - // Windows 95 OSR 2.5 - new[] + new PartitionTest { - new Partition + TestFile = "win96osr25.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x06", - Length = 307377, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 245889, - Sequence = 1, - Start = 307503 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 328545, - Sequence = 2, - Start = 553455 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 102753, - Sequence = 3, - Start = 882063 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 21105, - Sequence = 4, - Start = 984879 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 17073, - Sequence = 5, - Start = 1006047 + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x06" + }, + new Partition + { + Length = 245889, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 307503, + Type = "0x06" + }, + new Partition + { + Length = 328545, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 553455, + Type = "0x06" + }, + new Partition + { + Length = 102753, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 882063, + Type = "0x06" + }, + new Partition + { + Length = 21105, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 984879, + Type = "0x01" + }, + new Partition + { + Length = 17073, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 1006047, + Type = "0x01" + } } }, - - // Windows NT 3.10 - new[] + new PartitionTest { - new Partition + TestFile = "winnt_3.10.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "0x07", - Length = 204561, - Sequence = 0, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x07", - Length = 307377, - Sequence = 1, - Start = 204687 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 224721, - Sequence = 2, - Start = 512127 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x06", - Length = 214641, - Sequence = 3, - Start = 736911 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 10017, - Sequence = 4, - Start = 951615 - }, - new Partition - { - Description = null, - Name = null, - Type = "0x07", - Length = 60480, - Sequence = 5, - Start = 962640 + new Partition + { + Length = 204561, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 63, + Type = "0x07" + }, + new Partition + { + Length = 307377, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 204687, + Type = "0x07" + }, + new Partition + { + Length = 224721, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 512127, + Type = "0x06" + }, + new Partition + { + Length = 214641, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 736911, + Type = "0x06" + }, + new Partition + { + Length = 10017, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 951615, + Type = "0x01" + }, + new Partition + { + Length = 60480, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 962640, + Type = "0x07" + } } } }; diff --git a/Aaru.Tests/Partitions/MINIX.cs b/Aaru.Tests/Partitions/MINIX.cs index c6e4d40f9..6c4be454a 100644 --- a/Aaru.Tests/Partitions/MINIX.cs +++ b/Aaru.Tests/Partitions/MINIX.cs @@ -37,59 +37,53 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "MINIX"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "minix_3.1.2a.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Parted - new[] + new PartitionTest { - new Partition + TestFile = "minix_3.1.2a.aif", + Partitions = new[] { - Description = null, - Size = 268369408, - Name = "MINIX", - Type = "MINIX", - Offset = 2064896, - Length = 524159, - Sequence = 0, - Start = 4033 - }, - new Partition - { - Description = null, - Size = 270434304, - Name = "MINIX", - Type = "MINIX", - Offset = 270434304, - Length = 528192, - Sequence = 1, - Start = 528192 - }, - new Partition - { - Description = null, - Size = 270434304, - Name = "MINIX", - Type = "MINIX", - Offset = 540868608, - Length = 528192, - Sequence = 2, - Start = 1056384 - }, - new Partition - { - Description = null, - Size = 262176768, - Name = "MINIX", - Type = "MINIX", - Offset = 811302912, - Length = 512064, - Sequence = 3, - Start = 1584576 + new Partition + { + Length = 524159, + Name = "MINIX", + Offset = 2064896, + Sequence = 0, + Size = 268369408, + Start = 4033, + Type = "MINIX" + }, + new Partition + { + Length = 528192, + Name = "MINIX", + Offset = 270434304, + Sequence = 1, + Size = 270434304, + Start = 528192, + Type = "MINIX" + }, + new Partition + { + Length = 528192, + Name = "MINIX", + Offset = 540868608, + Sequence = 2, + Size = 270434304, + Start = 1056384, + Type = "MINIX" + }, + new Partition + { + Length = 512064, + Name = "MINIX", + Offset = 811302912, + Sequence = 3, + Size = 262176768, + Start = 1584576, + Type = "MINIX" + } } } }; diff --git a/Aaru.Tests/Partitions/PC98.cs b/Aaru.Tests/Partitions/PC98.cs index 7c1fcc254..c784e7b16 100644 --- a/Aaru.Tests/Partitions/PC98.cs +++ b/Aaru.Tests/Partitions/PC98.cs @@ -37,341 +37,381 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "PC-98"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "msdos330.aif", "msdos330_alt.aif", "msdos500_epson.aif", "msdos500.aif", "msdos620.aif" - }; - - public override Partition[][] Wanted => new[] - { - // NEC MS-DOS 3.30 (256Mb HDD) - new[] + new PartitionTest { - new Partition + TestFile = "msdos330.aif", + Partitions = new[] { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT12", - Length = 19536, - Sequence = 0, - Start = 264 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT12", - Length = 39336, - Sequence = 1, - Start = 20064 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 59136, - Sequence = 2, - Start = 59664 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 78936, - Sequence = 3, - Start = 119064 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 118536, - Sequence = 4, - Start = 198264 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 197736, - Sequence = 5, - Start = 317064 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 237336, - Sequence = 6, - Start = 515064 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 245256, - Sequence = 7, - Start = 752664 + new Partition + { + Length = 19536, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 0, + Size = 0, + Start = 264, + Type = "FAT12" + }, + new Partition + { + Length = 39336, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 1, + Size = 0, + Start = 20064, + Type = "FAT12" + }, + new Partition + { + Length = 59136, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 2, + Size = 0, + Start = 59664, + Type = "FAT16" + }, + new Partition + { + Length = 78936, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 3, + Size = 0, + Start = 119064, + Type = "FAT16" + }, + new Partition + { + Length = 118536, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 4, + Size = 0, + Start = 198264, + Type = "FAT16" + }, + new Partition + { + Length = 197736, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 5, + Size = 0, + Start = 317064, + Type = "FAT16" + }, + new Partition + { + Length = 237336, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 6, + Size = 0, + Start = 515064, + Type = "FAT16" + }, + new Partition + { + Length = 245256, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 7, + Size = 0, + Start = 752664, + Type = "FAT16" + } } }, - - // NEC MS-DOS 3.30 (80Mb HDD) - new[] + new PartitionTest { - new Partition + TestFile = "msdos330_alt.aif", + Partitions = new[] { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 59136, - Sequence = 0, - Start = 264 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 158136, - Sequence = 1, - Start = 59664 - }, - new Partition - { - Description = null, - Name = "MS-DOS 3.30", - Type = "FAT16", - Length = 94776, - Sequence = 2, - Start = 218064 + new Partition + { + Length = 59136, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 0, + Size = 0, + Start = 264, + Type = "FAT16" + }, + new Partition + { + Length = 158136, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 1, + Size = 0, + Start = 59664, + Type = "FAT16" + }, + new Partition + { + Length = 94776, + Name = "MS-DOS 3.30", + Offset = 0, + Sequence = 2, + Size = 0, + Start = 218064, + Type = "FAT16" + } } }, - - // Epson MS-DOS 3.30 - new[] + new PartitionTest { - new Partition + TestFile = "msdos500_epson.aif", + Partitions = new[] { - Description = null, - Name = "NamenameName", - Type = "FAT12", - Length = 35639, - Sequence = 0, - Start = 264 - }, - new Partition - { - Description = null, - Name = "12BitFAT", - Type = "FAT12", - Length = 59399, - Sequence = 1, - Start = 35904 - }, - new Partition - { - Description = null, - Name = "16BitFAT", - Type = "FAT16", - Length = 79199, - Sequence = 2, - Start = 95304 - }, - new Partition - { - Description = null, - Name = "PartLblMaxNameXX", - Type = "FAT16", - Length = 118799, - Sequence = 3, - Start = 174504 - }, - new Partition - { - Description = null, - Name = "BigFAT12", - Type = "FAT12", - Length = 158399, - Sequence = 4, - Start = 293304 - }, - new Partition - { - Description = null, - Name = "Lalalalalalalala", - Type = "FAT16", - Length = 197999, - Sequence = 5, - Start = 451704 - }, - new Partition - { - Description = null, - Name = "MS-DOS Ver 5.0", - Type = "FAT16", - Length = 237599, - Sequence = 6, - Start = 649704 - }, - new Partition - { - Description = null, - Name = "MS-DOS Ver 5.0", - Type = "FAT16", - Length = 118799, - Sequence = 7, - Start = 887304 + new Partition + { + Length = 35639, + Name = "NamenameName", + Offset = 0, + Sequence = 0, + Size = 0, + Start = 264, + Type = "FAT12" + }, + new Partition + { + Length = 59399, + Name = "12BitFAT", + Offset = 0, + Sequence = 1, + Size = 0, + Start = 35904, + Type = "FAT12" + }, + new Partition + { + Length = 79199, + Name = "16BitFAT", + Offset = 0, + Sequence = 2, + Size = 0, + Start = 95304, + Type = "FAT16" + }, + new Partition + { + Length = 118799, + Name = "PartLblMaxNameXX", + Offset = 0, + Sequence = 3, + Size = 0, + Start = 174504, + Type = "FAT16" + }, + new Partition + { + Length = 158399, + Name = "BigFAT12", + Offset = 0, + Sequence = 4, + Size = 0, + Start = 293304, + Type = "FAT12" + }, + new Partition + { + Length = 197999, + Name = "Lalalalalalalala", + Offset = 0, + Sequence = 5, + Size = 0, + Start = 451704, + Type = "FAT16" + }, + new Partition + { + Length = 237599, + Name = "MS-DOS Ver 5.0", + Offset = 0, + Sequence = 6, + Size = 0, + Start = 649704, + Type = "FAT16" + }, + new Partition + { + Length = 118799, + Name = "MS-DOS Ver 5.0", + Offset = 0, + Sequence = 7, + Size = 0, + Start = 887304, + Type = "FAT16" + } } }, - - // NEC MS-DOS 5.00 - new[] + new PartitionTest { - new Partition + TestFile = "msdos500.aif", + Partitions = new[] { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT12", - Length = 28512, - Sequence = 0, - Start = 264 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 49104, - Sequence = 1, - Start = 29040 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 93984, - Sequence = 2, - Start = 78408 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 122760, - Sequence = 3, - Start = 172656 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 163680, - Sequence = 4, - Start = 295680 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 204600, - Sequence = 5, - Start = 459624 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 204600, - Sequence = 6, - Start = 664488 - }, - new Partition - { - Description = null, - Name = "MS-DOS 5.00", - Type = "FAT16", - Length = 139128, - Sequence = 7, - Start = 869352 + new Partition + { + Length = 28512, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 0, + Size = 0, + Start = 264, + Type = "FAT12" + }, + new Partition + { + Length = 49104, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 1, + Size = 0, + Start = 29040, + Type = "FAT16" + }, + new Partition + { + Length = 93984, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 2, + Size = 0, + Start = 78408, + Type = "FAT16" + }, + new Partition + { + Length = 122760, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 3, + Size = 0, + Start = 172656, + Type = "FAT16" + }, + new Partition + { + Length = 163680, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 4, + Size = 0, + Start = 295680, + Type = "FAT16" + }, + new Partition + { + Length = 204600, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 5, + Size = 0, + Start = 459624, + Type = "FAT16" + }, + new Partition + { + Length = 204600, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 6, + Size = 0, + Start = 664488, + Type = "FAT16" + }, + new Partition + { + Length = 139128, + Name = "MS-DOS 5.00", + Offset = 0, + Sequence = 7, + Size = 0, + Start = 869352, + Type = "FAT16" + } } }, - - // NEC MS-DOS 6.20 - new[] + new PartitionTest { - new Partition + TestFile = "msdos620.aif", + Partitions = new[] { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 61248, - Sequence = 0, - Start = 264 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 81840, - Sequence = 1, - Start = 61776 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 122760, - Sequence = 2, - Start = 143880 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 163680, - Sequence = 3, - Start = 266904 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT12", - Length = 20328, - Sequence = 4, - Start = 430848 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 245520, - Sequence = 5, - Start = 451440 - }, - new Partition - { - Description = null, - Name = "MS-DOS 6.20", - Type = "FAT16", - Length = 315216, - Sequence = 6, - Start = 697224 + new Partition + { + Length = 61248, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 0, + Size = 0, + Start = 264, + Type = "FAT16" + }, + new Partition + { + Length = 81840, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 1, + Size = 0, + Start = 61776, + Type = "FAT16" + }, + new Partition + { + Length = 122760, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 2, + Size = 0, + Start = 143880, + Type = "FAT16" + }, + new Partition + { + Length = 163680, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 3, + Size = 0, + Start = 266904, + Type = "FAT16" + }, + new Partition + { + Length = 20328, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 4, + Size = 0, + Start = 430848, + Type = "FAT12" + }, + new Partition + { + Length = 245520, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 5, + Size = 0, + Start = 451440, + Type = "FAT16" + }, + new Partition + { + Length = 315216, + Name = "MS-DOS 6.20", + Offset = 0, + Sequence = 6, + Size = 0, + Start = 697224, + Type = "FAT16" + } } } }; diff --git a/Aaru.Tests/Partitions/PartitionSchemeTest.cs b/Aaru.Tests/Partitions/PartitionSchemeTest.cs index 02b832022..faf4eebbc 100644 --- a/Aaru.Tests/Partitions/PartitionSchemeTest.cs +++ b/Aaru.Tests/Partitions/PartitionSchemeTest.cs @@ -10,32 +10,31 @@ namespace Aaru.Tests.Partitions { public abstract class PartitionSchemeTest { - public abstract string[] TestFiles { get; } - public abstract Partition[][] Wanted { get; } - public abstract string DataFolder { get; } + public abstract string DataFolder { get; } + public abstract PartitionTest[] Tests { get; } [Test] - public void Test() + public void Test2() { - for(int i = 0; i < TestFiles.Length; i++) + foreach(PartitionTest test in Tests) { - string test = TestFiles[i]; + string testFile = test.TestFile; Environment.CurrentDirectory = DataFolder; var filtersList = new FiltersList(); - IFilter inputFilter = filtersList.GetFilter(test); + IFilter inputFilter = filtersList.GetFilter(testFile); - Assert.IsNotNull(inputFilter, $"Filter: {test}"); + Assert.IsNotNull(inputFilter, $"Filter: {testFile}"); IMediaImage image = ImageFormat.Detect(inputFilter); - Assert.IsNotNull(image, $"Image format: {test}"); + Assert.IsNotNull(image, $"Image format: {testFile}"); - Assert.AreEqual(true, image.Open(inputFilter), $"Cannot open image for {test}"); + Assert.AreEqual(true, image.Open(inputFilter), $"Cannot open image for {testFile}"); List partitions = Core.Partitions.GetAll(image); - partitions.Should().BeEquivalentTo(Wanted[i], $"Partitions: {test}"); + partitions.Should().BeEquivalentTo(test.Partitions, $"Partitions: {testFile}"); } } } diff --git a/Aaru.Tests/Partitions/RDB.cs b/Aaru.Tests/Partitions/RDB.cs index f3526e0e3..e76119676 100644 --- a/Aaru.Tests/Partitions/RDB.cs +++ b/Aaru.Tests/Partitions/RDB.cs @@ -38,190 +38,177 @@ namespace Aaru.Tests.Partitions public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Rigid Disk Block"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "amigaos_3.9.aif", "amigaos_4.0.aif", "parted.aif" - }; - - public override Partition[][] Wanted => new[] - { - // AmigaOS 3.9 - new[] + new PartitionTest { - new Partition + TestFile = "amigaos_3.9.aif", + Partitions = new[] { - Description = null, - Size = 87392256, - Name = "UDH0", - Type = "\"DOS\\0\"", - Offset = 2080768, - Length = 170688, - Sequence = 0, - Start = 4064 - }, - new Partition - { - Description = null, - Size = 87392256, - Name = "UDH1", - Type = "\"DOS\\2\"", - Offset = 89473024, - Length = 170688, - Sequence = 1, - Start = 174752 - }, - new Partition - { - Description = null, - Size = 87392256, - Name = "UDH2", - Type = "\"DOS\\1\"", - Offset = 176865280, - Length = 170688, - Sequence = 2, - Start = 345440 - }, - new Partition - { - Description = null, - Size = 87392256, - Name = "UDH3", - Type = "\"DOS\\3\"", - Offset = 264257536, - Length = 170688, - Sequence = 3, - Start = 516128 - }, - new Partition - { - Description = null, - Size = 87300096, - Name = "FAT16", - Type = "0x06", - Offset = 351663104, - Length = 170508, - Sequence = 4, - Start = 686842 - }, - new Partition - { - Description = null, - Size = 85311488, - Name = "UDH5", - Type = "\"RES\\86\"", - Offset = 439042048, - Length = 166624, - Sequence = 5, - Start = 857504 + new Partition + { + Length = 170688, + Name = "UDH0", + Offset = 2080768, + Sequence = 0, + Size = 87392256, + Start = 4064, + Type = "\"DOS\\0\"" + }, + new Partition + { + Length = 170688, + Name = "UDH1", + Offset = 89473024, + Sequence = 1, + Size = 87392256, + Start = 174752, + Type = "\"DOS\\2\"" + }, + new Partition + { + Length = 170688, + Name = "UDH2", + Offset = 176865280, + Sequence = 2, + Size = 87392256, + Start = 345440, + Type = "\"DOS\\1\"" + }, + new Partition + { + Length = 170688, + Name = "UDH3", + Offset = 264257536, + Sequence = 3, + Size = 87392256, + Start = 516128, + Type = "\"DOS\\3\"" + }, + new Partition + { + Length = 170508, + Name = "FAT16", + Offset = 351663104, + Sequence = 4, + Size = 87300096, + Start = 686842, + Type = "0x06" + }, + new Partition + { + Length = 166624, + Name = "UDH5", + Offset = 439042048, + Sequence = 5, + Size = 85311488, + Start = 857504, + Type = "\"RES\\86\"" + } } }, - - // AmigaOS 4.0 - new[] + new PartitionTest { - new Partition + TestFile = "amigaos_4.0.aif", + Partitions = new[] { - Description = null, - Size = 91455488, - Name = "DH1", - Type = "\"DOS\\1\"", - Offset = 1048576, - Length = 178624, - Sequence = 0, - Start = 2048 - }, - new Partition - { - Description = null, - Size = 76546048, - Name = "DH2", - Type = "\"DOS\\3\"", - Offset = 92504064, - Length = 149504, - Sequence = 1, - Start = 180672 - }, - new Partition - { - Description = null, - Size = 78741504, - Name = "DH3", - Type = "\"DOS\\3\"", - Offset = 169050112, - Length = 153792, - Sequence = 2, - Start = 330176 - }, - new Partition - { - Description = null, - Size = 78020608, - Name = "DH4", - Type = "\"DOS\\7\"", - Offset = 247791616, - Length = 152384, - Sequence = 3, - Start = 483968 - }, - new Partition - { - Description = null, - Size = 85000192, - Name = "DH5", - Type = "\"SFS\\0\"", - Offset = 325812224, - Length = 166016, - Sequence = 4, - Start = 636352 - }, - new Partition - { - Description = null, - Size = 113541120, - Name = "DH6", - Type = "\"SFS\\2\"", - Offset = 410812416, - Length = 221760, - Sequence = 5, - Start = 802368 + new Partition + { + Length = 178624, + Name = "DH1", + Offset = 1048576, + Sequence = 0, + Size = 91455488, + Start = 2048, + Type = "\"DOS\\1\"" + }, + new Partition + { + Length = 149504, + Name = "DH2", + Offset = 92504064, + Sequence = 1, + Size = 76546048, + Start = 180672, + Type = "\"DOS\\3\"" + }, + new Partition + { + Length = 153792, + Name = "DH3", + Offset = 169050112, + Sequence = 2, + Size = 78741504, + Start = 330176, + Type = "\"DOS\\3\"" + }, + new Partition + { + Length = 152384, + Name = "DH4", + Offset = 247791616, + Sequence = 3, + Size = 78020608, + Start = 483968, + Type = "\"DOS\\7\"" + }, + new Partition + { + Length = 166016, + Name = "DH5", + Offset = 325812224, + Sequence = 4, + Size = 85000192, + Start = 636352, + Type = "\"SFS\\0\"" + }, + new Partition + { + Length = 221760, + Name = "DH6", + Offset = 410812416, + Sequence = 5, + Size = 113541120, + Start = 802368, + Type = "\"SFS\\2\"" + } } }, - - // Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Size = 8225280, - Name = "primary", - Type = "\"\0\0\0\\0\"", - Offset = 8225280, - Length = 16065, - Sequence = 0, - Start = 16065 - }, - new Partition - { - Description = null, - Size = 24675840, - Name = "name", - Type = "\"FAT\\1\"", - Offset = 16450560, - Length = 48195, - Sequence = 1, - Start = 32130 - }, - new Partition - { - Description = null, - Size = 90478080, - Name = "partition", - Type = "\"\0\0\0\\0\"", - Offset = 41126400, - Length = 176715, - Sequence = 2, - Start = 80325 + new Partition + { + Length = 16065, + Name = "primary", + Offset = 8225280, + Sequence = 0, + Size = 8225280, + Start = 16065, + Type = "\"\0\0\0\\0\"" + }, + new Partition + { + Length = 48195, + Name = "name", + Offset = 16450560, + Sequence = 1, + Size = 24675840, + Start = 32130, + Type = "\"FAT\\1\"" + }, + new Partition + { + Length = 176715, + Name = "partition", + Offset = 41126400, + Sequence = 2, + Size = 90478080, + Start = 80325, + Type = "\"\0\0\0\\0\"" + } } } }; diff --git a/Aaru.Tests/Partitions/SGI.cs b/Aaru.Tests/Partitions/SGI.cs index b9510efc6..b808720b0 100644 --- a/Aaru.Tests/Partitions/SGI.cs +++ b/Aaru.Tests/Partitions/SGI.cs @@ -37,182 +37,182 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "SGI"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "linux.aif", "parted.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Linux's fdisk - new[] + new PartitionTest { - new Partition + TestFile = "linux.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "XFS", - Length = 40961, - Sequence = 0, - Start = 16065 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux RAID", - Length = 61441, - Sequence = 1, - Start = 64260 - }, - new Partition - { - Description = null, - Name = null, - Type = "Track replacements", - Length = 81921, - Sequence = 2, - Start = 128520 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sector replacements", - Length = 92161, - Sequence = 3, - Start = 224910 - }, - new Partition - { - Description = null, - Name = null, - Type = "Raw data (swap)", - Length = 102401, - Sequence = 4, - Start = 321300 - }, - new Partition - { - Description = null, - Name = null, - Type = "4.2BSD Fast File System", - Length = 30721, - Sequence = 5, - Start = 433755 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX System V", - Length = 71681, - Sequence = 6, - Start = 465885 - }, - new Partition - { - Description = null, - Name = null, - Type = "EFS", - Length = 10241, - Sequence = 7, - Start = 546210 - }, - new Partition - { - Description = null, - Name = null, - Type = "Logical volume", - Length = 122881, - Sequence = 8, - Start = 562275 - }, - new Partition - { - Description = null, - Name = null, - Type = "Raw logical volume", - Length = 133121, - Sequence = 9, - Start = 690795 - }, - new Partition - { - Description = null, - Name = null, - Type = "XFS log device", - Length = 51201, - Sequence = 10, - Start = 835380 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux swap", - Length = 30721, - Sequence = 11, - Start = 899640 - }, - new Partition - { - Description = null, - Name = null, - Type = "SGI XVM", - Length = 6145, - Sequence = 12, - Start = 931770 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux", - Length = 64260, - Sequence = 13, - Start = 947835 + new Partition + { + Length = 40961, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 16065, + Type = "XFS" + }, + new Partition + { + Length = 61441, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 64260, + Type = "Linux RAID" + }, + new Partition + { + Length = 81921, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 128520, + Type = "Track replacements" + }, + new Partition + { + Length = 92161, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 224910, + Type = "Sector replacements" + }, + new Partition + { + Length = 102401, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 321300, + Type = "Raw data (swap)" + }, + new Partition + { + Length = 30721, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 433755, + Type = "4.2BSD Fast File System" + }, + new Partition + { + Length = 71681, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 465885, + Type = "UNIX System V" + }, + new Partition + { + Length = 10241, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 546210, + Type = "EFS" + }, + new Partition + { + Length = 122881, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 562275, + Type = "Logical volume" + }, + new Partition + { + Length = 133121, + Offset = 0, + Sequence = 9, + Size = 0, + Start = 690795, + Type = "Raw logical volume" + }, + new Partition + { + Length = 51201, + Offset = 0, + Sequence = 10, + Size = 0, + Start = 835380, + Type = "XFS log device" + }, + new Partition + { + Length = 30721, + Offset = 0, + Sequence = 11, + Size = 0, + Start = 899640, + Type = "Linux swap" + }, + new Partition + { + Length = 6145, + Offset = 0, + Sequence = 12, + Size = 0, + Start = 931770, + Type = "SGI XVM" + }, + new Partition + { + Length = 64260, + Offset = 0, + Sequence = 13, + Size = 0, + Start = 947835, + Type = "Linux" + } } }, - - // GNU Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "Raw data (swap)", - Length = 22528, - Sequence = 0, - Start = 6144 - }, - new Partition - { - Description = null, - Name = null, - Type = "Raw data (swap)", - Length = 67584, - Sequence = 1, - Start = 30720 - }, - new Partition - { - Description = null, - Name = null, - Type = "Raw data (swap)", - Length = 94208, - Sequence = 2, - Start = 100352 - }, - new Partition - { - Description = null, - Name = null, - Type = "XFS", - Length = 36864, - Sequence = 3, - Start = 196608 + new Partition + { + Length = 22528, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 6144, + Type = "Raw data (swap)" + }, + new Partition + { + Length = 67584, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 30720, + Type = "Raw data (swap)" + }, + new Partition + { + Length = 94208, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 100352, + Type = "Raw data (swap)" + }, + new Partition + { + Length = 36864, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 196608, + Type = "XFS" + } } } }; diff --git a/Aaru.Tests/Partitions/Sun.cs b/Aaru.Tests/Partitions/Sun.cs index e59eed006..133f5fe08 100644 --- a/Aaru.Tests/Partitions/Sun.cs +++ b/Aaru.Tests/Partitions/Sun.cs @@ -38,110 +38,110 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Sun"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "linux.aif", "parted.aif" - }; - - public override Partition[][] Wanted => new[] - { - // Linux's fdisk - new[] + new PartitionTest { - new Partition + TestFile = "linux.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "Linux", - Length = 204800, - Sequence = 0, - Start = 0 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sun boot", - Length = 102400, - Sequence = 1, - Start = 208845 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sun /", - Length = 102400, - Sequence = 2, - Start = 321300 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sun /home", - Length = 102400, - Sequence = 3, - Start = 433755 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sun swap", - Length = 153600, - Sequence = 4, - Start = 546210 - }, - new Partition - { - Description = null, - Name = null, - Type = "Sun /usr", - Length = 208845, - Sequence = 5, - Start = 706860 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux swap", - Length = 96390, - Sequence = 6, - Start = 915705 + new Partition + { + Length = 204800, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 0, + Type = "Linux" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 208845, + Type = "Sun boot" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 321300, + Type = "Sun /" + }, + new Partition + { + Length = 102400, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 433755, + Type = "Sun /home" + }, + new Partition + { + Length = 153600, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 546210, + Type = "Sun swap" + }, + new Partition + { + Length = 208845, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 706860, + Type = "Sun /usr" + }, + new Partition + { + Length = 96390, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 915705, + Type = "Linux swap" + } } }, - - // GNU Parted - new[] + new PartitionTest { - new Partition + TestFile = "parted.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "Linux", - Length = 49152, - Sequence = 0, - Start = 0 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux", - Length = 80325, - Sequence = 1, - Start = 64260 - }, - new Partition - { - Description = null, - Name = null, - Type = "Linux", - Length = 96390, - Sequence = 2, - Start = 144585 + new Partition + { + Length = 49152, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 0, + Type = "Linux" + }, + new Partition + { + Length = 80325, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 64260, + Type = "Linux" + }, + new Partition + { + Length = 96390, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 144585, + Type = "Linux" + } } } }; diff --git a/Aaru.Tests/Partitions/VTOC.cs b/Aaru.Tests/Partitions/VTOC.cs index 4528ca6e3..ed41f2eb1 100644 --- a/Aaru.Tests/Partitions/VTOC.cs +++ b/Aaru.Tests/Partitions/VTOC.cs @@ -37,159 +37,157 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "UNIX VTOC"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "att_unix_vtoc.aif" - }; - - public override Partition[][] Wanted => new[] - { - // AT&T UNIX System V Release 4 Version 2.1 for 386 - new[] + new PartitionTest { - new Partition + TestFile = "att_unix_vtoc.aif", + Partitions = new[] { - Description = null, - Name = null, - Type = "UNIX: Boot", - Length = 34, - Sequence = 0, - Start = 1 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: Whole disk", - Length = 1023119, - Sequence = 1, - Start = 1 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: Stand", - Length = 253, - Sequence = 2, - Start = 63 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 3, - Start = 378 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 4, - Start = 79002 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 5, - Start = 157626 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 6, - Start = 236250 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 7, - Start = 314874 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 8, - Start = 393498 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 9, - Start = 472122 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 10, - Start = 550746 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 78624, - Sequence = 11, - Start = 629370 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 76608, - Sequence = 12, - Start = 707994 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 77616, - Sequence = 13, - Start = 784602 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 75600, - Sequence = 14, - Start = 862218 - }, - new Partition - { - Description = null, - Name = null, - Type = "UNIX: /usr", - Length = 84672, - Sequence = 15, - Start = 937818 + new Partition + { + Length = 34, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 1, + Type = "UNIX: Boot" + }, + new Partition + { + Length = 1023119, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 1, + Type = "UNIX: Whole disk" + }, + new Partition + { + Length = 253, + Offset = 0, + Sequence = 2, + Size = 0, + Start = 63, + Type = "UNIX: Stand" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 3, + Size = 0, + Start = 378, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 4, + Size = 0, + Start = 79002, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 5, + Size = 0, + Start = 157626, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 6, + Size = 0, + Start = 236250, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 7, + Size = 0, + Start = 314874, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 8, + Size = 0, + Start = 393498, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 9, + Size = 0, + Start = 472122, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 10, + Size = 0, + Start = 550746, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 78624, + Offset = 0, + Sequence = 11, + Size = 0, + Start = 629370, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 76608, + Offset = 0, + Sequence = 12, + Size = 0, + Start = 707994, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 77616, + Offset = 0, + Sequence = 13, + Size = 0, + Start = 784602, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 75600, + Offset = 0, + Sequence = 14, + Size = 0, + Start = 862218, + Type = "UNIX: /usr" + }, + new Partition + { + Length = 84672, + Offset = 0, + Sequence = 15, + Size = 0, + Start = 937818, + Type = "UNIX: /usr" + } } } }; diff --git a/Aaru.Tests/Partitions/Xbox.cs b/Aaru.Tests/Partitions/Xbox.cs index 919924bb2..225d81d54 100644 --- a/Aaru.Tests/Partitions/Xbox.cs +++ b/Aaru.Tests/Partitions/Xbox.cs @@ -37,32 +37,31 @@ namespace Aaru.Tests.Partitions { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Xbox"); - public override string[] TestFiles => new[] + public override PartitionTest[] Tests => new[] { - "microsoft256mb.aif" - }; - - public override Partition[][] Wanted => new[] - { - new[] + new PartitionTest { - new Partition + TestFile = "microsoft256mb.aif", + Partitions = new[] { - Description = "System cache", - Name = null, - Type = null, - Length = 16376, - Sequence = 0, - Start = 0 - }, - new Partition - { - Description = "Data volume", - Name = null, - Type = null, - Length = 475144, - Sequence = 1, - Start = 16376 + new Partition + { + Description = "System cache", + Length = 16376, + Offset = 0, + Sequence = 0, + Size = 0, + Start = 0 + }, + new Partition + { + Description = "Data volume", + Length = 475144, + Offset = 0, + Sequence = 1, + Size = 0, + Start = 16376 + } } } }; diff --git a/Aaru.Tests/Structs.cs b/Aaru.Tests/Structs.cs index 682bbff7d..c2ba0b817 100644 --- a/Aaru.Tests/Structs.cs +++ b/Aaru.Tests/Structs.cs @@ -65,4 +65,11 @@ namespace Aaru.Tests public TapeFile[] Files; public TapePartition[] Partitions; } + + public class PartitionTest + { + public Partition[] Partitions; + /// File that contains the partition scheme to test + public string TestFile; + } } \ No newline at end of file