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

Change test files to AaruFormat where possible and applicable.

Browse Source
This commit is contained in:
Natalia Portillo
2020-07-09 01:32:15 +01:00
parent 43115b4bcd
commit cb7a81691d
59 changed files with 420 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Aaru.Tests/Filesystems/AFFS.cs
View File

@@ -119,7 +119,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz", "aros_intl.vdi.lz"
"aros.aif", "aros_intl.aif"
};
readonly ulong[] sectors =
@@ -160,9 +160,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -196,7 +196,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz", "aros_intl.vdi.lz"
"aros.aif", "aros_intl.aif"
};
readonly ulong[] sectors =
@@ -237,9 +237,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR+RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -273,8 +273,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz", "amigaos_3.9_intl.vdi.lz", "aros.vdi.lz", "aros_intl.vdi.lz", "amigaos_4.0.vdi.lz",
"amigaos_4.0_intl.vdi.lz", "amigaos_4.0_cache.vdi.lz"
"amigaos_3.9.aif", "amigaos_3.9_intl.aif", "aros.aif", "aros_intl.aif", "amigaos_4.0.aif",
"amigaos_4.0_intl.aif", "amigaos_4.0_cache.aif"
};
readonly ulong[] sectors =
@@ -316,9 +316,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/AFFS2.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_4.0.vdi.lz"
"amigaos_4.0.aif"
};
readonly ulong[] sectors =
@@ -83,9 +83,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System 2 (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/AFS.cs
View File

@@ -125,7 +125,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"scoopenserver_5.0.7hw.vdi.lz"
"scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -171,9 +171,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acer File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

18
Aaru.Tests/Filesystems/AOFS.cs
View File

@@ -119,7 +119,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz", "aros_intl.vdi.lz"
"aros.aif", "aros_intl.aif"
};
readonly ulong[] sectors =
@@ -160,9 +160,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -195,7 +195,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz", "aros_intl.vdi.lz"
"aros.aif", "aros_intl.aif"
};
readonly ulong[] sectors =
@@ -236,9 +236,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR+RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -271,7 +271,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz", "amigaos_3.9_intl.vdi.lz", "aros.vdi.lz", "aros_intl.vdi.lz"
"amigaos_3.9.aif", "amigaos_3.9_intl.aif", "aros.aif", "aros_intl.aif"
};
readonly ulong[] sectors =
@@ -312,9 +312,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/Atheos.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"syllable_0.6.7.vdi.lz"
"syllable_0.6.7.aif"
};
readonly ulong[] sectors =
@@ -81,9 +81,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "AtheOS (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

18
Aaru.Tests/Filesystems/BeFS.cs
View File

@@ -123,7 +123,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz"
"beos_r3.1.aif", "beos_r4.5.aif"
};
readonly ulong[] sectors =
@@ -169,9 +169,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (APM)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -205,7 +205,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"haiku_hrev51259.vdi.lz"
"haiku_hrev51259.aif"
};
readonly ulong[] sectors =
@@ -246,9 +246,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (GPT)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -281,7 +281,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", "haiku_hrev51259.vdi.lz", "syllable_0.6.7.vdi.lz"
"beos_r3.1.aif", "beos_r4.5.aif", "haiku_hrev51259.aif", "syllable_0.6.7.aif"
};
readonly ulong[] sectors =
@@ -322,9 +322,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/COHERENT.cs
View File

@@ -125,7 +125,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"coherentunix_4.2.10.vdi.lz"
"coherentunix_4.2.10.aif"
};
readonly ulong[] sectors =
@@ -171,9 +171,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "COHERENT filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/DTFS.cs
View File

@@ -124,7 +124,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"scoopenserver_5.0.7hw.vdi.lz"
"scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -168,9 +168,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "DTFS (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/EAFS.cs
View File

@@ -125,7 +125,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"scoopenserver_5.0.7hw.vdi.lz"
"scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -169,9 +169,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "EAFS (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/F2FS.cs
View File

@@ -43,7 +43,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "linux_4.19_f2fs_flashdrive.vdi.lz"
"linux.aif", "linux_4.19_f2fs_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -82,9 +82,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "F2FS", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

46
Aaru.Tests/Filesystems/FAT12.cs
View File

@@ -2627,7 +2627,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -2671,9 +2671,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -2707,7 +2707,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -2751,9 +2751,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (GPT)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -2787,19 +2787,17 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"compaqmsdos331.vdi.lz", "drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz",
"drdos_7.02.vdi.lz", "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos331.vdi.lz", "msdos401.vdi.lz",
"msdos500.vdi.lz", "msdos600.vdi.lz", "msdos620rc1.vdi.lz", "msdos620.vdi.lz", "msdos621.vdi.lz",
"msdos622.vdi.lz", "msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz", "pcdos2000.vdi.lz",
"pcdos200.vdi.lz", "pcdos210.vdi.lz", "pcdos300.vdi.lz", "pcdos310.vdi.lz", "pcdos330.vdi.lz",
"pcdos400.vdi.lz", "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz",
"toshibamsdos330.vdi.lz", "toshibamsdos401.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz",
"multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz",
"os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", "macosx_10.11.vdi.lz",
"win10.vdi.lz", "win2000.vdi.lz", "win95.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz",
"win95osr2.vdi.lz", "win98.vdi.lz", "win98se.vdi.lz", "winme.vdi.lz", "winnt_3.10.vdi.lz",
"winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz",
"linux.vdi.lz", "freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz"
"compaqmsdos331.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.00.aif", "msdos331.aif", "msdos401.aif", "msdos500.aif",
"msdos600.aif", "msdos620rc1.aif", "msdos620.aif", "msdos621.aif", "msdos622.aif", "msdos710.aif",
"novelldos_7.00.aif", "opendos_7.01.aif", "pcdos2000.aif", "pcdos200.aif", "pcdos210.aif", "pcdos300.aif",
"pcdos310.aif", "pcdos330.aif", "pcdos400.aif", "pcdos500.aif", "pcdos502.aif", "pcdos610.aif",
"pcdos630.aif", "toshibamsdos330.aif", "toshibamsdos401.aif", "msos2_1.21.aif", "msos2_1.30.1.aif",
"multiuserdos_7.22r4.aif", "os2_1.20.aif", "os2_1.30.aif", "os2_6.307.aif", "os2_6.514.aif",
"os2_6.617.aif", "os2_8.162.aif", "os2_9.023.aif", "ecs.aif", "macosx_10.11.aif", "win10.aif",
"win2000.aif", "win95.aif", "win95osr2.1.aif", "win95osr2.5.aif", "win95osr2.aif", "win98.aif",
"win98se.aif", "winme.aif", "winnt_3.10.aif", "winnt_3.50.aif", "winnt_3.51.aif", "winnt_4.00.aif",
"winvista.aif", "beos_r4.5.aif", "linux.aif", "freebsd_6.1.aif", "freebsd_7.0.aif", "freebsd_8.2.aif"
};
readonly ulong[] sectors =
@@ -2875,9 +2873,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -2900,7 +2898,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"diska.d88.lz", "diskb.d88.lz"
"diska.aif", "diskb.aif"
};
readonly MediaType[] mediatypes =
@@ -2949,9 +2947,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (Human68K)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new D88();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(mediatypes[i], image.Info.MediaType, testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);

