aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UDIF test images created with DiskCopy 6.5, previous ones contained garbage.

Browse Source
This commit is contained in:
Natalia Portillo
2021-06-04 14:48:54 +01:00
parent 8b00bb1073
commit f5d169e91b
5 changed files with 264 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Aaru.Tests/Images/DiskCopy65/UDCO.cs
View File

@@ -45,75 +45,75 @@ namespace Aaru.Tests.Images.DiskCopy65
{
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_DOS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCO_DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32"
MD5 = "4306922864c6cf40a419fd5876b5879d"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_DOS_720.img.lz",
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
TestFile = "DC6_UDCO_DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1444,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4"
MD5 = "a885825f28929a5626e71201b37ed96e"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_DOS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCO_DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce"
MD5 = "180a0db19ecfe9d55d068c6460f028be"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_HFS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCO_HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
MD5 = "e307949819edeecd5e855b661a3bfba3"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_HFS_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDCO_HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
MD5 = "c5a5ad78997ddc30f1dc768112f52609"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_HFS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCO_HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
MD5 = "5fd35f80791be6eaa44195875aa0465a"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_PD_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCO_PD_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
MD5 = "1c336199896d1f9bff9b2d5c49b48b63"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_PD_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDCO_PD_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
MD5 = "d654f84668c671e801f4aa107e0aee92"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCO_PD_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCO_PD_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe"
}
};
}

72
Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
View File

@@ -45,75 +45,75 @@ namespace Aaru.Tests.Images.DiskCopy65
{
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_DOS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCo_DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32"
MD5 = "4306922864c6cf40a419fd5876b5879d"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_DOS_720.img.lz",
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
TestFile = "DC6_UDCo_DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1444,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4"
MD5 = "a885825f28929a5626e71201b37ed96e"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_DOS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCo_DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce"
MD5 = "180a0db19ecfe9d55d068c6460f028be"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_HFS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCo_HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
MD5 = "e307949819edeecd5e855b661a3bfba3"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_HFS_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDCo_HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
MD5 = "c5a5ad78997ddc30f1dc768112f52609"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_HFS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCo_HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
MD5 = "5fd35f80791be6eaa44195875aa0465a"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_PD_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDCo_PD_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
MD5 = "1c336199896d1f9bff9b2d5c49b48b63"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_PD_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDCo_PD_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
MD5 = "d654f84668c671e801f4aa107e0aee92"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDCo_PD_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDCo_PD_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe"
}
};
}

120
Aaru.Tests/Images/DiskCopy65/UDRAW.cs Normal file
View File

@@ -0,0 +1,120 @@
// /***************************************************************************
// Aaru Data Preservation Suite
// ----------------------------------------------------------------------------
//
// Filename : UDRAW.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Aaru unit testing.
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2021 Natalia Portillo
// ****************************************************************************/
using System.IO;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.DiscImages;
using NUnit.Framework;
namespace Aaru.Tests.Images.DiskCopy65
{
[TestFixture]
public class UDRAW : BlockMediaImageTest
{
public override string DataFolder =>
Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW");
public override IMediaImage _plugin => new Udif();
public override BlockImageTestExpected[] Tests => new[]
{
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "4306922864c6cf40a419fd5876b5879d"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1444,
SectorSize = 512,
MD5 = "a885825f28929a5626e71201b37ed96e"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "180a0db19ecfe9d55d068c6460f028be"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "e307949819edeecd5e855b661a3bfba3"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "c5a5ad78997ddc30f1dc768112f52609"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "5fd35f80791be6eaa44195875aa0465a"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_PD_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "1c336199896d1f9bff9b2d5c49b48b63"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_PD_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "d654f84668c671e801f4aa107e0aee92"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRAW_PD_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe"
}
};
}
}

72
Aaru.Tests/Images/DiskCopy65/UDRO.cs
View File

@@ -45,75 +45,75 @@ namespace Aaru.Tests.Images.DiskCopy65
{
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_DOS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRO_DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32"
MD5 = "4306922864c6cf40a419fd5876b5879d"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_DOS_720.img.lz",
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
TestFile = "DC6_UDRO_DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1444,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4"
MD5 = "a885825f28929a5626e71201b37ed96e"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_DOS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRO_DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce"
MD5 = "180a0db19ecfe9d55d068c6460f028be"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_HFS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRO_HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
MD5 = "e307949819edeecd5e855b661a3bfba3"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_HFS_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDRO_HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
MD5 = "c5a5ad78997ddc30f1dc768112f52609"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_HFS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRO_HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
MD5 = "5fd35f80791be6eaa44195875aa0465a"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_PD_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRO_PD_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
MD5 = "1c336199896d1f9bff9b2d5c49b48b63"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_PD_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDRO_PD_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
MD5 = "d654f84668c671e801f4aa107e0aee92"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRO_PD_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRO_PD_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe"
}
};
}

72
Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
View File

@@ -45,75 +45,75 @@ namespace Aaru.Tests.Images.DiskCopy65
{
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_DOS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRo_DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32"
MD5 = "4306922864c6cf40a419fd5876b5879d"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_DOS_720.img.lz",
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
TestFile = "DC6_UDRo_DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1444,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4"
MD5 = "a885825f28929a5626e71201b37ed96e"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_DOS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRo_DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce"
MD5 = "180a0db19ecfe9d55d068c6460f028be"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_HFS_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRo_HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
MD5 = "e307949819edeecd5e855b661a3bfba3"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_HFS_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDRo_HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
MD5 = "c5a5ad78997ddc30f1dc768112f52609"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_HFS_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRo_HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
MD5 = "5fd35f80791be6eaa44195875aa0465a"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_PD_1440.img.lz",
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
TestFile = "DC6_UDRo_PD_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 2884,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
MD5 = "1c336199896d1f9bff9b2d5c49b48b63"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_PD_800.img.lz",
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
TestFile = "DC6_UDRo_PD_800.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 1604,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
MD5 = "d654f84668c671e801f4aa107e0aee92"
},
new BlockImageTestExpected
{
TestFile = "DC6_UDRo_PD_DMF.img.lz",
MediaType = MediaType.DMF,
Sectors = 3360,
TestFile = "DC6_UDRo_PD_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 3364,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe"
}
};
}