Fix testing UDRW and UDTO images that are, technically, not UDIF.

This commit is contained in:
2021-07-16 13:01:45 +01:00
parent 5d4c39d1f0
commit 4bb12093ac
2 changed files with 30 additions and 30 deletions

View File

@@ -39,14 +39,14 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
{
public override string DataFolder =>
Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW");
public override IMediaImage _plugin => new Udif();
public override IMediaImage _plugin => new ZZZRawImage();
public override BlockImageTestExpected[] Tests => new[]
{
new BlockImageTestExpected
{
TestFile = "DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32",
@@ -62,7 +62,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4",
@@ -78,7 +78,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce",
@@ -110,7 +110,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
@@ -118,7 +118,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
@@ -126,7 +126,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
@@ -150,7 +150,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
@@ -158,7 +158,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
@@ -166,7 +166,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
@@ -174,7 +174,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "b37823c7a90d1917f719ba5927b23da8"
@@ -182,7 +182,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
SectorSize = 512,
MD5 = "4942032f7bf1d115237ea1764424828b"
@@ -190,7 +190,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "85574aebeef03eb355bf8541955d06ea"
@@ -198,7 +198,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f"

View File

@@ -39,14 +39,14 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
{
public override string DataFolder =>
Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO");
public override IMediaImage _plugin => new Udif();
public override IMediaImage _plugin => new ZZZRawImage();
public override BlockImageTestExpected[] Tests => new[]
{
new BlockImageTestExpected
{
TestFile = "DOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "ff419213080574056ebd9adf7bab3d32",
@@ -62,7 +62,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "DOS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
SectorSize = 512,
MD5 = "c2be571406cf6353269faa59a4a8c0a4",
@@ -78,7 +78,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "DOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "92ea7a359957012a682ba126cfdef0ce",
@@ -110,7 +110,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "3160038ca028ccf52ad7863790072145"
@@ -118,7 +118,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa"
@@ -126,7 +126,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "HFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "652dc979c177f2d8e846587158b38478"
@@ -150,7 +150,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "7975e8cf7579a6848d6fb4e546d1f682"
@@ -158,7 +158,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "a72da7aedadbe194c22a3d71c62e4766"
@@ -166,7 +166,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "ProDOS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "7fbf0251a93cb36d98e68b7d19624de5"
@@ -174,7 +174,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_1440.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_HD,
Sectors = 2880,
SectorSize = 512,
MD5 = "b37823c7a90d1917f719ba5927b23da8"
@@ -182,7 +182,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_720.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DOS_35_DS_DD_9,
Sectors = 1440,
SectorSize = 512,
MD5 = "4942032f7bf1d115237ea1764424828b"
@@ -190,7 +190,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_800.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.AppleSonyDS,
Sectors = 1600,
SectorSize = 512,
MD5 = "85574aebeef03eb355bf8541955d06ea"
@@ -198,7 +198,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
new BlockImageTestExpected
{
TestFile = "UFS_DMF.dmg",
MediaType = MediaType.GENERIC_HDD,
MediaType = MediaType.DMF,
Sectors = 3360,
SectorSize = 512,
MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f"
@@ -207,9 +207,9 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
{
TestFile = "UFS_SP_5Mb.dmg",
MediaType = MediaType.GENERIC_HDD,
Sectors = 10304,
Sectors = 10292,
SectorSize = 512,
MD5 = "b7d4ad55c7702658081b6578b588a57f"
MD5 = "ad555f90bad6a75e8b6ba6cdaafc4458"
}
};
}