60
Aaru.Tests/Filesystems/FAT16.cs
View File

@@ -159,7 +159,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -203,9 +203,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -239,7 +239,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"tos_1.04.vdi.lz", "tos_1.04_small.vdi.lz"
"tos_1.04.aif", "tos_1.04_small.aif"
};
readonly ulong[] sectors =
@@ -283,9 +283,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Atari)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -320,7 +320,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -364,9 +364,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (GPT)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -400,20 +400,18 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz", "drdos_7.02.vdi.lz",
"drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos331.vdi.lz", "msdos401.vdi.lz", "msdos500.vdi.lz",
"msdos600.vdi.lz", "msdos620rc1.vdi.lz", "msdos620.vdi.lz", "msdos621.vdi.lz", "msdos622.vdi.lz",
"msdos710.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz", "pcdos2000.vdi.lz", "pcdos400.vdi.lz",
"pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz", "msos2_1.21.vdi.lz",
"msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz",
"os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz",
"ecs.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "win2000.vdi.lz", "win95osr2.1.vdi.lz",
"win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win95.vdi.lz", "win98se.vdi.lz", "win98.vdi.lz", "winme.vdi.lz",
"winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz",
"beos_r4.5.vdi.lz", "linux.vdi.lz", "amigaos_3.9.vdi.lz", "aros.vdi.lz", "freebsd_6.1.vdi.lz",
"freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "macos_7.5.3.vdi.lz", "macos_7.5.vdi.lz", "macos_7.6.vdi.lz",
"macos_8.0.vdi.lz", "ecs20_fstester.vdi.lz", "linux_2.2_umsdos16_flashdrive.vdi.lz",
"linux_4.19_fat16_msdos_flashdrive.vdi.lz", "linux_4.19_vfat16_flashdrive.vdi.lz"
"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.00.aif", "msdos331.aif", "msdos401.aif", "msdos500.aif", "msdos600.aif", "msdos620rc1.aif",
"msdos620.aif", "msdos621.aif", "msdos622.aif", "msdos710.aif", "novelldos_7.00.aif", "opendos_7.01.aif",
"pcdos2000.aif", "pcdos400.aif", "pcdos500.aif", "pcdos502.aif", "pcdos610.aif", "pcdos630.aif",
"msos2_1.21.aif", "msos2_1.30.1.aif", "multiuserdos_7.22r4.aif", "os2_1.20.aif", "os2_1.30.aif",
"os2_6.307.aif", "os2_6.514.aif", "os2_6.617.aif", "os2_8.162.aif", "os2_9.023.aif", "ecs.aif",
"macosx_10.11.aif", "win10.aif", "win2000.aif", "win95osr2.1.aif", "win95osr2.5.aif", "win95osr2.aif",
"win95.aif", "win98se.aif", "win98.aif", "winme.aif", "winnt_3.10.aif", "winnt_3.50.aif", "winnt_3.51.aif",
"winnt_4.00.aif", "winvista.aif", "beos_r4.5.aif", "linux.aif", "amigaos_3.9.aif", "aros.aif",
"freebsd_6.1.aif", "freebsd_7.0.aif", "freebsd_8.2.aif", "macos_7.5.3.aif", "macos_7.5.aif",
"macos_7.6.aif", "macos_8.0.aif", "ecs20_fstester.aif", "linux_2.2_umsdos16_flashdrive.aif",
"linux_4.19_fat16_msdos_flashdrive.aif", "linux_4.19_vfat16_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -494,9 +492,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -519,7 +517,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz"
"amigaos_3.9.aif"
};
readonly ulong[] sectors =
@@ -563,9 +561,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (RDB)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -599,7 +597,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"sasidisk.hdf.lz", "scsidisk.hds.lz"
"sasidisk.aif", "scsidisk.aif"
};
readonly ulong[] sectors =
@@ -643,9 +641,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Human68K)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

27
Aaru.Tests/Filesystems/FAT32.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -86,9 +86,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -122,7 +122,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -166,9 +166,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (GPT)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -202,12 +202,11 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos_7.10.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz",
"win2000.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win98se.vdi.lz",
"win98.vdi.lz", "winme.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", "aros.vdi.lz",
"freebsd_6.1.vdi.lz", "freebsd_7.0.vdi.lz", "freebsd_8.2.vdi.lz", "freedos_1.2.vdi.lz",
"ecs20_fstester.vdi.lz", "linux_2.2_umsdos32_flashdrive.vdi.lz", "linux_4.19_fat32_msdos_flashdrive.vdi.lz",
"linux_4.19_vfat32_flashdrive.vdi.lz"
"drdos_7.03.aif", "drdos_8.00.aif", "msdos_7.10.aif", "macosx_10.11.aif", "win10.aif", "win2000.aif",
"win95osr2.1.aif", "win95osr2.5.aif", "win95osr2.aif", "win98se.aif", "win98.aif", "winme.aif",
"winvista.aif", "beos_r4.5.aif", "linux.aif", "aros.aif", "freebsd_6.1.aif", "freebsd_7.0.aif",
"freebsd_8.2.aif", "freedos_1.2.aif", "ecs20_fstester.aif", "linux_2.2_umsdos32_flashdrive.aif",
"linux_4.19_fat32_msdos_flashdrive.aif", "linux_4.19_vfat32_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -262,9 +261,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

42
Aaru.Tests/Filesystems/HFS.cs
View File

