From 06a29d6caf905b2a2ae276abb5eb3587b97c2ca3 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 13 Jul 2021 02:00:51 +0100 Subject: [PATCH] Add test for contents of DiskCopy 6.3.3 disk images. --- Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs | 20 ++++++- Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs | 60 ++++++++++++++++++--- Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs | 30 +++++++++-- Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs | 30 +++++++++-- 4 files changed, 126 insertions(+), 14 deletions(-) diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs index c16ad9116..b1e0d45ee 100644 --- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs @@ -48,7 +48,15 @@ namespace Aaru.Tests.Images.DiskCopy633 MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32" + MD5 = "ff419213080574056ebd9adf7bab3d32", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 2880 + } + } }, new BlockImageTestExpected { @@ -56,7 +64,15 @@ namespace Aaru.Tests.Images.DiskCopy633 MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4" + MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 1440 + } + } }, new BlockImageTestExpected { diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs index 1ff7d297f..98d53b3ea 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs @@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32" + MD5 = "ff419213080574056ebd9adf7bab3d32", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 2880 + } + } }, new BlockImageTestExpected { @@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32" + MD5 = "ff419213080574056ebd9adf7bab3d32", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 2880 + } + } }, new BlockImageTestExpected { @@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4" + MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 1440 + } + } }, new BlockImageTestExpected { @@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4" + MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 1440 + } + } }, new BlockImageTestExpected { @@ -81,7 +113,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce" + MD5 = "92ea7a359957012a682ba126cfdef0ce", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 3360 + } + } }, new BlockImageTestExpected { @@ -89,7 +129,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce" + MD5 = "92ea7a359957012a682ba126cfdef0ce", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 3360 + } + } }, new BlockImageTestExpected { diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs index 369ac6de8..206cbafe6 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs @@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32" + MD5 = "ff419213080574056ebd9adf7bab3d32", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 2880 + } + } }, new BlockImageTestExpected { @@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4" + MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 1440 + } + } }, new BlockImageTestExpected { @@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce" + MD5 = "92ea7a359957012a682ba126cfdef0ce", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 3360 + } + } }, new BlockImageTestExpected { diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs index aa01d8fc5..9d8f9aac2 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs @@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32" + MD5 = "ff419213080574056ebd9adf7bab3d32", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 2880 + } + } }, new BlockImageTestExpected { @@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4" + MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 1440 + } + } }, new BlockImageTestExpected { @@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce" + MD5 = "92ea7a359957012a682ba126cfdef0ce", + Partitions = new[] + { + new BlockPartitionVolumes + { + Start = 0, + Length = 3360 + } + } }, new BlockImageTestExpected {