diff --git a/Aaru.Decryption b/Aaru.Decryption index 4ce6ff54c..9f529da3c 160000 --- a/Aaru.Decryption +++ b/Aaru.Decryption @@ -1 +1 @@ -Subproject commit 4ce6ff54c8b3c1c9c08339f60c181e4cabd7d770 +Subproject commit 9f529da3c6527de8363b55e21f99cd504c2f2e1b diff --git a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs index 40b43b1ab..e38de93e1 100644 --- a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs @@ -36,81 +36,63 @@ using JetBrains.Annotations; namespace Aaru.Gui.ViewModels.Panels; -public sealed class FileSystemViewModel +public sealed class FileSystemViewModel([NotNull] FileSystem metadata, string information) { - public FileSystemViewModel([NotNull] FileSystem metadata, string information) - { - TypeText = string.Format(Localization.Core.Filesystem_type_0, metadata.Type); - VolumeNameText = string.Format(Localization.Core.Volume_name_0, metadata.VolumeName); - SerialNumberText = string.Format(Localization.Core.Volume_serial_0, metadata.VolumeSerial); - - ApplicationIdentifierText = - string.Format(Localization.Core.Application_identifier_0, metadata.ApplicationIdentifier); - - SystemIdentifierText = string.Format(Localization.Core.System_identifier_0, metadata.SystemIdentifier); - - VolumeSetIdentifierText = - string.Format(Localization.Core.Volume_set_identifier_0, metadata.VolumeSetIdentifier); - - DataPreparerIdentifierText = - string.Format(Localization.Core.Data_preparer_identifier_0, metadata.DataPreparerIdentifier); - - PublisherIdentifierText = string.Format(Localization.Core.Publisher_identifier_0, metadata.PublisherIdentifier); - - CreationDateText = string.Format(Localization.Core.Volume_created_on_0, metadata.CreationDate); - EffectiveDateText = string.Format(Localization.Core.Volume_effective_from_0, metadata.EffectiveDate); - ModificationDateText = string.Format(Localization.Core.Volume_last_modified_on_0, metadata.ModificationDate); - ExpirationDateText = string.Format(Localization.Core.Volume_expired_on_0, metadata.ExpirationDate); - BackupDateText = string.Format(Localization.Core.Volume_last_backed_up_on_0, metadata.BackupDate); - - ClustersText = string.Format(Localization.Core.Volume_has_0_clusters_of_1_bytes_each_total_of_2_bytes, - metadata.Clusters, metadata.ClusterSize, metadata.Clusters * metadata.ClusterSize); - - FreeClustersText = string.Format(Localization.Core.Volume_has_0_clusters_free_1, metadata.FreeClusters, - metadata.FreeClusters / metadata.Clusters); - - FilesText = string.Format(Localization.Core.Volume_contains_0_files, metadata.Files); - BootableChecked = metadata.Bootable; - DirtyChecked = metadata.Dirty; - InformationText = information; - - CreationDateVisible = metadata.CreationDate != null; - EffectiveDateVisible = metadata.EffectiveDate != null; - ModificationDateVisible = metadata.ModificationDate != null; - ExpirationDateVisible = metadata.ExpirationDate != null; - BackupDateVisible = metadata.BackupDate != null; - FreeClustersVisible = metadata.FreeClusters != null; - FilesVisible = metadata.Files != null; - } - public string BootableLabel => Localization.Core.Filesystem_contains_boot_code; public string DirtyLabel => Localization.Core.Filesystem_has_not_been_unmounted_correctly_or_contains_errors; public string DetailsLabel => UI.Title_Details; - public string TypeText { get; } - public string VolumeNameText { get; } - public string SerialNumberText { get; } - public string ApplicationIdentifierText { get; } - public string SystemIdentifierText { get; } - public string VolumeSetIdentifierText { get; } - public string DataPreparerIdentifierText { get; } - public string PublisherIdentifierText { get; } - public string CreationDateText { get; } - public string EffectiveDateText { get; } - public string ModificationDateText { get; } - public string ExpirationDateText { get; } - public string BackupDateText { get; } - public string ClustersText { get; } - public string FreeClustersText { get; } - public string FilesText { get; } - public bool BootableChecked { get; } - public bool DirtyChecked { get; } - public string InformationText { get; } - public bool CreationDateVisible { get; } - public bool EffectiveDateVisible { get; } - public bool ModificationDateVisible { get; } - public bool ExpirationDateVisible { get; } - public bool BackupDateVisible { get; } - public bool FreeClustersVisible { get; } - public bool FilesVisible { get; } + public string TypeText { get; } = string.Format(Localization.Core.Filesystem_type_0, metadata.Type); + public string VolumeNameText { get; } = string.Format(Localization.Core.Volume_name_0, metadata.VolumeName); + public string SerialNumberText { get; } = string.Format(Localization.Core.Volume_serial_0, metadata.VolumeSerial); + + public string ApplicationIdentifierText { get; } = + string.Format(Localization.Core.Application_identifier_0, metadata.ApplicationIdentifier); + + public string SystemIdentifierText { get; } = + string.Format(Localization.Core.System_identifier_0, metadata.SystemIdentifier); + + public string VolumeSetIdentifierText { get; } = + string.Format(Localization.Core.Volume_set_identifier_0, metadata.VolumeSetIdentifier); + + public string DataPreparerIdentifierText { get; } = + string.Format(Localization.Core.Data_preparer_identifier_0, metadata.DataPreparerIdentifier); + + public string PublisherIdentifierText { get; } = + string.Format(Localization.Core.Publisher_identifier_0, metadata.PublisherIdentifier); + + public string CreationDateText { get; } = + string.Format(Localization.Core.Volume_created_on_0, metadata.CreationDate); + + public string EffectiveDateText { get; } = + string.Format(Localization.Core.Volume_effective_from_0, metadata.EffectiveDate); + + public string ModificationDateText { get; } = + string.Format(Localization.Core.Volume_last_modified_on_0, metadata.ModificationDate); + + public string ExpirationDateText { get; } = + string.Format(Localization.Core.Volume_expired_on_0, metadata.ExpirationDate); + + public string BackupDateText { get; } = + string.Format(Localization.Core.Volume_last_backed_up_on_0, metadata.BackupDate); + + public string ClustersText { get; } = string.Format( + Localization.Core.Volume_has_0_clusters_of_1_bytes_each_total_of_2_bytes, + metadata.Clusters, metadata.ClusterSize, metadata.Clusters * metadata.ClusterSize); + + public string FreeClustersText { get; } = string.Format(Localization.Core.Volume_has_0_clusters_free_1, + metadata.FreeClusters, + metadata.FreeClusters / metadata.Clusters); + + public string FilesText { get; } = string.Format(Localization.Core.Volume_contains_0_files, metadata.Files); + public bool BootableChecked { get; } = metadata.Bootable; + public bool DirtyChecked { get; } = metadata.Dirty; + public string InformationText { get; } = information; + public bool CreationDateVisible { get; } = metadata.CreationDate != null; + public bool EffectiveDateVisible { get; } = metadata.EffectiveDate != null; + public bool ModificationDateVisible { get; } = metadata.ModificationDate != null; + public bool ExpirationDateVisible { get; } = metadata.ExpirationDate != null; + public bool BackupDateVisible { get; } = metadata.BackupDate != null; + public bool FreeClustersVisible { get; } = metadata.FreeClusters != null; + public bool FilesVisible { get; } = metadata.Files != null; } \ No newline at end of file diff --git a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs index 532b44699..fb922030a 100644 --- a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs @@ -34,25 +34,18 @@ using Aaru.CommonTypes; namespace Aaru.Gui.ViewModels.Panels; -public sealed class PartitionViewModel +public sealed class PartitionViewModel(Partition partition) { - public PartitionViewModel(Partition partition) - { - NameText = string.Format(Localization.Core.Partition_name_0, partition.Name); - TypeText = string.Format(Localization.Core.Partition_type_0, partition.Type); - StartText = string.Format(Localization.Core.Partition_start_sector_0_byte_1, partition.Start, partition.Offset); + public string NameText { get; } = string.Format(Localization.Core.Partition_name_0, partition.Name); + public string TypeText { get; } = string.Format(Localization.Core.Partition_type_0, partition.Type); - LengthText = string.Format(Localization.Core.Partition_length_0_sectors_1_bytes, partition.Length, - partition.Size); + public string StartText { get; } = + string.Format(Localization.Core.Partition_start_sector_0_byte_1, partition.Start, partition.Offset); - DescriptionLabelText = Localization.Core.Title_Partition_description; - DescriptionText = partition.Description; - } + public string LengthText { get; } = string.Format(Localization.Core.Partition_length_0_sectors_1_bytes, + partition.Length, + partition.Size); - public string NameText { get; } - public string TypeText { get; } - public string StartText { get; } - public string LengthText { get; } - public string DescriptionLabelText { get; } - public string DescriptionText { get; } + public string DescriptionLabelText { get; } = Localization.Core.Title_Partition_description; + public string DescriptionText { get; } = partition.Description; } \ No newline at end of file diff --git a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs index c29183a26..bc091a1e7 100644 --- a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs @@ -50,14 +50,11 @@ using ReactiveUI; namespace Aaru.Gui.ViewModels.Windows; -public sealed class SplashWindowViewModel : ViewModelBase +public sealed class SplashWindowViewModel(SplashWindow view) : ViewModelBase { - readonly SplashWindow _view; - double _currentProgress; - double _maxProgress; - string _message; - - public SplashWindowViewModel(SplashWindow view) => _view = view; + double _currentProgress; + double _maxProgress; + string _message; public string Message { @@ -234,7 +231,7 @@ public sealed class SplashWindowViewModel : ViewModelBase var settingsDialog = new SettingsDialog(); var settingsDialogViewModel = new SettingsViewModel(settingsDialog, true); settingsDialog.DataContext = settingsDialogViewModel; - await settingsDialog.ShowDialog(_view); + await settingsDialog.ShowDialog(view); } LoadStatistics(); diff --git a/Aaru.Tests/Filesystems/ADFS.cs b/Aaru.Tests/Filesystems/ADFS.cs index 627cd8772..922096828 100644 --- a/Aaru.Tests/Filesystems/ADFS.cs +++ b/Aaru.Tests/Filesystems/ADFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Adfs : FilesystemTest +public class Adfs() : FilesystemTest("adfs") { - public Adfs() : base("adfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acorn Advanced Disc Filing System"); diff --git a/Aaru.Tests/Filesystems/AFFS/APM.cs b/Aaru.Tests/Filesystems/AFFS/APM.cs index 65e9b5b32..0760efb77 100644 --- a/Aaru.Tests/Filesystems/AFFS/APM.cs +++ b/Aaru.Tests/Filesystems/AFFS/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("affs") { - public APM() : base("affs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (APM)"); diff --git a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs index d68133498..e2a3d1b9e 100644 --- a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs @@ -37,10 +37,8 @@ namespace Aaru.Tests.Filesystems.AFFS; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class MBR_RDB : FilesystemTest +public class MBR_RDB() : FilesystemTest("affs") { - public MBR_RDB() : base("affs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR+RDB)"); diff --git a/Aaru.Tests/Filesystems/AFFS/MBR.cs b/Aaru.Tests/Filesystems/AFFS/MBR.cs index 7857ca344..84f2fb613 100644 --- a/Aaru.Tests/Filesystems/AFFS/MBR.cs +++ b/Aaru.Tests/Filesystems/AFFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("affs") { - public MBR() : base("affs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR)"); diff --git a/Aaru.Tests/Filesystems/AFFS/RDB.cs b/Aaru.Tests/Filesystems/AFFS/RDB.cs index 48e5084aa..f2f768b06 100644 --- a/Aaru.Tests/Filesystems/AFFS/RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("affs") { - public RDB() : base("affs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (RDB)"); diff --git a/Aaru.Tests/Filesystems/AFFS/Whole.cs b/Aaru.Tests/Filesystems/AFFS/Whole.cs index 22552a04f..061f78067 100644 --- a/Aaru.Tests/Filesystems/AFFS/Whole.cs +++ b/Aaru.Tests/Filesystems/AFFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("affs") { - public Whole() : base("affs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System"); public override IFilesystem Plugin => new AmigaDOSPlugin(); diff --git a/Aaru.Tests/Filesystems/AFFS2/APM.cs b/Aaru.Tests/Filesystems/AFFS2/APM.cs index b970ae5d2..5e3492e38 100644 --- a/Aaru.Tests/Filesystems/AFFS2/APM.cs +++ b/Aaru.Tests/Filesystems/AFFS2/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS2; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("affs2") { - public APM() : base("affs2") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System 2 (APM)"); diff --git a/Aaru.Tests/Filesystems/AFFS2/RDB.cs b/Aaru.Tests/Filesystems/AFFS2/RDB.cs index 1066f1ccf..e877f1cb3 100644 --- a/Aaru.Tests/Filesystems/AFFS2/RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS2/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFFS2; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("affs2") { - public RDB() : base("affs2") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System 2 (RDB)"); diff --git a/Aaru.Tests/Filesystems/AFS/MBR.cs b/Aaru.Tests/Filesystems/AFS/MBR.cs index ba0f8d3c0..e07376450 100644 --- a/Aaru.Tests/Filesystems/AFS/MBR.cs +++ b/Aaru.Tests/Filesystems/AFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("sysv_r4") { - public MBR() : base("sysv_r4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acer File System (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/AFS/Whole.cs b/Aaru.Tests/Filesystems/AFS/Whole.cs index 02b4637cd..45000c829 100644 --- a/Aaru.Tests/Filesystems/AFS/Whole.cs +++ b/Aaru.Tests/Filesystems/AFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("sysv_r4") { - public Whole() : base("sysv_r4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acer File System"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs index 5ed76bc0b..697edd058 100644 --- a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs @@ -37,10 +37,8 @@ namespace Aaru.Tests.Filesystems.AOFS; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class MBR_RDB : FilesystemTest +public class MBR_RDB() : FilesystemTest("aofs") { - public MBR_RDB() : base("aofs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR+RDB)"); diff --git a/Aaru.Tests/Filesystems/AOFS/MBR.cs b/Aaru.Tests/Filesystems/AOFS/MBR.cs index 4ea84e7c0..92c5f5857 100644 --- a/Aaru.Tests/Filesystems/AOFS/MBR.cs +++ b/Aaru.Tests/Filesystems/AOFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AOFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("aofs") { - public MBR() : base("aofs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR)"); diff --git a/Aaru.Tests/Filesystems/AOFS/RDB.cs b/Aaru.Tests/Filesystems/AOFS/RDB.cs index c30df6da4..6bde6f903 100644 --- a/Aaru.Tests/Filesystems/AOFS/RDB.cs +++ b/Aaru.Tests/Filesystems/AOFS/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AOFS; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("aofs") { - public RDB() : base("aofs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (RDB)"); diff --git a/Aaru.Tests/Filesystems/AOFS/Whole.cs b/Aaru.Tests/Filesystems/AOFS/Whole.cs index e24f5d589..bc45d1248 100644 --- a/Aaru.Tests/Filesystems/AOFS/Whole.cs +++ b/Aaru.Tests/Filesystems/AOFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.AOFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("aofs") { - public Whole() : base("aofs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System"); public override IFilesystem Plugin => new AmigaDOSPlugin(); diff --git a/Aaru.Tests/Filesystems/Atheos.cs b/Aaru.Tests/Filesystems/Atheos.cs index 59f5906be..b5f6fa9ab 100644 --- a/Aaru.Tests/Filesystems/Atheos.cs +++ b/Aaru.Tests/Filesystems/Atheos.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Atheos : FilesystemTest +public class Atheos() : FilesystemTest("atheos") { - public Atheos() : base("atheos") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "AtheOS (MBR)"); public override IFilesystem Plugin => new AtheOS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/BeFS/APM.cs b/Aaru.Tests/Filesystems/BeFS/APM.cs index e0544e396..f4955d6bc 100644 --- a/Aaru.Tests/Filesystems/BeFS/APM.cs +++ b/Aaru.Tests/Filesystems/BeFS/APM.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.BeFS; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("befs") { - public APM() : base("befs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (APM)"); public override IFilesystem Plugin => new Aaru.Filesystems.BeFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/BeFS/GPT.cs b/Aaru.Tests/Filesystems/BeFS/GPT.cs index 59807b644..2f6c9e789 100644 --- a/Aaru.Tests/Filesystems/BeFS/GPT.cs +++ b/Aaru.Tests/Filesystems/BeFS/GPT.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.BeFS; [TestFixture] -public class GPT : FilesystemTest +public class GPT() : FilesystemTest("befs") { - public GPT() : base("befs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (GPT)"); public override IFilesystem Plugin => new Aaru.Filesystems.BeFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/BeFS/MBR.cs b/Aaru.Tests/Filesystems/BeFS/MBR.cs index ad54c52e5..539c458ea 100644 --- a/Aaru.Tests/Filesystems/BeFS/MBR.cs +++ b/Aaru.Tests/Filesystems/BeFS/MBR.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.BeFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("befs") { - public MBR() : base("befs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (MBR)"); public override IFilesystem Plugin => new Aaru.Filesystems.BeFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/BeFS/Whole.cs b/Aaru.Tests/Filesystems/BeFS/Whole.cs index 6e768b2cf..022499869 100644 --- a/Aaru.Tests/Filesystems/BeFS/Whole.cs +++ b/Aaru.Tests/Filesystems/BeFS/Whole.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.BeFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("befs") { - public Whole() : base("befs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System"); public override IFilesystem Plugin => new Aaru.Filesystems.BeFS(); diff --git a/Aaru.Tests/Filesystems/COHERENT/MBR.cs b/Aaru.Tests/Filesystems/COHERENT/MBR.cs index 8f6f73aba..8116c3d98 100644 --- a/Aaru.Tests/Filesystems/COHERENT/MBR.cs +++ b/Aaru.Tests/Filesystems/COHERENT/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.COHERENT; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("coherent") { - public MBR() : base("coherent") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "COHERENT filesystem (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/COHERENT/Whole.cs b/Aaru.Tests/Filesystems/COHERENT/Whole.cs index 0f672f43d..3c206cdc2 100644 --- a/Aaru.Tests/Filesystems/COHERENT/Whole.cs +++ b/Aaru.Tests/Filesystems/COHERENT/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.COHERENT; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("coherent") { - public Whole() : base("coherent") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "COHERENT filesystem"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs index e1d9288d9..a25987c25 100644 --- a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs @@ -35,10 +35,8 @@ namespace Aaru.Tests.Filesystems.CPM; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class AMSDOS : FilesystemTest +public class AMSDOS() : FilesystemTest("cpmfs") { - public AMSDOS() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "AMSDOS"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs index 53066e215..5fe07b161 100644 --- a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs +++ b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class AmstradCPM : ReadOnlyFilesystemTest +public class AmstradCPM() : ReadOnlyFilesystemTest("cpmfs") { - public AmstradCPM() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Amstrad CPM"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs index f96fce992..5088e1497 100644 --- a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs +++ b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class AmstradCPMPlus : FilesystemTest +public class AmstradCPMPlus() : FilesystemTest("cpmfs") { - public AmstradCPMPlus() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Amstrad CPM+"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/Attache.cs b/Aaru.Tests/Filesystems/CPM/Attache.cs index d5d3c45ae..748b0f3c8 100644 --- a/Aaru.Tests/Filesystems/CPM/Attache.cs +++ b/Aaru.Tests/Filesystems/CPM/Attache.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class Attache : FilesystemTest +public class Attache() : FilesystemTest("cpmfs") { - public Attache() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Otrona Attaché"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/Bondwell.cs b/Aaru.Tests/Filesystems/CPM/Bondwell.cs index 2480e215f..c43389608 100644 --- a/Aaru.Tests/Filesystems/CPM/Bondwell.cs +++ b/Aaru.Tests/Filesystems/CPM/Bondwell.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class Bondwell : FilesystemTest +public class Bondwell() : FilesystemTest("cpmfs") { - public Bondwell() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Bondwell"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs index 1742246a8..d567aaf48 100644 --- a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs +++ b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class Excalibur64 : FilesystemTest +public class Excalibur64() : FilesystemTest("cpmfs") { - public Excalibur64() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Excalibur 64"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/KayproII.cs b/Aaru.Tests/Filesystems/CPM/KayproII.cs index 4c48f4d0b..f31ad3e2c 100644 --- a/Aaru.Tests/Filesystems/CPM/KayproII.cs +++ b/Aaru.Tests/Filesystems/CPM/KayproII.cs @@ -35,10 +35,8 @@ namespace Aaru.Tests.Filesystems.CPM; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class KayproII : ReadOnlyFilesystemTest +public class KayproII() : ReadOnlyFilesystemTest("cpmfs") { - public KayproII() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Kaypro II"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs index da5271ddd..505c70b0c 100644 --- a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class ParaDOS : FilesystemTest +public class ParaDOS() : FilesystemTest("cpmfs") { - public ParaDOS() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "ParaDOS"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs index c352edb57..e2158de43 100644 --- a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs +++ b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs @@ -35,10 +35,8 @@ namespace Aaru.Tests.Filesystems.CPM; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class Plus3DOS : FilesystemTest +public class Plus3DOS() : FilesystemTest("cpmfs") { - public Plus3DOS() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "+3DOS"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs index 5dc1dd2fb..8dc77415f 100644 --- a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs @@ -35,10 +35,8 @@ namespace Aaru.Tests.Filesystems.CPM; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class ROMDOS : FilesystemTest +public class ROMDOS() : FilesystemTest("cpmfs") { - public ROMDOS() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "ROMDOS"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs index 5a1634585..6278fac72 100644 --- a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs +++ b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class SharpPersonalCPM : ReadOnlyFilesystemTest +public class SharpPersonalCPM() : ReadOnlyFilesystemTest("cpmfs") { - public SharpPersonalCPM() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Sharp Personal CPM"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs index 5e2cc3591..555d8bca0 100644 --- a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs @@ -33,10 +33,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.CPM; [TestFixture] -public class XtalDOS : ReadOnlyFilesystemTest +public class XtalDOS() : ReadOnlyFilesystemTest("cpmfs") { - public XtalDOS() : base("cpmfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "XtalDOS"); public override IFilesystem Plugin => new Aaru.Filesystems.CPM(); diff --git a/Aaru.Tests/Filesystems/DTFS/MBR.cs b/Aaru.Tests/Filesystems/DTFS/MBR.cs index 0667daf5f..a1ef94269 100644 --- a/Aaru.Tests/Filesystems/DTFS/MBR.cs +++ b/Aaru.Tests/Filesystems/DTFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.DTFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("DTFS") { - public MBR() : base("DTFS") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "DTFS (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/DTFS/Whole.cs b/Aaru.Tests/Filesystems/DTFS/Whole.cs index e8086f133..82d24fe76 100644 --- a/Aaru.Tests/Filesystems/DTFS/Whole.cs +++ b/Aaru.Tests/Filesystems/DTFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.DTFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("DTFS") { - public Whole() : base("DTFS") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "DTFS"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/EAFS/MBR.cs b/Aaru.Tests/Filesystems/EAFS/MBR.cs index f68fcecd3..44ff5069a 100644 --- a/Aaru.Tests/Filesystems/EAFS/MBR.cs +++ b/Aaru.Tests/Filesystems/EAFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.EAFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("Extended Acer Fast Filesystem") { - public MBR() : base("Extended Acer Fast Filesystem") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "EAFS (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/EAFS/Whole.cs b/Aaru.Tests/Filesystems/EAFS/Whole.cs index 58bfcad5b..01de691ec 100644 --- a/Aaru.Tests/Filesystems/EAFS/Whole.cs +++ b/Aaru.Tests/Filesystems/EAFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.EAFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("Extended Acer Fast Filesystem") { - public Whole() : base("Extended Acer Fast Filesystem") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "EAFS"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/F2FS.cs b/Aaru.Tests/Filesystems/F2FS.cs index ee6cbe478..6c9e4c138 100644 --- a/Aaru.Tests/Filesystems/F2FS.cs +++ b/Aaru.Tests/Filesystems/F2FS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class F2Fs : FilesystemTest +public class F2Fs() : FilesystemTest("f2fs") { - public F2Fs() : base("f2fs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "F2FS"); public override IFilesystem Plugin => new F2FS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT12/APM.cs b/Aaru.Tests/Filesystems/FAT12/APM.cs index f676c1a1b..5de7c9eca 100644 --- a/Aaru.Tests/Filesystems/FAT12/APM.cs +++ b/Aaru.Tests/Filesystems/FAT12/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT12; [TestFixture] -public class APM : ReadOnlyFilesystemTest +public class APM() : ReadOnlyFilesystemTest("fat12") { - public APM() : base("fat12") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (APM)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT12/GPT.cs b/Aaru.Tests/Filesystems/FAT12/GPT.cs index 9b244a50d..aa205a058 100644 --- a/Aaru.Tests/Filesystems/FAT12/GPT.cs +++ b/Aaru.Tests/Filesystems/FAT12/GPT.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT12; [TestFixture] -public class GPT : ReadOnlyFilesystemTest +public class GPT() : ReadOnlyFilesystemTest("fat12") { - public GPT() : base("fat12") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (GPT)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT12/Human.cs b/Aaru.Tests/Filesystems/FAT12/Human.cs index 2e900958b..3f0d0c7f5 100644 --- a/Aaru.Tests/Filesystems/FAT12/Human.cs +++ b/Aaru.Tests/Filesystems/FAT12/Human.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT12; [TestFixture] -public class Human : ReadOnlyFilesystemTest +public class Human() : ReadOnlyFilesystemTest("fat12") { - public Human() : base("fat12") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (Human68K)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs index 7e1e8a190..d4875e163 100644 --- a/Aaru.Tests/Filesystems/FAT12/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT12; [TestFixture] -public class MBR : ReadOnlyFilesystemTest +public class MBR() : ReadOnlyFilesystemTest("fat12") { - public MBR() : base("fat12") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (MBR)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT12/Whole.cs b/Aaru.Tests/Filesystems/FAT12/Whole.cs index 7cadaffcd..f554fffb3 100644 --- a/Aaru.Tests/Filesystems/FAT12/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT12/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT12; [TestFixture] -public class Whole : ReadOnlyFilesystemTest +public class Whole() : ReadOnlyFilesystemTest("fat12") { - public Whole() : base("fat12") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12"); public override IFilesystem Plugin => new FAT(); diff --git a/Aaru.Tests/Filesystems/FAT16/APM.cs b/Aaru.Tests/Filesystems/FAT16/APM.cs index 5461e3bd2..08773e128 100644 --- a/Aaru.Tests/Filesystems/FAT16/APM.cs +++ b/Aaru.Tests/Filesystems/FAT16/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class APM : ReadOnlyFilesystemTest +public class APM() : ReadOnlyFilesystemTest("fat16") { - public APM() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (APM)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/Atari.cs b/Aaru.Tests/Filesystems/FAT16/Atari.cs index 355518dd5..ea17b91e7 100644 --- a/Aaru.Tests/Filesystems/FAT16/Atari.cs +++ b/Aaru.Tests/Filesystems/FAT16/Atari.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class Atari : ReadOnlyFilesystemTest +public class Atari() : ReadOnlyFilesystemTest("fat16") { - public Atari() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Atari)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/GPT.cs b/Aaru.Tests/Filesystems/FAT16/GPT.cs index 43c2482be..b6d904e62 100644 --- a/Aaru.Tests/Filesystems/FAT16/GPT.cs +++ b/Aaru.Tests/Filesystems/FAT16/GPT.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class GPT : ReadOnlyFilesystemTest +public class GPT() : ReadOnlyFilesystemTest("fat16") { - public GPT() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (GPT)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/Human.cs b/Aaru.Tests/Filesystems/FAT16/Human.cs index 03397389b..6bea7afcb 100644 --- a/Aaru.Tests/Filesystems/FAT16/Human.cs +++ b/Aaru.Tests/Filesystems/FAT16/Human.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class Human : ReadOnlyFilesystemTest +public class Human() : ReadOnlyFilesystemTest("fat16") { - public Human() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Human68K)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs index 43c66d970..86d4e9d9d 100644 --- a/Aaru.Tests/Filesystems/FAT16/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class MBR : ReadOnlyFilesystemTest +public class MBR() : ReadOnlyFilesystemTest("fat16") { - public MBR() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (MBR)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/RDB.cs b/Aaru.Tests/Filesystems/FAT16/RDB.cs index 951b1414d..1f11a7a8b 100644 --- a/Aaru.Tests/Filesystems/FAT16/RDB.cs +++ b/Aaru.Tests/Filesystems/FAT16/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class RDB : ReadOnlyFilesystemTest +public class RDB() : ReadOnlyFilesystemTest("fat16") { - public RDB() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (RDB)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT16/Whole.cs b/Aaru.Tests/Filesystems/FAT16/Whole.cs index 50ae0171b..ba48bc378 100644 --- a/Aaru.Tests/Filesystems/FAT16/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT16/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT16; [TestFixture] -public class Whole : ReadOnlyFilesystemTest +public class Whole() : ReadOnlyFilesystemTest("fat16") { - public Whole() : base("fat16") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16"); public override IFilesystem Plugin => new FAT(); diff --git a/Aaru.Tests/Filesystems/FAT32/APM.cs b/Aaru.Tests/Filesystems/FAT32/APM.cs index f94f41373..965586aaa 100644 --- a/Aaru.Tests/Filesystems/FAT32/APM.cs +++ b/Aaru.Tests/Filesystems/FAT32/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT32; [TestFixture] -public class APM : ReadOnlyFilesystemTest +public class APM() : ReadOnlyFilesystemTest("fat32") { - public APM() : base("fat32") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (APM)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT32/GPT.cs b/Aaru.Tests/Filesystems/FAT32/GPT.cs index a60847a2c..bac71d40a 100644 --- a/Aaru.Tests/Filesystems/FAT32/GPT.cs +++ b/Aaru.Tests/Filesystems/FAT32/GPT.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT32; [TestFixture] -public class GPT : ReadOnlyFilesystemTest +public class GPT() : ReadOnlyFilesystemTest("fat32") { - public GPT() : base("fat32") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (GPT)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs index 2b7a5a01a..5205f1793 100644 --- a/Aaru.Tests/Filesystems/FAT32/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT32; [TestFixture] -public class MBR : ReadOnlyFilesystemTest +public class MBR() : ReadOnlyFilesystemTest("fat32") { - public MBR() : base("fat32") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (MBR)"); public override IFilesystem Plugin => new FAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/FAT32/Whole.cs b/Aaru.Tests/Filesystems/FAT32/Whole.cs index 21bc4538e..22516c857 100644 --- a/Aaru.Tests/Filesystems/FAT32/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT32/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FAT32; [TestFixture] -public class Whole : ReadOnlyFilesystemTest +public class Whole() : ReadOnlyFilesystemTest("fat32") { - public Whole() : base("fat32") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32"); public override IFilesystem Plugin => new FAT(); diff --git a/Aaru.Tests/Filesystems/FATX/Xbox.cs b/Aaru.Tests/Filesystems/FATX/Xbox.cs index d133a6c6e..05a0b96c1 100644 --- a/Aaru.Tests/Filesystems/FATX/Xbox.cs +++ b/Aaru.Tests/Filesystems/FATX/Xbox.cs @@ -37,10 +37,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FATX; [TestFixture] -public class Xbox : ReadOnlyFilesystemTest +public class Xbox() : ReadOnlyFilesystemTest("fatx") { - public Xbox() : base("fatx") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xbox FAT16", "le"); public override IFilesystem Plugin => new XboxFatPlugin(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/FATX/Xbox360.cs b/Aaru.Tests/Filesystems/FATX/Xbox360.cs index d345f2adc..8b5c8dc79 100644 --- a/Aaru.Tests/Filesystems/FATX/Xbox360.cs +++ b/Aaru.Tests/Filesystems/FATX/Xbox360.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.FATX; [TestFixture] -public class Xbox360 : ReadOnlyFilesystemTest +public class Xbox360() : ReadOnlyFilesystemTest("fatx") { - public Xbox360() : base("fatx") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xbox FAT16", "be"); public override IFilesystem Plugin => new XboxFatPlugin(); diff --git a/Aaru.Tests/Filesystems/FilesystemTest.cs b/Aaru.Tests/Filesystems/FilesystemTest.cs index a4e6a58c4..82effd4c5 100644 --- a/Aaru.Tests/Filesystems/FilesystemTest.cs +++ b/Aaru.Tests/Filesystems/FilesystemTest.cs @@ -11,13 +11,9 @@ using Partition = Aaru.CommonTypes.Partition; namespace Aaru.Tests.Filesystems; -public abstract class FilesystemTest +public abstract class FilesystemTest(string fileSystemType) { - readonly string _fileSystemType; - - protected FilesystemTest() => _fileSystemType = null; - - protected FilesystemTest(string fileSystemType) => _fileSystemType = fileSystemType; + protected FilesystemTest() : this(null) {} public abstract string DataFolder { get; } public abstract IFilesystem Plugin { get; } @@ -250,7 +246,7 @@ public abstract class FilesystemTest string.Format(Localization.System_ID_0, testFile)); } - Assert.AreEqual(_fileSystemType ?? test.Type, fsMetadata.Type, + Assert.AreEqual(fileSystemType ?? test.Type, fsMetadata.Type, string.Format(Localization.Filesystem_type_0, testFile)); Assert.AreEqual(test.VolumeName, fsMetadata.VolumeName, diff --git a/Aaru.Tests/Filesystems/HAMMER.cs b/Aaru.Tests/Filesystems/HAMMER.cs index bd942580d..7c7746bc3 100644 --- a/Aaru.Tests/Filesystems/HAMMER.cs +++ b/Aaru.Tests/Filesystems/HAMMER.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Hammer : FilesystemTest +public class Hammer() : FilesystemTest("hammer") { - public Hammer() : base("hammer") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "HAMMER (MBR)"); public override IFilesystem Plugin => new HAMMER(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS+/APM.cs b/Aaru.Tests/Filesystems/HFS+/APM.cs index a6b57a8f0..71b9d54ec 100644 --- a/Aaru.Tests/Filesystems/HFS+/APM.cs +++ b/Aaru.Tests/Filesystems/HFS+/APM.cs @@ -37,10 +37,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSPlus; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("hfsplus") { - public APM() : base("hfsplus") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (APM)"); public override IFilesystem Plugin => new AppleHFSPlus(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS+/GPT.cs b/Aaru.Tests/Filesystems/HFS+/GPT.cs index b3059fdd6..c42b299ee 100644 --- a/Aaru.Tests/Filesystems/HFS+/GPT.cs +++ b/Aaru.Tests/Filesystems/HFS+/GPT.cs @@ -37,10 +37,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSPlus; [TestFixture] -public class GPT : FilesystemTest +public class GPT() : FilesystemTest("hfsplus") { - public GPT() : base("hfsplus") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (GPT)"); public override IFilesystem Plugin => new AppleHFSPlus(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS+/MBR.cs b/Aaru.Tests/Filesystems/HFS+/MBR.cs index 5138b7ce5..8dd2c2baf 100644 --- a/Aaru.Tests/Filesystems/HFS+/MBR.cs +++ b/Aaru.Tests/Filesystems/HFS+/MBR.cs @@ -37,10 +37,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSPlus; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("hfsplus") { - public MBR() : base("hfsplus") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (MBR)"); public override IFilesystem Plugin => new AppleHFSPlus(); diff --git a/Aaru.Tests/Filesystems/HFS/APM.cs b/Aaru.Tests/Filesystems/HFS/APM.cs index af6bb6dfd..d7293ae38 100644 --- a/Aaru.Tests/Filesystems/HFS/APM.cs +++ b/Aaru.Tests/Filesystems/HFS/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFS; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("hfs") { - public APM() : base("hfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (APM)"); public override IFilesystem Plugin => new AppleHFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS/MBR.cs b/Aaru.Tests/Filesystems/HFS/MBR.cs index 45fcc02ff..c878d62a1 100644 --- a/Aaru.Tests/Filesystems/HFS/MBR.cs +++ b/Aaru.Tests/Filesystems/HFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("hfs") { - public MBR() : base("hfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (MBR)"); public override IFilesystem Plugin => new AppleHFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS/Optical.cs b/Aaru.Tests/Filesystems/HFS/Optical.cs index d60bc958c..bddb22a41 100644 --- a/Aaru.Tests/Filesystems/HFS/Optical.cs +++ b/Aaru.Tests/Filesystems/HFS/Optical.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFS; [TestFixture] -public class Optical : FilesystemTest +public class Optical() : FilesystemTest("hfs") { - public Optical() : base("hfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (CD-ROM)"); public override IFilesystem Plugin => new AppleHFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS/RDB.cs b/Aaru.Tests/Filesystems/HFS/RDB.cs index 3a8c0778c..7336c40fb 100644 --- a/Aaru.Tests/Filesystems/HFS/RDB.cs +++ b/Aaru.Tests/Filesystems/HFS/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFS; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("hfs") { - public RDB() : base("hfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (RDB)"); public override IFilesystem Plugin => new AppleHFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFS/Whole.cs b/Aaru.Tests/Filesystems/HFS/Whole.cs index b6429e0f2..5f3ca16d0 100644 --- a/Aaru.Tests/Filesystems/HFS/Whole.cs +++ b/Aaru.Tests/Filesystems/HFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("hfs") { - public Whole() : base("hfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS"); public override IFilesystem Plugin => new AppleHFS(); diff --git a/Aaru.Tests/Filesystems/HFSX/APM.cs b/Aaru.Tests/Filesystems/HFSX/APM.cs index e3436c9d1..995d33411 100644 --- a/Aaru.Tests/Filesystems/HFSX/APM.cs +++ b/Aaru.Tests/Filesystems/HFSX/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSX; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("hfsx") { - public APM() : base("hfsx") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (APM)"); public override IFilesystem Plugin => new AppleHFSPlus(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFSX/GPT.cs b/Aaru.Tests/Filesystems/HFSX/GPT.cs index b8bc9088b..9a0f19343 100644 --- a/Aaru.Tests/Filesystems/HFSX/GPT.cs +++ b/Aaru.Tests/Filesystems/HFSX/GPT.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSX; [TestFixture] -public class GPT : FilesystemTest +public class GPT() : FilesystemTest("hfsx") { - public GPT() : base("hfsx") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (GPT)"); public override IFilesystem Plugin => new AppleHFSPlus(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HFSX/MBR.cs b/Aaru.Tests/Filesystems/HFSX/MBR.cs index 64303d928..6f9782d83 100644 --- a/Aaru.Tests/Filesystems/HFSX/MBR.cs +++ b/Aaru.Tests/Filesystems/HFSX/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HFSX; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("hfsx") { - public MBR() : base("hfsx") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (MBR)"); public override IFilesystem Plugin => new AppleHFSPlus(); diff --git a/Aaru.Tests/Filesystems/HPFS.cs b/Aaru.Tests/Filesystems/HPFS.cs index 739004a87..e1085ad50 100644 --- a/Aaru.Tests/Filesystems/HPFS.cs +++ b/Aaru.Tests/Filesystems/HPFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Hpfs : FilesystemTest +public class Hpfs() : FilesystemTest("hpfs") { - public Hpfs() : base("hpfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Performance File System"); diff --git a/Aaru.Tests/Filesystems/HPOFS.cs b/Aaru.Tests/Filesystems/HPOFS.cs index f331f59f6..2d6e3b330 100644 --- a/Aaru.Tests/Filesystems/HPOFS.cs +++ b/Aaru.Tests/Filesystems/HPOFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Hpofs : FilesystemTest +public class Hpofs() : FilesystemTest("hpofs") { - public Hpofs() : base("hpofs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Performance Optical File System"); diff --git a/Aaru.Tests/Filesystems/HTFS/MBR.cs b/Aaru.Tests/Filesystems/HTFS/MBR.cs index 37ed64023..7791050ac 100644 --- a/Aaru.Tests/Filesystems/HTFS/MBR.cs +++ b/Aaru.Tests/Filesystems/HTFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HTFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("HTFS") { - public MBR() : base("HTFS") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughput File System (MBR)"); diff --git a/Aaru.Tests/Filesystems/HTFS/Whole.cs b/Aaru.Tests/Filesystems/HTFS/Whole.cs index ba11e1f7d..8daaddb41 100644 --- a/Aaru.Tests/Filesystems/HTFS/Whole.cs +++ b/Aaru.Tests/Filesystems/HTFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.HTFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("HTFS") { - public Whole() : base("HTFS") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughput File System"); diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs index 1ebeeb2fb..11464123b 100644 --- a/Aaru.Tests/Filesystems/ISO9660.cs +++ b/Aaru.Tests/Filesystems/ISO9660.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Iso9660 : ReadOnlyFilesystemTest +public class Iso9660() : ReadOnlyFilesystemTest("iso9660") { - public Iso9660() : base("iso9660") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "ISO9660"); public override IFilesystem Plugin => new ISO9660(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/JFS2.cs b/Aaru.Tests/Filesystems/JFS2.cs index d2555fd4e..a81328f23 100644 --- a/Aaru.Tests/Filesystems/JFS2.cs +++ b/Aaru.Tests/Filesystems/JFS2.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Jfs2 : FilesystemTest +public class Jfs2() : FilesystemTest("jfs") { - public Jfs2() : base("jfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "JFS2"); public override IFilesystem Plugin => new JFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/LisaFS.cs b/Aaru.Tests/Filesystems/LisaFS.cs index 2bf24d5e1..dff82d785 100644 --- a/Aaru.Tests/Filesystems/LisaFS.cs +++ b/Aaru.Tests/Filesystems/LisaFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class LisaFs : ReadOnlyFilesystemTest +public class LisaFs() : ReadOnlyFilesystemTest("lisafs") { - public LisaFs() : base("lisafs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple Lisa filesystem"); public override IFilesystem Plugin => new LisaFS(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/Locus.cs b/Aaru.Tests/Filesystems/Locus.cs index 2f5f90d4c..3f54af8c0 100644 --- a/Aaru.Tests/Filesystems/Locus.cs +++ b/Aaru.Tests/Filesystems/Locus.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Locus : FilesystemTest +public class Locus() : FilesystemTest("locus") { - public Locus() : base("locus") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Locus filesystem"); public override IFilesystem Plugin => new Aaru.Filesystems.Locus(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs index ea645a5f2..3386f65ad 100644 --- a/Aaru.Tests/Filesystems/MFS.cs +++ b/Aaru.Tests/Filesystems/MFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Mfs : ReadOnlyFilesystemTest +public class Mfs() : ReadOnlyFilesystemTest("mfs") { - public Mfs() : base("mfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Macintosh File System"); public override IFilesystem Plugin => new AppleMFS(); public override bool Partitions => false; diff --git a/Aaru.Tests/Filesystems/NILFS2.cs b/Aaru.Tests/Filesystems/NILFS2.cs index 9c2c7e04b..432ab8a48 100644 --- a/Aaru.Tests/Filesystems/NILFS2.cs +++ b/Aaru.Tests/Filesystems/NILFS2.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Nilfs2 : FilesystemTest +public class Nilfs2() : FilesystemTest("nilfs2") { - public Nilfs2() : base("nilfs2") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Implementation of a Log-structured File System 2"); diff --git a/Aaru.Tests/Filesystems/NTFS/GPT.cs b/Aaru.Tests/Filesystems/NTFS/GPT.cs index 4e0924aea..0969972e4 100644 --- a/Aaru.Tests/Filesystems/NTFS/GPT.cs +++ b/Aaru.Tests/Filesystems/NTFS/GPT.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.NTFS; [TestFixture] -public class GPT : FilesystemTest +public class GPT() : FilesystemTest("ntfs") { - public GPT() : base("ntfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (GPT)"); diff --git a/Aaru.Tests/Filesystems/NTFS/MBR.cs b/Aaru.Tests/Filesystems/NTFS/MBR.cs index 9007cb74d..37659e269 100644 --- a/Aaru.Tests/Filesystems/NTFS/MBR.cs +++ b/Aaru.Tests/Filesystems/NTFS/MBR.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.NTFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("ntfs") { - public MBR() : base("ntfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (MBR)"); diff --git a/Aaru.Tests/Filesystems/PFS3/APM.cs b/Aaru.Tests/Filesystems/PFS3/APM.cs index 4a5b363d6..520452b2e 100644 --- a/Aaru.Tests/Filesystems/PFS3/APM.cs +++ b/Aaru.Tests/Filesystems/PFS3/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.PFS3; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("pfs") { - public APM() : base("pfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Professional File System 3 (APM)"); diff --git a/Aaru.Tests/Filesystems/PFS3/RDB.cs b/Aaru.Tests/Filesystems/PFS3/RDB.cs index 822ad84fd..057f8ed4c 100644 --- a/Aaru.Tests/Filesystems/PFS3/RDB.cs +++ b/Aaru.Tests/Filesystems/PFS3/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.PFS3; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("pfs") { - public RDB() : base("pfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Professional File System 3 (RDB)"); diff --git a/Aaru.Tests/Filesystems/ProDOS/APM.cs b/Aaru.Tests/Filesystems/ProDOS/APM.cs index 422781758..a06c6f204 100644 --- a/Aaru.Tests/Filesystems/ProDOS/APM.cs +++ b/Aaru.Tests/Filesystems/ProDOS/APM.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.ProDOS; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("prodos") { - public APM() : base("prodos") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "ProDOS filesystem (APM)"); public override IFilesystem Plugin => new ProDOSPlugin(); diff --git a/Aaru.Tests/Filesystems/QNX4/MBR.cs b/Aaru.Tests/Filesystems/QNX4/MBR.cs index 9e63d4230..0b64aa5cb 100644 --- a/Aaru.Tests/Filesystems/QNX4/MBR.cs +++ b/Aaru.Tests/Filesystems/QNX4/MBR.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.QNX4; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("qnx4") { - public MBR() : base("qnx4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "QNX 4 filesystem (MBR)"); public override IFilesystem Plugin => new Aaru.Filesystems.QNX4(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/QNX4/Whole.cs b/Aaru.Tests/Filesystems/QNX4/Whole.cs index 611185462..be1a55468 100644 --- a/Aaru.Tests/Filesystems/QNX4/Whole.cs +++ b/Aaru.Tests/Filesystems/QNX4/Whole.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.QNX4; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("qnx4") { - public Whole() : base("qnx4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "QNX 4 filesystem"); public override IFilesystem Plugin => new Aaru.Filesystems.QNX4(); diff --git a/Aaru.Tests/Filesystems/ReFS.cs b/Aaru.Tests/Filesystems/ReFS.cs index 8d9445bdd..77a92a5f5 100644 --- a/Aaru.Tests/Filesystems/ReFS.cs +++ b/Aaru.Tests/Filesystems/ReFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class ReFsMbr : FilesystemTest +public class ReFsMbr() : FilesystemTest("refs") { - public ReFsMbr() : base("refs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Resilient File System (MBR)"); diff --git a/Aaru.Tests/Filesystems/Reiser3.cs b/Aaru.Tests/Filesystems/Reiser3.cs index b8df91515..6e7466d27 100644 --- a/Aaru.Tests/Filesystems/Reiser3.cs +++ b/Aaru.Tests/Filesystems/Reiser3.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Reiser3 : FilesystemTest +public class Reiser3() : FilesystemTest("reiserfs") { - public Reiser3() : base("reiserfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v3"); public override IFilesystem Plugin => new Reiser(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/Reiser4.cs b/Aaru.Tests/Filesystems/Reiser4.cs index eed797b7b..705063052 100644 --- a/Aaru.Tests/Filesystems/Reiser4.cs +++ b/Aaru.Tests/Filesystems/Reiser4.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Reiser4 : FilesystemTest +public class Reiser4() : FilesystemTest("reiser4") { - public Reiser4() : base("reiser4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v4"); public override IFilesystem Plugin => new Aaru.Filesystems.Reiser4(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/SFS/APM.cs b/Aaru.Tests/Filesystems/SFS/APM.cs index b6519c94a..760a7af50 100644 --- a/Aaru.Tests/Filesystems/SFS/APM.cs +++ b/Aaru.Tests/Filesystems/SFS/APM.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SFS; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("sfs") { - public APM() : base("sfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (APM)"); public override IFilesystem Plugin => new Aaru.Filesystems.SFS(); diff --git a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs index 717c73726..2d8de3ec0 100644 --- a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs @@ -36,10 +36,8 @@ namespace Aaru.Tests.Filesystems.SFS; [TestFixture] [SuppressMessage("ReSharper", "InconsistentNaming")] -public class MBR_RDB : FilesystemTest +public class MBR_RDB() : FilesystemTest("sfs") { - public MBR_RDB() : base("sfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR+RDB)"); diff --git a/Aaru.Tests/Filesystems/SFS/MBR.cs b/Aaru.Tests/Filesystems/SFS/MBR.cs index d781f5471..01c5fc273 100644 --- a/Aaru.Tests/Filesystems/SFS/MBR.cs +++ b/Aaru.Tests/Filesystems/SFS/MBR.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("sfs") { - public MBR() : base("sfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR)"); public override IFilesystem Plugin => new Aaru.Filesystems.SFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/SFS/RDB.cs b/Aaru.Tests/Filesystems/SFS/RDB.cs index bfb45282b..e6f735cd8 100644 --- a/Aaru.Tests/Filesystems/SFS/RDB.cs +++ b/Aaru.Tests/Filesystems/SFS/RDB.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SFS; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("sfs") { - public RDB() : base("sfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (RDB)"); public override IFilesystem Plugin => new Aaru.Filesystems.SFS(); diff --git a/Aaru.Tests/Filesystems/SysV/MBR.cs b/Aaru.Tests/Filesystems/SysV/MBR.cs index 3a74d48dc..fcf4c36a1 100644 --- a/Aaru.Tests/Filesystems/SysV/MBR.cs +++ b/Aaru.Tests/Filesystems/SysV/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SysV; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("sysv_r4") { - public MBR() : base("sysv_r4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/SysV/RDB.cs b/Aaru.Tests/Filesystems/SysV/RDB.cs index 743774f99..56ab3e8ea 100644 --- a/Aaru.Tests/Filesystems/SysV/RDB.cs +++ b/Aaru.Tests/Filesystems/SysV/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SysV; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("sysv_r4") { - public RDB() : base("sysv_r4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (RDB)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/SysV/Whole.cs b/Aaru.Tests/Filesystems/SysV/Whole.cs index 3b99f6ffa..240dc2e56 100644 --- a/Aaru.Tests/Filesystems/SysV/Whole.cs +++ b/Aaru.Tests/Filesystems/SysV/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.SysV; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("sysv_r4") { - public Whole() : base("sysv_r4") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs index d60b2db3e..60e8a8216 100644 --- a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs +++ b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.UNIXBFS; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("bfs") { - public MBR() : base("bfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (MBR)"); public override IFilesystem Plugin => new BFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs index 0b92462ef..8305404f5 100644 --- a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs +++ b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.UNIXBFS; [TestFixture] -public class RDB : FilesystemTest +public class RDB() : FilesystemTest("ufs") { - public RDB() : base("ufs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (RDB)"); public override IFilesystem Plugin => new BFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs index 91bd02a37..5641fc9c6 100644 --- a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs +++ b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.UNIXBFS; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("bfs") { - public Whole() : base("bfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System"); public override IFilesystem Plugin => new BFS(); diff --git a/Aaru.Tests/Filesystems/XENIX/MBR.cs b/Aaru.Tests/Filesystems/XENIX/MBR.cs index cee0ca09a..252998010 100644 --- a/Aaru.Tests/Filesystems/XENIX/MBR.cs +++ b/Aaru.Tests/Filesystems/XENIX/MBR.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.XENIX; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("xenixfs") { - public MBR() : base("xenixfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/XENIX/Whole.cs b/Aaru.Tests/Filesystems/XENIX/Whole.cs index 56f29c950..3d15e1c49 100644 --- a/Aaru.Tests/Filesystems/XENIX/Whole.cs +++ b/Aaru.Tests/Filesystems/XENIX/Whole.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.XENIX; [TestFixture] -public class Whole : FilesystemTest +public class Whole() : FilesystemTest("xenixfs") { - public Whole() : base("xenixfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem"); public override IFilesystem Plugin => new SysVfs(); diff --git a/Aaru.Tests/Filesystems/XFS.cs b/Aaru.Tests/Filesystems/XFS.cs index 75966991c..2e6d03da9 100644 --- a/Aaru.Tests/Filesystems/XFS.cs +++ b/Aaru.Tests/Filesystems/XFS.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class XFS : FilesystemTest +public class XFS() : FilesystemTest("xfs") { - public XFS() : base("xfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "XFS"); public override IFilesystem Plugin => new Aaru.Filesystems.XFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/Xia.cs b/Aaru.Tests/Filesystems/Xia.cs index f3def69f6..31019ea40 100644 --- a/Aaru.Tests/Filesystems/Xia.cs +++ b/Aaru.Tests/Filesystems/Xia.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Xia : FilesystemTest +public class Xia() : FilesystemTest("xia") { - public Xia() : base("xia") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xia filesystem"); public override IFilesystem Plugin => new Aaru.Filesystems.Xia(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/ZFS.cs b/Aaru.Tests/Filesystems/ZFS.cs index b5daddb8a..1c1bf493b 100644 --- a/Aaru.Tests/Filesystems/ZFS.cs +++ b/Aaru.Tests/Filesystems/ZFS.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Zfs : FilesystemTest +public class Zfs() : FilesystemTest("zfs") { - public Zfs() : base("zfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Zettabyte File System"); public override IFilesystem Plugin => new ZFS(); diff --git a/Aaru.Tests/Filesystems/btrfs.cs b/Aaru.Tests/Filesystems/btrfs.cs index cc3df6d1c..55987fda0 100644 --- a/Aaru.Tests/Filesystems/btrfs.cs +++ b/Aaru.Tests/Filesystems/btrfs.cs @@ -35,10 +35,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Btrfs : FilesystemTest +public class Btrfs() : FilesystemTest("btrfs") { - public Btrfs() : base("btrfs") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "btrfs"); public override IFilesystem Plugin => new BTRFS(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/exFAT/APM.cs b/Aaru.Tests/Filesystems/exFAT/APM.cs index 7499d2fe3..da541648d 100644 --- a/Aaru.Tests/Filesystems/exFAT/APM.cs +++ b/Aaru.Tests/Filesystems/exFAT/APM.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.exFAT; [TestFixture] -public class APM : FilesystemTest +public class APM() : FilesystemTest("exfat") { - public APM() : base("exfat") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (APM)"); public override IFilesystem Plugin => new Aaru.Filesystems.exFAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/exFAT/GPT.cs b/Aaru.Tests/Filesystems/exFAT/GPT.cs index 4c10364a0..f0bf59717 100644 --- a/Aaru.Tests/Filesystems/exFAT/GPT.cs +++ b/Aaru.Tests/Filesystems/exFAT/GPT.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.exFAT; [TestFixture] -public class GPT : FilesystemTest +public class GPT() : FilesystemTest("exfat") { - public GPT() : base("exfat") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (GPT)"); public override IFilesystem Plugin => new Aaru.Filesystems.exFAT(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/exFAT/MBR.cs b/Aaru.Tests/Filesystems/exFAT/MBR.cs index 1275ef651..3366ff929 100644 --- a/Aaru.Tests/Filesystems/exFAT/MBR.cs +++ b/Aaru.Tests/Filesystems/exFAT/MBR.cs @@ -34,10 +34,8 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems.exFAT; [TestFixture] -public class MBR : FilesystemTest +public class MBR() : FilesystemTest("exfat") { - public MBR() : base("exfat") {} - public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (MBR)"); public override IFilesystem Plugin => new Aaru.Filesystems.exFAT(); diff --git a/Aaru.Tests/Filesystems/ext.cs b/Aaru.Tests/Filesystems/ext.cs index 87730f658..d04ab5c71 100644 --- a/Aaru.Tests/Filesystems/ext.cs +++ b/Aaru.Tests/Filesystems/ext.cs @@ -35,7 +35,7 @@ using NUnit.Framework; namespace Aaru.Tests.Filesystems; [TestFixture] -public class Ext : FilesystemTest +public class Ext() : FilesystemTest("ext") { public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Linux extended File System"); @@ -43,8 +43,6 @@ public class Ext : FilesystemTest public override IFilesystem Plugin => new extFS(); public override bool Partitions => true; - public Ext() : base("ext") {} - public override FileSystemTest[] Tests => new[] { new FileSystemTest