@@ -121,14 +121,13 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz",
"darwin_8.0.1.vdi.lz", "macos_1.1.vdi.lz", "macos_2.0.vdi.lz", "macos_6.0.7.vdi.lz", "macos_7.5.3.vdi.lz",
"macos_7.5.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "macos_8.1.vdi.lz", "macos_9.0.4.vdi.lz",
"macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz", "macosx_10.2.vdi.lz", "macosx_10.3.vdi.lz",
"macosx_10.4.vdi.lz", "rhapsody_dr1.vdi.lz", "d2_driver.vdi.lz", "hdt_1.8.vdi.lz", "macos_4.2.vdi.lz",
"macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz", "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz", "macos_6.0.5.vdi.lz",
"macos_6.0.8.vdi.lz", "macos_6.0.vdi.lz", "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz", "parted.vdi.lz",
"silverlining_2.2.1.vdi.lz", "speedtools_3.6.vdi.lz", "vcpformatter_2.1.1.vdi.lz"
"amigaos_3.9.aif", "darwin_1.3.1.aif", "darwin_1.4.1.aif", "darwin_6.0.2.aif", "darwin_8.0.1.aif",
"macos_1.1.aif", "macos_2.0.aif", "macos_6.0.7.aif", "macos_7.5.3.aif", "macos_7.5.aif", "macos_7.6.aif",
"macos_8.0.aif", "macos_8.1.aif", "macos_9.0.4.aif", "macos_9.1.aif", "macos_9.2.1.aif", "macos_9.2.2.aif",
"macosx_10.2.aif", "macosx_10.3.aif", "macosx_10.4.aif", "rhapsody_dr1.aif", "d2_driver.aif", "hdt_1.8.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.8.aif", "macos_6.0.aif", "macos_7.0.aif", "macos_7.1.1.aif", "parted.aif",
"silverlining_2.2.1.aif", "speedtools_3.6.aif", "vcpformatter_2.1.1.aif"
};
readonly ulong[] sectors =
@@ -180,9 +179,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -215,9 +214,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"toast_3.5.7_hfs_from_volume.iso.lz", "toast_3.5.7_iso9660_hfs.iso.lz",
"toast_4.1.3_hfs_from_volume.iso.lz", "toast_4.1.3_iso9660_hfs.iso.lz", "toast_3.5.7_hfs_from_files.iso.lz",
"toast_4.1.3_hfs_from_files.iso.lz"
"toast_3.5.7_hfs_from_volume.aif", "toast_3.5.7_iso9660_hfs.aif", "toast_4.1.3_hfs_from_volume.aif",
"toast_4.1.3_iso9660_hfs.aif", "toast_3.5.7_hfs_from_files.aif", "toast_4.1.3_hfs_from_files.aif"
};
readonly ulong[] sectors =
@@ -256,9 +254,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (CD-ROM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -291,8 +289,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1.vdi.lz",
"linux_4.19_hfs_flashdrive.vdi.lz"
"linux.aif", "darwin_1.3.1.aif", "darwin_1.4.1.aif", "darwin_6.0.2.aif", "darwin_8.0.1.aif",
"linux_4.19_hfs_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -331,9 +329,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -366,7 +364,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz"
"amigaos_3.9.aif"
};
readonly ulong[] sectors =
@@ -405,9 +403,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (RDB)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

31
Aaru.Tests/Filesystems/HFSPlus.cs
View File

@@ -43,11 +43,11 @@ namespace Aaru.Tests.Filesystems
// Missing Darwin 1.4.1
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz",
"darwin_1.4.1_wrapped.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_6.0.2_wrapped.vdi.lz",
"darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz", "macos_8.1.vdi.lz",
"macos_9.0.4.vdi.lz", "macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz", "macosx_10.2.vdi.lz",
"macosx_10.3_journal.vdi.lz", "macosx_10.3.vdi.lz", "macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif", "darwin_1.3.1.aif", "darwin_1.3.1_wrapped.aif",
"darwin_1.4.1_wrapped.aif", "darwin_6.0.2.aif", "darwin_6.0.2_wrapped.aif", "darwin_8.0.1_journal.aif",
"darwin_8.0.1.aif", "darwin_8.0.1_wrapped.aif", "macos_8.1.aif", "macos_9.0.4.aif", "macos_9.1.aif",
"macos_9.2.1.aif", "macos_9.2.2.aif", "macosx_10.2.aif", "macosx_10.3_journal.aif", "macosx_10.3.aif",
"macosx_10.4_journal.aif", "macosx_10.4.aif"
};
readonly ulong[] sectors =
@@ -98,9 +98,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -134,7 +134,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif"
};
readonly ulong[] sectors =
@@ -178,9 +178,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (GPT)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -215,10 +215,9 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz",
"darwin_1.3.1.vdi.lz", "darwin_1.3.1_wrapped.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_1.4.1_wrapped.vdi.lz",
"darwin_6.0.2.vdi.lz", "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "darwin_8.0.1_wrapped.vdi.lz",
"linux_4.19_hfs+_flashdrive.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif", "linux.aif", "linux_journal.aif", "darwin_1.3.1.aif",
"darwin_1.3.1_wrapped.aif", "darwin_1.4.1.aif", "darwin_1.4.1_wrapped.aif", "darwin_6.0.2.aif",
"darwin_8.0.1_journal.aif", "darwin_8.0.1.aif", "darwin_8.0.1_wrapped.aif", "linux_4.19_hfs+_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -263,9 +262,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

20
Aaru.Tests/Filesystems/HFSX.cs
View File

@@ -42,8 +42,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz",
"macosx_10.4_journal.vdi.lz", "macosx_10.4.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif", "darwin_8.0.1_journal.aif", "darwin_8.0.1.aif",
"macosx_10.4_journal.aif", "macosx_10.4.aif"
};
readonly ulong[] sectors =
@@ -88,9 +88,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -124,7 +124,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif"
};
readonly ulong[] sectors =
@@ -170,7 +170,7 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (GPT)", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -204,8 +204,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz",
"darwin_8.0.1_journal.vdi.lz", "darwin_8.0.1.vdi.lz", "linux_4.19_hfsx_flashdrive.vdi.lz"
"macosx_10.11.aif", "macosx_10.11_journal.aif", "linux.aif", "linux_journal.aif",
"darwin_8.0.1_journal.aif", "darwin_8.0.1.aif", "linux_4.19_hfsx_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -250,9 +250,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

10
Aaru.Tests/Filesystems/HPFS.cs
View File

@@ -42,9 +42,9 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"ecs.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz",
"os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", "os2_8.162.vdi.lz", "os2_9.023.vdi.lz",
"winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "ecs20_fstester.vdi.lz"
"ecs.aif", "msos2_1.21.aif", "msos2_1.30.1.aif", "os2_1.20.aif", "os2_1.30.aif", "os2_6.307.aif",
"os2_6.514.aif", "os2_6.617.aif", "os2_8.162.aif", "os2_9.023.aif", "winnt_3.10.aif", "winnt_3.50.aif",
"ecs20_fstester.aif"
};
readonly ulong[] sectors =
@@ -93,9 +93,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Performance File System",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/HTFS.cs
View File

@@ -126,7 +126,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"scoopenserver_5.0.7hw.vdi.lz"
"scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -172,9 +172,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems",
"High Throughtput File System (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

111
Aaru.Tests/Filesystems/ISO9660.cs
View File

