Convert into primary constructor.

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 TypeText         { get; } = string.Format(Localization.Core.Filesystem_type_0, metadata.Type);
-    public string VolumeNameText             { get; }
+    public string VolumeNameText   { get; } = string.Format(Localization.Core.Volume_name_0,     metadata.VolumeName);
-    public string SerialNumberText           { get; }
+    public string SerialNumberText { get; } = string.Format(Localization.Core.Volume_serial_0,   metadata.VolumeSerial);
-    public string ApplicationIdentifierText  { get; }
+
-    public string SystemIdentifierText       { get; }
+    public string ApplicationIdentifierText { get; } =
-    public string VolumeSetIdentifierText    { get; }
+        string.Format(Localization.Core.Application_identifier_0, metadata.ApplicationIdentifier);
-    public string DataPreparerIdentifierText { get; }
+
-    public string PublisherIdentifierText    { get; }
+    public string SystemIdentifierText { get; } =
-    public string CreationDateText           { get; }
+        string.Format(Localization.Core.System_identifier_0, metadata.SystemIdentifier);
-    public string EffectiveDateText          { get; }
+
-    public string ModificationDateText       { get; }
+    public string VolumeSetIdentifierText { get; } =
-    public string ExpirationDateText         { get; }
+        string.Format(Localization.Core.Volume_set_identifier_0, metadata.VolumeSetIdentifier);
-    public string BackupDateText             { get; }
+
-    public string ClustersText               { get; }
+    public string DataPreparerIdentifierText { get; } =
-    public string FreeClustersText           { get; }
+        string.Format(Localization.Core.Data_preparer_identifier_0, metadata.DataPreparerIdentifier);
-    public string FilesText                  { get; }
+
-    public bool   BootableChecked            { get; }
+    public string PublisherIdentifierText { get; } =
-    public bool   DirtyChecked               { get; }
+        string.Format(Localization.Core.Publisher_identifier_0, metadata.PublisherIdentifier);
-    public string InformationText            { get; }
+
-    public bool   CreationDateVisible        { get; }
+    public string CreationDateText { get; } =
-    public bool   EffectiveDateVisible       { get; }
+        string.Format(Localization.Core.Volume_created_on_0, metadata.CreationDate);
-    public bool   ModificationDateVisible    { get; }
+
-    public bool   ExpirationDateVisible      { get; }
+    public string EffectiveDateText { get; } =
-    public bool   BackupDateVisible          { get; }
+        string.Format(Localization.Core.Volume_effective_from_0, metadata.EffectiveDate);
-    public bool   FreeClustersVisible        { get; }
+
-    public bool   FilesVisible               { get; }
+    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;
 }

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)
+    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);
-        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);
 
-        LengthText = string.Format(Localization.Core.Partition_length_0_sectors_1_bytes, partition.Length,
+    public string StartText { get; } =
-                                   partition.Size);
+        string.Format(Localization.Core.Partition_start_sector_0_byte_1, partition.Start, partition.Offset);
 
-        DescriptionLabelText = Localization.Core.Title_Partition_description;
+    public string LengthText { get; } = string.Format(Localization.Core.Partition_length_0_sectors_1_bytes,
-        DescriptionText      = partition.Description;
+                                                      partition.Length,
-    }
+                                                      partition.Size);
 
-    public string NameText             { get; }
+    public string DescriptionLabelText { get; } = Localization.Core.Title_Partition_description;
-    public string TypeText             { get; }
+    public string DescriptionText      { get; } = partition.Description;
-    public string StartText            { get; }
-    public string LengthText           { get; }
-    public string DescriptionLabelText { get; }
-    public string DescriptionText      { get; }
 }

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                _currentProgress;
+    double _maxProgress;
-    double                _maxProgress;
+    string _message;
-    string                _message;
-
-    public SplashWindowViewModel(SplashWindow view) => _view = view;
 
     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();

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");
 

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)");
 

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)");
 

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)");
 

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)");
 

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();

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)");
 

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)");
 

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;

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();

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)");
 

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)");
 

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)");
 

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();

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;

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;

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;

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;

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();

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;

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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;

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();

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;

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();

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;

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;

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;

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;

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;

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();

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;

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;

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;

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;

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;

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;

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();

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;

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;

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;

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();

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;

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();

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() : this(null) {}
-
-    protected FilesystemTest() => _fileSystemType = null;
-
-    protected FilesystemTest(string fileSystemType) => _fileSystemType = fileSystemType;
 
     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,

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;

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;

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;

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();

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;

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;

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;

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;

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();

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;

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;

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();

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");
 

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");
 

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)");
 

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");
 

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;

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;

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;

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;

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;

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");
 

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)");
 

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)");
 

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)");
 

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)");
 

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();

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;

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();

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)");
 

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;

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;

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();

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)");
 

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;

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();

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;

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;

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();