diff --git a/Aaru.Tests/Filesystems/FATX.cs b/Aaru.Tests/Filesystems/FATX.cs index 0d4bbf438..118e71e98 100644 --- a/Aaru.Tests/Filesystems/FATX.cs +++ b/Aaru.Tests/Filesystems/FATX.cs @@ -169,19 +169,19 @@ namespace Aaru.Tests.Filesystems Assert.AreEqual(Errno.NoError, error); Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.AccessTimeUtc); Assert.AreEqual(FileAttributes.Directory, stat.Attributes); - Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc); + Assert.AreEqual(null, stat.BackupTimeUtc); Assert.AreEqual(1, stat.Blocks); Assert.AreEqual(16384, stat.BlockSize); Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.CreationTimeUtc); - Assert.AreEqual(0, stat.DeviceNo); - Assert.AreEqual(0, stat.GID); + Assert.AreEqual(null, stat.DeviceNo); + Assert.AreEqual(null, stat.GID); Assert.AreEqual(2, stat.Inode); Assert.AreEqual(new DateTime(2007, 3, 6, 15, 8, 44, DateTimeKind.Utc), stat.LastWriteTimeUtc); Assert.AreEqual(16384, stat.Length); Assert.AreEqual(1, stat.Links); - Assert.AreEqual(365, stat.Mode); - Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc); - Assert.AreEqual(0, stat.UID); + Assert.AreEqual(null, stat.Mode); + Assert.AreEqual(null, stat.StatusChangeTimeUtc); + Assert.AreEqual(null, stat.UID); error = fs.Stat("49470015/TitleImage", out stat); Assert.AreEqual(Errno.NoSuchFile, error); @@ -190,19 +190,19 @@ namespace Aaru.Tests.Filesystems Assert.AreEqual(Errno.NoError, error); Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.AccessTimeUtc); Assert.AreEqual(FileAttributes.None, stat.Attributes); - Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc); + Assert.AreEqual(null, stat.BackupTimeUtc); Assert.AreEqual(1, stat.Blocks); Assert.AreEqual(16384, stat.BlockSize); Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.CreationTimeUtc); - Assert.AreEqual(0, stat.DeviceNo); - Assert.AreEqual(0, stat.GID); + Assert.AreEqual(null, stat.DeviceNo); + Assert.AreEqual(null, stat.GID); Assert.AreEqual(3, stat.Inode); Assert.AreEqual(new DateTime(2013, 5, 14, 12, 50, 8, DateTimeKind.Utc), stat.LastWriteTimeUtc); Assert.AreEqual(10240, stat.Length); Assert.AreEqual(1, stat.Links); - Assert.AreEqual(292, stat.Mode); - Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc); - Assert.AreEqual(0, stat.UID); + Assert.AreEqual(null, stat.Mode); + Assert.AreEqual(null, stat.StatusChangeTimeUtc); + Assert.AreEqual(null, stat.UID); } [Test] @@ -370,19 +370,19 @@ namespace Aaru.Tests.Filesystems Assert.AreEqual(Errno.NoError, error); Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.AccessTimeUtc); Assert.AreEqual(FileAttributes.Directory, stat.Attributes); - Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc); + Assert.AreEqual(null, stat.BackupTimeUtc); Assert.AreEqual(1, stat.Blocks); Assert.AreEqual(16384, stat.BlockSize); Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.CreationTimeUtc); - Assert.AreEqual(0, stat.DeviceNo); - Assert.AreEqual(0, stat.GID); + Assert.AreEqual(null, stat.DeviceNo); + Assert.AreEqual(null, stat.GID); Assert.AreEqual(12, stat.Inode); Assert.AreEqual(new DateTime(2013, 9, 25, 12, 49, 46, DateTimeKind.Utc), stat.LastWriteTimeUtc); Assert.AreEqual(16384, stat.Length); Assert.AreEqual(1, stat.Links); - Assert.AreEqual(365, stat.Mode); - Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc); - Assert.AreEqual(0, stat.UID); + Assert.AreEqual(null, stat.Mode); + Assert.AreEqual(null, stat.StatusChangeTimeUtc); + Assert.AreEqual(null, stat.UID); error = fs.Stat("Content/0000000000000000/FFFE07DF/00040000/ContentCache", out stat); Assert.AreEqual(Errno.NoSuchFile, error); @@ -391,19 +391,19 @@ namespace Aaru.Tests.Filesystems Assert.AreEqual(Errno.NoError, error); Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.AccessTimeUtc); Assert.AreEqual(FileAttributes.None, stat.Attributes); - Assert.AreEqual(DateTime.MinValue, stat.BackupTimeUtc); + Assert.AreEqual(null, stat.BackupTimeUtc); Assert.AreEqual(6, stat.Blocks); Assert.AreEqual(16384, stat.BlockSize); Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.CreationTimeUtc); - Assert.AreEqual(0, stat.DeviceNo); - Assert.AreEqual(0, stat.GID); + Assert.AreEqual(null, stat.DeviceNo); + Assert.AreEqual(null, stat.GID); Assert.AreEqual(18, stat.Inode); Assert.AreEqual(new DateTime(2016, 11, 18, 20, 34, 48, DateTimeKind.Utc), stat.LastWriteTimeUtc); Assert.AreEqual(86016, stat.Length); Assert.AreEqual(1, stat.Links); - Assert.AreEqual(292, stat.Mode); - Assert.AreEqual(DateTime.MinValue, stat.StatusChangeTimeUtc); - Assert.AreEqual(0, stat.UID); + Assert.AreEqual(null, stat.Mode); + Assert.AreEqual(null, stat.StatusChangeTimeUtc); + Assert.AreEqual(null, stat.UID); } [Test] diff --git a/Aaru.Tests/Filesystems/HFSX.cs b/Aaru.Tests/Filesystems/HFSX.cs index 0a7bf960c..e52f7f07d 100644 --- a/Aaru.Tests/Filesystems/HFSX.cs +++ b/Aaru.Tests/Filesystems/HFSX.cs @@ -168,7 +168,7 @@ namespace Aaru.Tests.Filesystems for(int i = 0; i < testfiles.Length; i++) { string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (GPT)", testfiles[i]); - IFilter filter = new LZip(); + IFilter filter = new ZZZNoFilter(); filter.Open(location); IMediaImage image = new AaruFormat(); Assert.AreEqual(true, image.Open(filter), testfiles[i]); diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs index a0d65743e..2a564815e 100644 --- a/Aaru.Tests/Filesystems/ISO9660.cs +++ b/Aaru.Tests/Filesystems/ISO9660.cs @@ -148,7 +148,7 @@ namespace Aaru.Tests.Filesystems // 55, 56, 57, 58, // XorrISO - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70 + 3688, 3686, 3686, 3686, 3673, 3673, 3673, 3686, 3675, 3673, 3673, 3675 }; readonly uint[] sectorsize = @@ -202,7 +202,7 @@ namespace Aaru.Tests.Filesystems // 55, 56, 57, 58, // XorrISO - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70 + 3688, 3686, 3686, 3686, 3673, 3673, 3673, 3686, 3675, 3673, 3673, 3675 }; readonly int[] clustersize = @@ -261,8 +261,7 @@ namespace Aaru.Tests.Filesystems // "Root", "Root", "Root", "Root", // XorrISO - "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", - "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS", "DISK_UTILS" + "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test" }; readonly string[] volumeserial = @@ -326,14 +325,7 @@ namespace Aaru.Tests.Filesystems // "", "", "", "", // XorrISO - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", - "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002", "APPLE COMPUTER, INC., TYPE: 0002" + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; readonly string[] appid = @@ -421,18 +413,7 @@ namespace Aaru.Tests.Filesystems // "", "", "", "", // XorrISO - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY", - "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY" + "", "", "", "", "", "", "", "", "", "", "", "" }; [Test] diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs index e1143644a..801eeb355 100644 --- a/Aaru.Tests/Filesystems/MFS.cs +++ b/Aaru.Tests/Filesystems/MFS.cs @@ -89,7 +89,7 @@ namespace Aaru.Tests.Filesystems string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "Macintosh File System", testfiles[i]); - IFilter filter = new ZZZNoFilter(); + IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); Assert.AreEqual(true, image.Open(filter), testfiles[i]); diff --git a/Aaru.Tests/Filesystems/SysV.cs b/Aaru.Tests/Filesystems/SysV.cs index f4ccd2969..436896468 100644 --- a/Aaru.Tests/Filesystems/SysV.cs +++ b/Aaru.Tests/Filesystems/SysV.cs @@ -97,7 +97,7 @@ namespace Aaru.Tests.Filesystems string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem", testfiles[i]); - IFilter filter = new ZZZNoFilter(); + IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); Assert.AreEqual(true, image.Open(filter), testfiles[i]); diff --git a/Aaru.Tests/Filesystems/UFS.cs b/Aaru.Tests/Filesystems/UFS.cs index 331d73f46..c9b395b95 100644 --- a/Aaru.Tests/Filesystems/UFS.cs +++ b/Aaru.Tests/Filesystems/UFS.cs @@ -443,7 +443,7 @@ namespace Aaru.Tests.Filesystems string location = Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (NeXT)", testfiles[i]); - IFilter filter = new ZZZNoFilter(); + IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); Assert.AreEqual(true, image.Open(filter), testfiles[i]); diff --git a/Aaru.Tests/Filesystems/XENIX.cs b/Aaru.Tests/Filesystems/XENIX.cs index df75aade0..1e1a53a1f 100644 --- a/Aaru.Tests/Filesystems/XENIX.cs +++ b/Aaru.Tests/Filesystems/XENIX.cs @@ -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 ZZZNoFilter(); + IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new ZZZRawImage(); Assert.AreEqual(true, image.Open(filter), testfiles[i]); diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs index 9c4637a3d..a66499b09 100644 --- a/Aaru.Tests/Images/2MG.cs +++ b/Aaru.Tests/Images/2MG.cs @@ -46,7 +46,7 @@ namespace Aaru.Tests.Images readonly ulong[] sectors = { - 560, 415, 560, 560, 560, 2880 + 560, 455, 560, 560, 560, 2880 }; readonly uint[] sectorsize = @@ -62,8 +62,8 @@ namespace Aaru.Tests.Images readonly string[] md5S = { - "7db5d585270ab858043d50e60068d45f", "c62ee4dac8835f9acc999e7531d3b5f8", "86bc7879bb477917aab3976057a6a7b2", - "32b8f8163238d4f3ea2a3db95ad1a812", "a5acba4cbaddd9c53ea0e8210f4aba55", "eb9b60c78b30d2b6541ed0781944b6da" + "7db5d585270ab858043d50e60068d45f", "906c1bdbf76bf089ea47aae98151df5d", "91d020725d081500caa1fd8aad959397", + "91d020725d081500caa1fd8aad959397", "91d020725d081500caa1fd8aad959397", "eb9b60c78b30d2b6541ed0781944b6da" }; [Test] diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs index 4d2626a71..544a35f9d 100644 --- a/Aaru.Tests/Images/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy42.cs @@ -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 ZZZNoFilter(); + IFilter filter = new LZip(); filter.Open(location); IMediaImage image = new DiscImages.DiskCopy42(); Assert.AreEqual(true, image.Open(filter), testfiles[i]);