@@ -42,23 +42,20 @@ namespace Aaru.Tests.Filesystems
readonly string[] testfiles =
{
// Toast 3.5.7
"toast_3.5.7_iso9660_apple.iso.lz", "toast_3.5.7_iso9660_dos_apple.iso.lz",
"toast_3.5.7_iso9660_dos.iso.lz", "toast_3.5.7_iso9660_hfs.iso.lz", "toast_3.5.7_iso9660.iso.lz",
"toast_3.5.7_iso9660_joliet_apple.iso.lz", "toast_3.5.7_iso9660_joliet.iso.lz",
"toast_3.5.7_iso9660_mac_apple.iso.lz", "toast_3.5.7_iso9660_mac.iso.lz",
"toast_3.5.7_iso9660_ver_apple.iso.lz", "toast_3.5.7_iso9660_ver_dos_apple.iso.lz",
"toast_3.5.7_iso9660_ver_dos.iso.lz", "toast_3.5.7_iso9660_ver.iso.lz",
"toast_3.5.7_iso9660_ver_joliet_apple.iso.lz", "toast_3.5.7_iso9660_ver_joliet.iso.lz",
"toast_3.5.7_iso9660.iso.lz",
"toast_3.5.7_iso9660_apple.aif", "toast_3.5.7_iso9660_dos_apple.aif", "toast_3.5.7_iso9660_dos.aif",
"toast_3.5.7_iso9660_hfs.aif", "toast_3.5.7_iso9660.aif", "toast_3.5.7_iso9660_joliet_apple.aif",
"toast_3.5.7_iso9660_joliet.aif", "toast_3.5.7_iso9660_mac_apple.aif", "toast_3.5.7_iso9660_mac.aif",
"toast_3.5.7_iso9660_ver_apple.aif", "toast_3.5.7_iso9660_ver_dos_apple.aif",
"toast_3.5.7_iso9660_ver_dos.aif", "toast_3.5.7_iso9660_ver.aif",
"toast_3.5.7_iso9660_ver_joliet_apple.aif", "toast_3.5.7_iso9660_ver_joliet.aif", "toast_3.5.7_iso9660.aif",
// Toast 4.1.3
"toast_4.1.3_iso9660_hfs.iso.lz",
"toast_4.1.3_iso9660_hfs.aif",
// Toast 4.0.3
"toast_4.0.3_iso9660_apple.iso.lz", "toast_4.0.3_iso9660_dos_apple.iso.lz",
"toast_4.0.3_iso9660_dos.iso.lz", "toast_4.0.3_iso9660_hfs.iso.lz", "toast_4.0.3_iso9660.iso.lz",
"toast_4.0.3_iso9660_joliet_apple.iso.lz", "toast_4.0.3_iso9660_joliet.iso.lz",
"toast_4.0.3_iso9660_mac_apple.iso.lz", "toast_4.0.3_iso9660_mac.iso.lz",
"toast_4.0.3_iso9660_apple.aif", "toast_4.0.3_iso9660_dos_apple.aif", "toast_4.0.3_iso9660_dos.aif",
"toast_4.0.3_iso9660_hfs.aif", "toast_4.0.3_iso9660.aif", "toast_4.0.3_iso9660_joliet_apple.aif",
"toast_4.0.3_iso9660_joliet.aif", "toast_4.0.3_iso9660_mac_apple.aif", "toast_4.0.3_iso9660_mac.aif",
// Toast 4.0.3 (CD-ROM XA)
// "toast_4.0.3_iso9660_apple_xa.iso.lz","toast_4.0.3_iso9660_dos_apple_xa.iso.lz",
@@ -67,29 +64,29 @@ namespace Aaru.Tests.Filesystems
// "toast_4.0.3_iso9660_mac_xa.iso.lz","toast_4.0.3_iso9660_xa.iso.lz",
// "toast_4.0.3_iso9660_hfs_xa.iso.lz",
// mkisofs
"mkisofs_apple_rockrige.iso.lz", "mkisofs_apple_xa.iso.lz", "mkisofs_hybrid.iso.lz",
"mkisofs_hybrid_nopart.iso.lz", "mkisofs_iso9660_level1_dirnest.iso.lz", "mkisofs_iso9660_level1.iso.lz",
"mkisofs_iso9660_level2_dirnest.iso.lz", "mkisofs_iso9660_level2.iso.lz",
"mkisofs_iso9660_level3_dirnest.iso.lz", "mkisofs_iso9660_level3.iso.lz",
"mkisofs_iso9660_level4_dirnest.iso.lz", "mkisofs_iso9660_level4.iso.lz",
"mkisofs_iso9660_udf_hybrid_dirnest.iso.lz", "mkisofs_iso9660_udf_hybrid.iso.lz", "mkisofs_joliet.iso.lz",
"mkisofs_joliet_level1.iso.lz", "mkisofs_joliet_level2.iso.lz", "mkisofs_joliet_level3.iso.lz",
"mkisofs_joliet_violating.iso.lz", "mkisofs_level1.iso.lz", "mkisofs_level2.iso.lz",
"mkisofs_level3.iso.lz", "mkisofs_level4.iso.lz", "mkisofs_rockridge_dirnest.iso.lz",
"mkisofs_rockridge.iso.lz", "mkisofs_rockridge_old.iso.lz", "mkisofs_rockridge_rational.iso.lz",
"mkisofs_udf.iso.lz", "mkisofs_violating.iso.lz", "mkisofs_xa.iso.lz", "mkisofs_zisofs.iso.lz",
"mkisofs_zisofs_rockridge.iso.lz",
"mkisofs_apple_rockrige.aif", "mkisofs_apple_xa.aif", "mkisofs_hybrid.aif", "mkisofs_hybrid_nopart.aif",
"mkisofs_iso9660_level1_dirnest.aif", "mkisofs_iso9660_level1.aif", "mkisofs_iso9660_level2_dirnest.aif",
"mkisofs_iso9660_level2.aif", "mkisofs_iso9660_level3_dirnest.aif", "mkisofs_iso9660_level3.aif",
"mkisofs_iso9660_level4_dirnest.aif", "mkisofs_iso9660_level4.aif",
"mkisofs_iso9660_udf_hybrid_dirnest.aif", "mkisofs_iso9660_udf_hybrid.aif", "mkisofs_joliet.aif",
"mkisofs_joliet_level1.aif", "mkisofs_joliet_level2.aif", "mkisofs_joliet_level3.aif",
"mkisofs_joliet_violating.aif", "mkisofs_level1.aif", "mkisofs_level2.aif", "mkisofs_level3.aif",
"mkisofs_level4.aif", "mkisofs_rockridge_dirnest.aif", "mkisofs_rockridge.aif", "mkisofs_rockridge_old.aif",
"mkisofs_rockridge_rational.aif", "mkisofs_udf.aif", "mkisofs_violating.aif", "mkisofs_xa.aif",
"mkisofs_zisofs.aif", "mkisofs_zisofs_rockridge.aif",
// Nero MAX
"neromax_iso_mode1_apple.iso.lz", "neromax_iso_mode1_joliet.iso.lz", "neromax_iso_mode1_level1.iso.lz",
"neromax_iso_mode1_level2.iso.lz", "neromax_iso_mode2_apple.iso.lz", "neromax_iso_mode2_joliet.iso.lz",
"neromax_iso_mode2_level1.iso.lz", "neromax_iso_mode2_level2.iso.lz",
"neromax_iso_mode1_apple.aif", "neromax_iso_mode1_joliet.aif", "neromax_iso_mode1_level1.aif",
"neromax_iso_mode1_level2.aif",
// Nero MAX (CD-ROM XA)
// "neromax_iso_mode2_apple.iso.lz", "neromax_iso_mode2_joliet.iso.lz",
// "neromax_iso_mode2_level1.iso.lz", "neromax_iso_mode2_level2.iso.lz",
// XorrISO
"xorriso_hybrid.iso.lz", "xorriso_joliet.iso.lz", "xorriso_joliet_utf.iso.lz",
"xorriso_joliet_violating.iso.lz", "xorriso_level1.iso.lz", "xorriso_level2.iso.lz",
"xorriso_level3.iso.lz", "xorriso_level4.iso.lz", "xorriso_rockridge.iso.lz", "xorriso_violating.iso.lz",
"xorriso_zisofs.iso.lz", "xorriso_zisofs_rockridge.iso.lz"
"xorriso_hybrid.aif", "xorriso_joliet.aif", "xorriso_joliet_utf.aif", "xorriso_joliet_violating.aif",
"xorriso_level1.aif", "xorriso_level2.aif", "xorriso_level3.aif", "xorriso_level4.aif",
"xorriso_rockridge.aif", "xorriso_violating.aif", "xorriso_zisofs.aif", "xorriso_zisofs_rockridge.aif"
};
readonly MediaType[] mediatypes =
@@ -117,8 +114,10 @@ namespace Aaru.Tests.Filesystems
MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
// Nero MAX
MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
MediaType.CD,
MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
// Nero MAX (CD-ROM XA)
// MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
// XorrISO
MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD, MediaType.CD,
@@ -143,7 +142,10 @@ namespace Aaru.Tests.Filesystems
3651, 3651, 3637, 3637, 3637, 3689, 7481, 7487, 3693, 7487, 3925, 3637, 3637, 3637, 3693,
// Nero MAX
389, 417, 257, 266, 55, 56, 57, 58,
389, 417, 257, 266,
// Nero MAX (CD-ROM XA)
// 55, 56, 57, 58,
// XorrISO
59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70
@@ -167,7 +169,10 @@ namespace Aaru.Tests.Filesystems
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
// Nero MAX
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
2048, 2048, 2048, 2048,
// Nero MAX (CD-ROM XA)
// 2048, 2048, 2048, 2048,
// XorrISO
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048
@@ -191,7 +196,10 @@ namespace Aaru.Tests.Filesystems
3651, 3651, 3637, 3637, 3637, 3689, 7481, 7487, 3693, 7487, 3925, 3637, 3637, 3637, 3693,
// Nero MAX
389, 417, 257, 266, 55, 56, 57, 58,
389, 417, 257, 266,
// Nero MAX (CD-ROM XA)
// 55, 56, 57, 58,
// XorrISO
59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70
@@ -215,7 +223,10 @@ namespace Aaru.Tests.Filesystems
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
// Nero MAX
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048,
2048, 2048, 2048, 2048,
// Nero MAX (CD-ROM XA)
// 2048, 2048, 2048, 2048,
// XorrISO
2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048, 2048
@@ -244,7 +255,10 @@ namespace Aaru.Tests.Filesystems
"test", "CDROM", "test", "test", "test", "test", "test",
// Nero MAX
"Root", "Root", "Root", "Root", "Root", "Root", "Root", "Root",
"Root", "Root", "Root", "Root",
// Nero MAX (CD-ROM XA)
// "Root", "Root", "Root", "Root",
// XorrISO
"DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS",
@@ -269,7 +283,10 @@ namespace Aaru.Tests.Filesystems
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
// Nero MAX
null, null, null, null, null, null, null, null,
null, null, null, null,
// Nero MAX (CD-ROM XA)
// null, null, null, null,
// XorrISO
null, null, null, null, null, null, null, null, null, null, null, null
@@ -303,7 +320,10 @@ namespace Aaru.Tests.Filesystems
"LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX", "LINUX",
// Nero MAX
"", "", "", "", "", "", "", "",
"", "", "", "",
// Nero MAX (CD-ROM XA)
// "", "", "", "",
// XorrISO
"APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002",
@@ -395,7 +415,10 @@ namespace Aaru.Tests.Filesystems
"MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
// Nero MAX
"", "", "", "", "", "", "", "",
"", "", "", "",
// Nero MAX (CD-ROM XA)
// "", "", "", "",
// XorrISO
"TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
@@ -418,9 +441,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "ISO9660", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), $"{testfiles[i]}: Open()");
Assert.AreEqual(mediatypes[i], image.Info.MediaType, $"{testfiles[i]}: MediaType");
Assert.AreEqual(sectors[i], image.Info.Sectors, $"{testfiles[i]}: Sectors");

8
Aaru.Tests/Filesystems/JFS2.cs
View File

@@ -42,8 +42,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "linux_caseinsensitive.vdi.lz", "ecs20_fstester.vdi.lz", "linux_4.19_jfs_flashdrive.vdi.lz",
"linux_4.19_jfs_os2_flashdrive.vdi.lz"
"linux.aif", "linux_caseinsensitive.aif", "ecs20_fstester.aif", "linux_4.19_jfs_flashdrive.aif",
"linux_4.19_jfs_os2_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -84,9 +84,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "JFS2", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/LFS.cs
View File

@@ -36,7 +36,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"netbsd_1.6.vdi.lz"
"netbsd_1.6.aif"
};
readonly ulong[] sectors =
@@ -76,9 +76,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Log-structured File System", testfiles[i]);
Filter filter = new LZip();
Filter filter = new ZZZNoFilter();
filter.Open(location);
ImagePlugin image = new VDI();
ImagePlugin image = new AaruFormat();
Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]);

2
Aaru.Tests/Filesystems/MFS.cs
View File

@@ -89,7 +89,7 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Macintosh File System",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);

18
Aaru.Tests/Filesystems/MINIX.cs
View File

@@ -113,7 +113,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "minix_3.1.2a.vdi.lz", "linux_4.19_minix1_flashdrive.vdi.lz"
"linux.aif", "minix_3.1.2a.aif", "linux_4.19_minix1_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -149,9 +149,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v1 filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -255,7 +255,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"minix_3.1.2a.vdi.lz", "linux_4.19_minix2_flashdrive.vdi.lz"
"minix_3.1.2a.aif", "linux_4.19_minix2_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -291,9 +291,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v2 filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -396,7 +396,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"minix_3.1.2a.vdi.lz", "linux_4.19_minix3_flashdrive.vdi.lz"
"minix_3.1.2a.aif", "linux_4.19_minix3_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -432,9 +432,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v3 filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/NILFS2.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz"
"linux.aif"
};
readonly ulong[] sectors =
@@ -83,9 +83,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems",
"New Implementation of a Log-structured File System 2", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

15
Aaru.Tests/Filesystems/NTFS.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"haiku_hrev51259.vdi.lz"
"haiku_hrev51259.aif"
};
readonly ulong[] sectors =
@@ -88,9 +88,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (GPT)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -124,9 +124,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"win10.vdi.lz", "win2000.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz",
"winnt_4.00.vdi.lz", "winvista.vdi.lz", "linux.vdi.lz", "haiku_hrev51259.vdi.lz",
"linux_4.19_ntfs3g_flashdrive.vdi.lz"
"win10.aif", "win2000.aif", "winnt_3.10.aif", "winnt_3.50.aif", "winnt_3.51.aif", "winnt_4.00.aif",
"winvista.aif", "linux.aif", "haiku_hrev51259.aif", "linux_4.19_ntfs3g_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -173,9 +172,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/NWFS386.cs
View File

@@ -36,7 +36,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"netware_3.12.vdi.lz"
"netware_3.12.aif"
};
readonly ulong[] sectors =
@@ -76,9 +76,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "NetWare File System (32-bit)", testfiles[i]);
Filter filter = new LZip();
Filter filter = new ZZZNoFilter();
filter.Open(location);
ImagePlugin image = new VDI();
ImagePlugin image = new AaruFormat();
Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/OCFS2.cs
View File

@@ -36,7 +36,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz"
"linux.aif"
};
readonly ulong[] sectors =
@@ -76,9 +76,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Oracle Cluster File System 2", testfiles[i]);
Filter filter = new LZip();
Filter filter = new ZZZNoFilter();
filter.Open(location);
ImagePlugin image = new VDI();
ImagePlugin image = new AaruFormat();
Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/PFS3.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"uae.vdi.lz"
"uae.aif"
};
readonly ulong[] sectors =
@@ -88,9 +88,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Professional File System 3",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

8
Aaru.Tests/Filesystems/ProDOS.cs
View File

@@ -42,8 +42,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macos_7.5.3.vdi.lz", "macos_7.6.vdi.lz", "macos_8.0.vdi.lz", "macos_8.1.vdi.lz", "macos_9.0.4.vdi.lz",
"macos_9.1.vdi.lz", "macos_9.2.1.vdi.lz", "macos_9.2.2.vdi.lz"
"macos_7.5.3.aif", "macos_7.6.aif", "macos_8.0.aif", "macos_8.1.aif", "macos_9.0.4.aif", "macos_9.1.aif",
"macos_9.2.1.aif", "macos_9.2.2.aif"
};
readonly ulong[] sectors =
@@ -85,9 +85,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "ProDOS filesystem (APM)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/QNX4.cs
View File

@@ -105,7 +105,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"qnx_4.24.vdi.lz"
"qnx_4.24.aif"
};
readonly ulong[] sectors =
@@ -136,9 +136,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "QNX 4 filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

8
Aaru.Tests/Filesystems/Reiser3.cs
View File

@@ -42,8 +42,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux_r3.5.vdi.lz", "linux_r3.6.vdi.lz", "linux_4.19_reiser_3.5_flashdrive.vdi.lz",
"linux_4.19_reiser_3.6_flashdrive.vdi.lz"
"linux_r3.5.aif", "linux_r3.6.aif", "linux_4.19_reiser_3.5_flashdrive.aif",
"linux_4.19_reiser_3.6_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -79,9 +79,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v3",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/Reiser4.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz"
"linux.aif"
};
readonly ulong[] sectors =
@@ -82,9 +82,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v4",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

18
Aaru.Tests/Filesystems/SFS.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz"
"aros.aif"
};
readonly ulong[] sectors =
@@ -83,9 +83,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -118,7 +118,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"aros.vdi.lz"
"aros.aif"
};
readonly ulong[] sectors =
@@ -159,9 +159,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR+RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -194,7 +194,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"uae.vdi.lz", "aros.vdi.lz", "amigaos_4.0.vdi.lz", "amigaos_4.0_sfs2.vdi.lz"
"uae.aif", "aros.aif", "amigaos_4.0.aif", "amigaos_4.0_sfs2.aif"
};
readonly ulong[] sectors =
@@ -235,9 +235,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

14
Aaru.Tests/Filesystems/SysV.cs
View File

@@ -97,7 +97,7 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -128,7 +128,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"att_unix_svr4v2.1.vdi.lz", "att_unix_svr4v2.1_2k.vdi.lz", "scoopenserver_5.0.7hw.vdi.lz"
"att_unix_svr4v2.1.aif", "att_unix_svr4v2.1_2k.aif", "scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -174,9 +174,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -210,7 +210,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amix.vdi.lz"
"amix.aif"
};
readonly ulong[] sectors =
@@ -256,9 +256,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

21
Aaru.Tests/Filesystems/UDF.cs
View File

@@ -41,12 +41,11 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"1.02/linux.vdi.lz", "1.02/macosx_10.11.vdi.lz", "1.50/linux.vdi.lz", "1.50/macosx_10.11.vdi.lz",
"2.00/linux.vdi.lz", "2.00/macosx_10.11.vdi.lz", "2.01/linux.vdi.lz", "2.01/macosx_10.11.vdi.lz",
"2.50/linux.vdi.lz", "2.50/macosx_10.11.vdi.lz", "2.60/macosx_10.11.vdi.lz", "1.50/solaris_7.vdi.lz",
"1.50/solaris_9.vdi.lz", "2.01/netbsd_7.1.vdi.lz", "1.02/linux_4.19_udf_1.02_flashdrive.vdi.lz",
"1.50/linux_4.19_udf_1.50_flashdrive.vdi.lz", "2.00/linux_4.19_udf_2.00_flashdrive.vdi.lz",
"2.01/linux_4.19_udf_2.01_flashdrive.vdi.lz"
"1.02/linux.aif", "1.02/macosx_10.11.aif", "1.50/linux.aif", "1.50/macosx_10.11.aif", "2.00/linux.aif",
"2.00/macosx_10.11.aif", "2.01/linux.aif", "2.01/macosx_10.11.aif", "2.50/linux.aif",
"2.50/macosx_10.11.aif", "2.60/macosx_10.11.aif", "1.50/solaris_7.aif", "1.50/solaris_9.aif",
"2.01/netbsd_7.1.aif", "1.02/linux_4.19_udf_1.02_flashdrive.aif", "1.50/linux_4.19_udf_1.50_flashdrive.aif",
"2.00/linux_4.19_udf_2.00_flashdrive.aif", "2.01/linux_4.19_udf_2.01_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -113,9 +112,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -144,7 +143,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"1.50/ecs20.iso.lz", "2.00/ecs20.iso.lz", "2.01/ecs20.iso.lz", "2.01/ecs20_cdrw.iso.lz"
"1.50/ecs20.aif", "2.00/ecs20.aif", "2.01/ecs20.aif", "2.01/ecs20_cdrw.aif"
};
readonly ulong[] sectors =
@@ -195,9 +194,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

53
Aaru.Tests/Filesystems/UFS.cs
View File

@@ -125,10 +125,9 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"ffs43/darwin_1.3.1.vdi.lz", "ffs43/darwin_1.4.1.vdi.lz", "ffs43/darwin_6.0.2.vdi.lz",
"ffs43/darwin_8.0.1.vdi.lz", "ufs1/darwin_1.3.1.vdi.lz", "ufs1/darwin_1.4.1.vdi.lz",
"ufs1/darwin_6.0.2.vdi.lz", "ufs1/darwin_8.0.1.vdi.lz", "ufs1/macosx_10.2.vdi.lz",
"ufs1/macosx_10.3.vdi.lz", "ufs1/macosx_10.4.vdi.lz"
"ffs43/darwin_1.3.1.aif", "ffs43/darwin_1.4.1.aif", "ffs43/darwin_6.0.2.aif", "ffs43/darwin_8.0.1.aif",
"ufs1/darwin_1.3.1.aif", "ufs1/darwin_1.4.1.aif", "ufs1/darwin_6.0.2.aif", "ufs1/darwin_8.0.1.aif",
"ufs1/macosx_10.2.aif", "ufs1/macosx_10.3.aif", "ufs1/macosx_10.4.aif"
};
readonly ulong[] sectors =
@@ -174,9 +173,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (APM)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -209,15 +208,14 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"ufs1/linux.vdi.lz", "ufs2/linux.vdi.lz", "ffs43/darwin_1.3.1.vdi.lz", "ffs43/darwin_1.4.1.vdi.lz",
"ffs43/darwin_6.0.2.vdi.lz", "ffs43/darwin_8.0.1.vdi.lz", "ffs43/dflybsd_1.2.0.vdi.lz",
"ffs43/dflybsd_3.6.1.vdi.lz", "ffs43/dflybsd_4.0.5.vdi.lz", "ffs43/netbsd_1.6.vdi.lz",
"ffs43/netbsd_7.1.vdi.lz", "ufs1/darwin_1.3.1.vdi.lz", "ufs1/darwin_1.4.1.vdi.lz",
"ufs1/darwin_6.0.2.vdi.lz", "ufs1/darwin_8.0.1.vdi.lz", "ufs1/dflybsd_1.2.0.vdi.lz",
"ufs1/dflybsd_3.6.1.vdi.lz", "ufs1/dflybsd_4.0.5.vdi.lz", "ufs1/freebsd_6.1.vdi.lz",
"ufs1/freebsd_7.0.vdi.lz", "ufs1/freebsd_8.2.vdi.lz", "ufs1/netbsd_1.6.vdi.lz", "ufs1/netbsd_7.1.vdi.lz",
"ufs1/solaris_7.vdi.lz", "ufs1/solaris_9.vdi.lz", "ufs2/freebsd_6.1.vdi.lz", "ufs2/freebsd_7.0.vdi.lz",
"ufs2/freebsd_8.2.vdi.lz", "ufs2/netbsd_7.1.vdi.lz"
"ufs1/linux.aif", "ufs2/linux.aif", "ffs43/darwin_1.3.1.aif", "ffs43/darwin_1.4.1.aif",
"ffs43/darwin_6.0.2.aif", "ffs43/darwin_8.0.1.aif", "ffs43/dflybsd_1.2.0.aif", "ffs43/dflybsd_3.6.1.aif",
"ffs43/dflybsd_4.0.5.aif", "ffs43/netbsd_1.6.aif", "ffs43/netbsd_7.1.aif", "ufs1/darwin_1.3.1.aif",
"ufs1/darwin_1.4.1.aif", "ufs1/darwin_6.0.2.aif", "ufs1/darwin_8.0.1.aif", "ufs1/dflybsd_1.2.0.aif",
"ufs1/dflybsd_3.6.1.aif", "ufs1/dflybsd_4.0.5.aif", "ufs1/freebsd_6.1.aif", "ufs1/freebsd_7.0.aif",
"ufs1/freebsd_8.2.aif", "ufs1/netbsd_1.6.aif", "ufs1/netbsd_7.1.aif", "ufs1/solaris_7.aif",
"ufs1/solaris_9.aif", "ufs2/freebsd_6.1.aif", "ufs2/freebsd_7.0.aif", "ufs2/freebsd_8.2.aif",
"ufs2/netbsd_7.1.aif"
};
readonly ulong[] sectors =
@@ -272,9 +270,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -314,8 +312,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"nextstep_3.3.vdi.lz", "openstep_4.0.vdi.lz", "openstep_4.2.vdi.lz", "rhapsody_dr1.vdi.lz",
"rhapsody_dr2.vdi.lz"
"nextstep_3.3.aif", "openstep_4.0.aif", "openstep_4.2.aif", "rhapsody_dr1.aif", "rhapsody_dr2.aif"
};
readonly ulong[] sectors =
@@ -361,9 +358,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (NeXT)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -446,7 +443,7 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (NeXT)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -482,7 +479,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amix.vdi.lz"
"amix.aif"
};
readonly ulong[] sectors =
@@ -528,9 +525,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -563,7 +560,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"solaris_7.vdi.lz"
"solaris_7.aif"
};
readonly ulong[] sectors =
@@ -609,9 +606,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (SunOS x86)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

12
Aaru.Tests/Filesystems/UNIXBFS.cs
View File

@@ -113,7 +113,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz"
"linux.aif"
};
readonly ulong[] sectors =
@@ -149,9 +149,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -183,7 +183,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"amix.vdi.lz"
"amix.aif"
};
readonly ulong[] sectors =
@@ -229,9 +229,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (RDB)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

8
Aaru.Tests/Filesystems/XENIX.cs
View File

@@ -93,7 +93,7 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -124,7 +124,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"xenix_2.3.2d.vdi.lz", "xenix_2.3.4h.vdi.lz", "scoopenserver_5.0.7hw.vdi.lz"
"xenix_2.3.2d.aif", "xenix_2.3.4h.aif", "scoopenserver_5.0.7hw.aif"
};
readonly ulong[] sectors =
@@ -170,9 +170,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem (MBR)",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/XFS.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "linux_4.19_xfs_flashdrive.vdi.lz"
"linux.aif", "linux_4.19_xfs_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -81,9 +81,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "XFS", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/Xia.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "linux-files.vdi.lz"
"linux.aif", "linux-files.aif"
};
readonly ulong[] sectors =
@@ -81,9 +81,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xia filesystem", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/ZFS.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"netbsd_7.1.vdi.lz"
"netbsd_7.1.aif"
};
readonly ulong[] sectors =
@@ -82,9 +82,9 @@ namespace Aaru.Tests.Filesystems
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Zettabyte File System",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

6
Aaru.Tests/Filesystems/btrfs.cs
View File

@@ -43,7 +43,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "linux_4.19_btrfs_flashdrive.vdi.lz"
"linux.aif", "linux_4.19_btrfs_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -82,9 +82,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "btrfs", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

19
Aaru.Tests/Filesystems/exFAT.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -81,9 +81,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (APM)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -116,7 +116,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"macosx_10.11.vdi.lz"
"macosx_10.11.aif"
};
readonly ulong[] sectors =
@@ -155,9 +155,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (GPT)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);
@@ -190,8 +190,7 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux.vdi.lz", "macosx_10.11.vdi.lz", "win10.vdi.lz", "winvista.vdi.lz",
"linux_4.19_exfat_flashdrive.vdi.lz"
"linux.aif", "macosx_10.11.aif", "win10.aif", "winvista.aif", "linux_4.19_exfat_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -230,9 +229,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (MBR)", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

9
Aaru.Tests/Filesystems/ext2.cs
View File

@@ -43,9 +43,8 @@ namespace Aaru.Tests.Filesystems
{
readonly string[] testfiles =
{
"linux_ext2.vdi.lz", "linux_ext3.vdi.lz", "linux_ext4.vdi.lz", "netbsd_7.1.vdi.lz", "netbsd_7.1_r0.vdi.lz",
"linux_4.19_ext2_flashdrive.vdi.lz", "linux_4.19_ext3_flashdrive.vdi.lz",
"linux_4.19_ext4_flashdrive.vdi.lz"
"linux_ext2.aif", "linux_ext3.aif", "linux_ext4.aif", "netbsd_7.1.aif", "netbsd_7.1_r0.aif",
"linux_4.19_ext2_flashdrive.aif", "linux_4.19_ext3_flashdrive.aif", "linux_4.19_ext4_flashdrive.aif"
};
readonly ulong[] sectors =
@@ -93,9 +92,9 @@ namespace Aaru.Tests.Filesystems
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "ext2", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

2
Aaru.Tests/Images/DART.cs
View File

@@ -75,7 +75,7 @@ namespace Aaru.Tests.Images
string location = Path.Combine(Consts.TestFilesRoot, "Media image formats", "DART", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new DiscImages.D88();
IMediaImage image = new DiscImages.Dart();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
Assert.AreEqual(sectors[i], image.Info.Sectors, testfiles[i]);
Assert.AreEqual(sectorsize[i], image.Info.SectorSize, testfiles[i]);

2
Aaru.Tests/Images/DiskCopy42.cs
View File

@@ -95,7 +95,7 @@ namespace Aaru.Tests.Images
string location = Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 4.2",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new DiscImages.DiskCopy42();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);

6
Aaru.Tests/Partitions/Acorn.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"linux_ics.vdi.lz"
"linux_ics.aif"
};
readonly Partition[][] wanted =
@@ -79,9 +79,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Acorn", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

15
Aaru.Tests/Partitions/AppleMap.cs
View File

@@ -41,12 +41,11 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"d2_driver.vdi.lz", "hdt_1.8_encrypted1.vdi.lz", "hdt_1.8_encrypted2.vdi.lz", "hdt_1.8_password.vdi.lz",
"hdt_1.8.vdi.lz", "linux.vdi.lz", "macos_1.1.vdi.lz", "macos_2.0.vdi.lz", "macos_4.2.vdi.lz",
"macos_4.3.vdi.lz", "macos_6.0.2.vdi.lz", "macos_6.0.3.vdi.lz", "macos_6.0.4.vdi.lz", "macos_6.0.5.vdi.lz",
"macos_6.0.7.vdi.lz", "macos_6.0.8.vdi.lz", "macos_6.0.vdi.lz", "macos_7.0.vdi.lz", "macos_7.1.1.vdi.lz",
"macos_7.5.vdi.lz", "parted.vdi.lz", "silverlining_2.2.1.vdi.lz", "speedtools_3.6.vdi.lz",
"vcpformatter_2.1.1.vdi.lz"
"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"
};
readonly Partition[][] wanted =
@@ -1022,9 +1021,9 @@ namespace Aaru.Tests.Partitions
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Apple Partition Map",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/Atari.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"linux_ahdi.vdi.lz", "linux_icd.vdi.lz", "tos_1.04.vdi.lz"
"linux_ahdi.aif", "linux_icd.aif", "tos_1.04.aif"
};
readonly Partition[][] wanted =
@@ -183,9 +183,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Atari ST", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/BSD.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"parted.vdi.lz", "netbsd_1.6.vdi.lz", "netbsd_6.1.5.vdi.lz", "netbsd_7.1.vdi.lz"
"parted.aif", "netbsd_1.6.aif", "netbsd_6.1.5.aif", "netbsd_7.1.aif"
};
readonly Partition[][] wanted =
@@ -228,9 +228,9 @@ namespace Aaru.Tests.Partitions
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "BSD slices",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/GPT.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"linux.vdi.lz", "parted.vdi.lz"
"linux.aif", "parted.aif"
};
readonly Partition[][] wanted =
@@ -111,9 +111,9 @@ namespace Aaru.Tests.Partitions
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "GUID Partition Table",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

19
Aaru.Tests/Partitions/MBR.cs
View File

@@ -41,14 +41,13 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"concurrentdos_6.0.vdi.lz", "darwin_1.4.1.vdi.lz", "darwin_6.0.2.vdi.lz", "darwin_8.0.1.vdi.lz",
"drdos_3.40.vdi.lz", "drdos_3.41.vdi.lz", "drdos_5.00.vdi.lz", "drdos_6.00.vdi.lz", "drdos_7.02.vdi.lz",
"drdos_7.03.vdi.lz", "drdos_8.0.vdi.lz", "linux.vdi.lz", "macosx_10.3.vdi.lz", "macosx_10.4.vdi.lz",
"msdos_3.30a.vdi.lz", "msdos_5.00.vdi.lz", "msdos_6.00.vdi.lz", "msdos_6.20.vdi.lz", "msdos_6.21.vdi.lz",
"msdos_6.22.vdi.lz", "multiuserdos_7.22r04.vdi.lz", "novelldos_7.00.vdi.lz", "opendos_7.01.vdi.lz",
"parted.vdi.lz", "pcdos_2000.vdi.lz", "pcdos_2.00.vdi.lz", "pcdos_2.10.vdi.lz", "pcdos_3.00.vdi.lz",
"pcdos_3.10.vdi.lz", "pcdos_3.30.vdi.lz", "pcdos_4.00.vdi.lz", "pcdos_5.00.vdi.lz", "pcdos_6.10.vdi.lz",
"win95.vdi.lz", "win96osr25.vdi.lz", "winnt_3.10.vdi.lz"
"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"
};
readonly Partition[][] wanted =
@@ -1217,9 +1216,9 @@ namespace Aaru.Tests.Partitions
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Master Boot Record",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/MINIX.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"minix_3.1.2a.vdi.lz"
"minix_3.1.2a.aif"
};
readonly Partition[][] wanted =
@@ -78,9 +78,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "MINIX", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/PC98.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"msdos330.thd.lz", "msdos330_alt.thd.lz", "msdos500_epson.thd.lz", "msdos500.thd.lz", "msdos620.thd.lz"
"msdos330.aif", "msdos330_alt.aif", "msdos500_epson.aif", "msdos500.aif", "msdos620.aif"
};
readonly Partition[][] wanted =
@@ -248,9 +248,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "PC-98", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new T98();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/RDB.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"amigaos_3.9.vdi.lz", "amigaos_4.0.vdi.lz", "parted.vdi.lz"
"amigaos_3.9.aif", "amigaos_4.0.aif", "parted.aif"
};
readonly Partition[][] wanted =
@@ -145,9 +145,9 @@ namespace Aaru.Tests.Partitions
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Rigid Disk Block",
testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/SGI.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"linux.vdi.lz", "parted.vdi.lz"
"linux.aif", "parted.aif"
};
readonly Partition[][] wanted =
@@ -153,9 +153,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "SGI", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/Sun.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"linux.vdi.lz", "parted.vdi.lz"
"linux.aif", "parted.aif"
};
readonly Partition[][] wanted =
@@ -114,9 +114,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Sun", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/VTOC.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"att_unix_vtoc.vdi.lz"
"att_unix_vtoc.aif"
};
readonly Partition[][] wanted =
@@ -138,9 +138,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "UNIX VTOC", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new Vdi();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);

6
Aaru.Tests/Partitions/Xbox.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Tests.Partitions
{
readonly string[] testfiles =
{
"microsoft256mb.img.lz"
"microsoft256mb.aif"
};
readonly Partition[][] wanted =
@@ -67,9 +67,9 @@ namespace Aaru.Tests.Partitions
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Xbox", testfiles[i]);
IFilter filter = new LZip();
IFilter filter = new ZZZNoFilter();
filter.Open(location);
IMediaImage image = new ZZZRawImage();
IMediaImage image = new AaruFormat();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
List<Partition> partitions = Core.Partitions.GetAll(image);
Assert.AreEqual(wanted[i].Length, partitions.Count, testfiles[i]);