From 01ac233e8603fc2e3c793cd4770da3e72d717201 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 3 Mar 2021 14:31:56 +0000 Subject: [PATCH] Refactor unit tests. --- Aaru.Tests/Images/2MG.cs | 4 ++-- Aaru.Tests/Images/AaruFormat/Tape/V1.cs | 2 +- Aaru.Tests/Images/AaruFormat/V1.cs | 2 +- Aaru.Tests/Images/Alcohol120.cs | 2 +- Aaru.Tests/Images/Anex86.cs | 4 ++-- Aaru.Tests/Images/AppleDOS/DOS.cs | 2 +- Aaru.Tests/Images/AppleDOS/DOS32.cs | 2 +- Aaru.Tests/Images/AppleDOS/ProDOS.cs | 2 +- Aaru.Tests/Images/AppleNIB.cs | 2 +- Aaru.Tests/Images/Apridisk.cs | 2 +- Aaru.Tests/Images/BaseMediaImageTest.cs | 4 ++-- Aaru.Tests/Images/BlindWrite4.cs | 2 +- Aaru.Tests/Images/BlindWrite5.cs | 2 +- Aaru.Tests/Images/BlindWrite6.cs | 2 +- Aaru.Tests/Images/BlindWrite7.cs | 2 +- Aaru.Tests/Images/BlockMediaImageTest.cs | 4 ++-- Aaru.Tests/Images/CDRWin.cs | 4 ++-- Aaru.Tests/Images/CDRWin10.cs | 2 +- Aaru.Tests/Images/CPCDSK.cs | 4 ++-- Aaru.Tests/Images/CisCopy/Uncompressed.cs | 2 +- Aaru.Tests/Images/CloneCD.cs | 2 +- Aaru.Tests/Images/Commodore64/D64.cs | 2 +- Aaru.Tests/Images/Commodore64/D81.cs | 2 +- Aaru.Tests/Images/CopyQM.cs | 4 ++-- Aaru.Tests/Images/CopyTape.cs | 2 +- Aaru.Tests/Images/D88.cs | 4 ++-- Aaru.Tests/Images/DART.cs | 4 ++-- Aaru.Tests/Images/DiscJuggler.cs | 3 +-- Aaru.Tests/Images/DiskCopy42.cs | 2 +- Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs | 2 +- Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs | 2 +- Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs | 2 +- Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs | 2 +- Aaru.Tests/Images/DiskCopy65/UDCO.cs | 2 +- Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs | 2 +- Aaru.Tests/Images/DiskCopy65/UDRO.cs | 2 +- Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs | 2 +- Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs | 2 +- Aaru.Tests/Images/DiskUtilities/ImageDisk.cs | 2 +- Aaru.Tests/Images/DiskUtilities/Raw.cs | 2 +- Aaru.Tests/Images/DriDiskCopy.cs | 2 +- Aaru.Tests/Images/GameJack6.cs | 2 +- Aaru.Tests/Images/HDCopy.cs | 2 +- Aaru.Tests/Images/HxC/ImageDisk.cs | 2 +- Aaru.Tests/Images/HxC/Raw.cs | 2 +- Aaru.Tests/Images/HyperV.cs | 2 +- Aaru.Tests/Images/ImageDisk.cs | 2 +- Aaru.Tests/Images/IsoBuster/Cuesheet.cs | 2 +- Aaru.Tests/Images/KryoFlux/Raw.cs | 2 +- Aaru.Tests/Images/Lisa/Raw.cs | 2 +- Aaru.Tests/Images/MAME/v1.cs | 2 +- Aaru.Tests/Images/MAME/v3.cs | 2 +- Aaru.Tests/Images/MAME/v4.cs | 2 +- Aaru.Tests/Images/MAME/v5/compressed.cs | 2 +- Aaru.Tests/Images/MAME/v5/uncompressed.cs | 2 +- Aaru.Tests/Images/MagicISO/Cuesheet.cs | 2 +- Aaru.Tests/Images/MagicISO/Nero.cs | 2 +- Aaru.Tests/Images/MaxiDisk.cs | 2 +- Aaru.Tests/Images/NHDr0.cs | 2 +- Aaru.Tests/Images/Nero/V1.cs | 2 +- Aaru.Tests/Images/Nero/V2.cs | 2 +- Aaru.Tests/Images/OpticalMediaImageTest.cs | 4 ++-- Aaru.Tests/Images/PowerISO/Cuesheet.cs | 2 +- Aaru.Tests/Images/QEMU/HyperV.cs | 2 +- Aaru.Tests/Images/QEMU/Parallels.cs | 2 +- Aaru.Tests/Images/QEMU/QCOW.cs | 2 +- Aaru.Tests/Images/QEMU/QCOW2.cs | 2 +- Aaru.Tests/Images/QEMU/QCOW3.cs | 2 +- Aaru.Tests/Images/QEMU/QED.cs | 2 +- Aaru.Tests/Images/QEMU/Raw.cs | 3 +-- Aaru.Tests/Images/QEMU/VMware5.cs | 2 +- Aaru.Tests/Images/QEMU/VMware6.cs | 2 +- Aaru.Tests/Images/QEMU/VirtualBox.cs | 2 +- Aaru.Tests/Images/QEMU/VirtualPC.cs | 2 +- Aaru.Tests/Images/RayDIM.cs | 2 +- Aaru.Tests/Images/RsIde.cs | 4 ++-- Aaru.Tests/Images/SaveDskF.cs | 2 +- Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs | 2 +- Aaru.Tests/Images/ShrinkWrap/DiskDup.cs | 2 +- Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs | 4 ++-- Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs | 4 ++-- Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs | 4 ++-- Aaru.Tests/Images/ShrinkWrap/Raw.cs | 2 +- Aaru.Tests/Images/TapeMediaImageTest.cs | 6 +++--- Aaru.Tests/Images/TeleDisk.cs | 2 +- Aaru.Tests/Images/Toast.cs | 3 +-- Aaru.Tests/Images/UltraISO/Alcohol.cs | 2 +- Aaru.Tests/Images/UltraISO/CloneCD.cs | 2 +- Aaru.Tests/Images/UltraISO/Cuesheet.cs | 2 +- Aaru.Tests/Images/UltraISO/Nero.cs | 2 +- Aaru.Tests/Images/Virtual98.cs | 2 +- Aaru.Tests/Images/VirtualBox/VirtualPC.cs | 2 +- Aaru.Tests/Images/VirtualPC/Raw.cs | 2 +- Aaru.Tests/Images/VirtualPC/VirtualPC.cs | 2 +- Aaru.Tests/Images/partclone.cs | 2 +- Aaru.Tests/Images/pce/DiskCopy42.cs | 2 +- Aaru.Tests/Images/pce/ImageDisk.cs | 2 +- Aaru.Tests/Images/pce/TeleDisk.cs | 2 +- Aaru.Tests/Images/pce/XDF.cs | 2 +- Aaru.Tests/Images/pce/raw.cs | 2 +- 112 files changed, 128 insertions(+), 131 deletions(-) diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs index faa341252..a4b43e20d 100644 --- a/Aaru.Tests/Images/2MG.cs +++ b/Aaru.Tests/Images/2MG.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class Apple2Mg : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "2mg"); - public override IMediaImage _plugin => new DiscImages.Apple2Mg(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "2mg"); + public override IMediaImage _plugin => new DiscImages.Apple2Mg(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs index a03868f98..41328809b 100644 --- a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs +++ b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AaruFormat.Tape [TestFixture] public class V1 : TapeMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1"); public override IMediaImage _plugin => new DiscImages.AaruFormat(); diff --git a/Aaru.Tests/Images/AaruFormat/V1.cs b/Aaru.Tests/Images/AaruFormat/V1.cs index 0f2b18cec..0047b661d 100644 --- a/Aaru.Tests/Images/AaruFormat/V1.cs +++ b/Aaru.Tests/Images/AaruFormat/V1.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.AaruFormat [TestFixture] public class V1 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1"); public override IMediaImage _plugin => new DiscImages.AaruFormat(); diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs index 2042478c8..3560716c6 100644 --- a/Aaru.Tests/Images/Alcohol120.cs +++ b/Aaru.Tests/Images/Alcohol120.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class Alcohol120 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Alcohol 120%"); public override IMediaImage _plugin => new DiscImages.Alcohol120(); diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs index c80f0662f..10d11ea9b 100644 --- a/Aaru.Tests/Images/Anex86.cs +++ b/Aaru.Tests/Images/Anex86.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class Anex86 : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Anex86"); - public override IMediaImage _plugin => new DiscImages.Anex86(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Anex86"); + public override IMediaImage _plugin => new DiscImages.Anex86(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/AppleDOS/DOS.cs b/Aaru.Tests/Images/AppleDOS/DOS.cs index 614aeeba4..7a5b181f0 100644 --- a/Aaru.Tests/Images/AppleDOS/DOS.cs +++ b/Aaru.Tests/Images/AppleDOS/DOS.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AppleDOS [TestFixture] public class DOS : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS Order"); public override IMediaImage _plugin => new AppleDos(); diff --git a/Aaru.Tests/Images/AppleDOS/DOS32.cs b/Aaru.Tests/Images/AppleDOS/DOS32.cs index ab0a72f53..37b643b51 100644 --- a/Aaru.Tests/Images/AppleDOS/DOS32.cs +++ b/Aaru.Tests/Images/AppleDOS/DOS32.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AppleDOS [TestFixture] public class DOS32 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS 13 sectors"); public override IMediaImage _plugin => new AppleDos(); diff --git a/Aaru.Tests/Images/AppleDOS/ProDOS.cs b/Aaru.Tests/Images/AppleDOS/ProDOS.cs index a2d197685..0ceb417d8 100644 --- a/Aaru.Tests/Images/AppleDOS/ProDOS.cs +++ b/Aaru.Tests/Images/AppleDOS/ProDOS.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AppleDOS [TestFixture] public class ProDOS : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple ProDOS Order"); public override IMediaImage _plugin => new AppleDos(); diff --git a/Aaru.Tests/Images/AppleNIB.cs b/Aaru.Tests/Images/AppleNIB.cs index a43d66bae..ecdcc1186 100644 --- a/Aaru.Tests/Images/AppleNIB.cs +++ b/Aaru.Tests/Images/AppleNIB.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class AppleNib : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles"); public override IMediaImage _plugin => new DiscImages.AppleNib(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/Apridisk.cs b/Aaru.Tests/Images/Apridisk.cs index 2a67fccd0..3f280b621 100644 --- a/Aaru.Tests/Images/Apridisk.cs +++ b/Aaru.Tests/Images/Apridisk.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class Apridisk : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk"); public override IMediaImage _plugin => new DiscImages.Apridisk(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/BaseMediaImageTest.cs b/Aaru.Tests/Images/BaseMediaImageTest.cs index 2280b1bb6..b6e6749d1 100644 --- a/Aaru.Tests/Images/BaseMediaImageTest.cs +++ b/Aaru.Tests/Images/BaseMediaImageTest.cs @@ -4,7 +4,7 @@ namespace Aaru.Tests.Images { public abstract class BaseMediaImageTest { - public abstract string _dataFolder { get; } - public abstract IMediaImage _plugin { get; } + public abstract string DataFolder { get; } + public abstract IMediaImage _plugin { get; } } } \ No newline at end of file diff --git a/Aaru.Tests/Images/BlindWrite4.cs b/Aaru.Tests/Images/BlindWrite4.cs index f02472a2e..bcfc1be48 100644 --- a/Aaru.Tests/Images/BlindWrite4.cs +++ b/Aaru.Tests/Images/BlindWrite4.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class BlindWrite4 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 4"); public override IMediaImage _plugin => new DiscImages.BlindWrite4(); diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs index c07c68d64..fa70e314d 100644 --- a/Aaru.Tests/Images/BlindWrite5.cs +++ b/Aaru.Tests/Images/BlindWrite5.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class BlindWrite5 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 5"); public override IMediaImage _plugin => new DiscImages.BlindWrite5(); diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs index a8420e478..2c64597e6 100644 --- a/Aaru.Tests/Images/BlindWrite6.cs +++ b/Aaru.Tests/Images/BlindWrite6.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class BlindWrite6 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 6"); public override IMediaImage _plugin => new DiscImages.BlindWrite5(); diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs index 7ea8378f2..3d6ac7c52 100644 --- a/Aaru.Tests/Images/BlindWrite7.cs +++ b/Aaru.Tests/Images/BlindWrite7.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class BlindWrite7 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 7"); public override IMediaImage _plugin => new DiscImages.BlindWrite5(); diff --git a/Aaru.Tests/Images/BlockMediaImageTest.cs b/Aaru.Tests/Images/BlockMediaImageTest.cs index 466002a62..61f80fac8 100644 --- a/Aaru.Tests/Images/BlockMediaImageTest.cs +++ b/Aaru.Tests/Images/BlockMediaImageTest.cs @@ -16,7 +16,7 @@ namespace Aaru.Tests.Images [Test] public void Info() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { @@ -52,7 +52,7 @@ namespace Aaru.Tests.Images [Test] public void Hashes() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs index cf5dd8712..72eb58cdf 100644 --- a/Aaru.Tests/Images/CDRWin.cs +++ b/Aaru.Tests/Images/CDRWin.cs @@ -37,8 +37,8 @@ namespace Aaru.Tests.Images [TestFixture] public class CDRWin : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin"); - public override IMediaImage _plugin => new CdrWin(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin"); + public override IMediaImage _plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/CDRWin10.cs b/Aaru.Tests/Images/CDRWin10.cs index 6bdf1bb21..1ac099073 100644 --- a/Aaru.Tests/Images/CDRWin10.cs +++ b/Aaru.Tests/Images/CDRWin10.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class CDRWin10 : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10"); public override IMediaImage _plugin => new DiscImages.Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/CPCDSK.cs b/Aaru.Tests/Images/CPCDSK.cs index e070ea9b7..71d3b7a66 100644 --- a/Aaru.Tests/Images/CPCDSK.cs +++ b/Aaru.Tests/Images/CPCDSK.cs @@ -37,8 +37,8 @@ namespace Aaru.Tests.Images [TestFixture] public class CPCDSK : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CPCDSK"); - public override IMediaImage _plugin => new Cpcdsk(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CPCDSK"); + public override IMediaImage _plugin => new Cpcdsk(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/CisCopy/Uncompressed.cs b/Aaru.Tests/Images/CisCopy/Uncompressed.cs index eb78ff125..41494b194 100644 --- a/Aaru.Tests/Images/CisCopy/Uncompressed.cs +++ b/Aaru.Tests/Images/CisCopy/Uncompressed.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.CisCopy public class Uncompressed : BlockMediaImageTest { // TODO: Support compression - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy"); public override IMediaImage _plugin => new DiscImages.CisCopy(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs index 71552a0f5..39d63ef9c 100644 --- a/Aaru.Tests/Images/CloneCD.cs +++ b/Aaru.Tests/Images/CloneCD.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class CloneCD : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD"); public override IMediaImage _plugin => new CloneCd(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/Commodore64/D64.cs b/Aaru.Tests/Images/Commodore64/D64.cs index a840c40c2..6ac350f45 100644 --- a/Aaru.Tests/Images/Commodore64/D64.cs +++ b/Aaru.Tests/Images/Commodore64/D64.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.Commodore64 [TestFixture] public class D64 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D64"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/Commodore64/D81.cs b/Aaru.Tests/Images/Commodore64/D81.cs index 53d8391e7..6dc67129d 100644 --- a/Aaru.Tests/Images/Commodore64/D81.cs +++ b/Aaru.Tests/Images/Commodore64/D81.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.Commodore64 [TestFixture] public class D81 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D81"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs index 9a687055a..a577169ed 100644 --- a/Aaru.Tests/Images/CopyQM.cs +++ b/Aaru.Tests/Images/CopyQM.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class CopyQm : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CopyQM"); - public override IMediaImage _plugin => new DiscImages.CopyQm(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CopyQM"); + public override IMediaImage _plugin => new DiscImages.CopyQm(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/CopyTape.cs b/Aaru.Tests/Images/CopyTape.cs index 804bc5311..2df9137ed 100644 --- a/Aaru.Tests/Images/CopyTape.cs +++ b/Aaru.Tests/Images/CopyTape.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class CopyTape : TapeMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape"); public override IMediaImage _plugin => new DiscImages.CopyTape(); public override TapeImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs index 948874b37..1318dd407 100644 --- a/Aaru.Tests/Images/D88.cs +++ b/Aaru.Tests/Images/D88.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class D88 : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "D88"); - public override IMediaImage _plugin => new DiscImages.D88(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "D88"); + public override IMediaImage _plugin => new DiscImages.D88(); public override BlockImageTestExpected[] Tests => new[] { new BlockImageTestExpected diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs index d15c4e56d..c6c577fcc 100644 --- a/Aaru.Tests/Images/DART.cs +++ b/Aaru.Tests/Images/DART.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class Dart : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DART"); - public override IMediaImage _plugin => new DiscImages.Dart(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DART"); + public override IMediaImage _plugin => new DiscImages.Dart(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/DiscJuggler.cs b/Aaru.Tests/Images/DiscJuggler.cs index d560864a0..605e725af 100644 --- a/Aaru.Tests/Images/DiscJuggler.cs +++ b/Aaru.Tests/Images/DiscJuggler.cs @@ -36,8 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class DiscJuggler : OpticalMediaImageTest { - public override string _dataFolder => - Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler"); public override IMediaImage _plugin => new DiscImages.DiscJuggler(); public override OpticalImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs index cc0e4a088..1a2e73b8d 100644 --- a/Aaru.Tests/Images/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy42.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class DiskCopy42 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 4.2"); public override IMediaImage _plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs index 4559212b3..c16ad9116 100644 --- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.DiskCopy633 [TestFixture] public class DiskCopy42 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2"); public override IMediaImage _plugin => new DiscImages.DiskCopy42(); diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs index 92b2d072f..1ff7d297f 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF [TestFixture] public class ROCo : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "ROCo"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs index 4cb51c5ca..369ac6de8 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF [TestFixture] public class RdWr : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "RdWr"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs index 05623cbd2..aa01d8fc5 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF [TestFixture] public class Rdxx : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "Rdxx"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskCopy65/UDCO.cs b/Aaru.Tests/Images/DiskCopy65/UDCO.cs index c76135940..9dcc3de34 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDCO.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDCO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy65 [TestFixture] public class UDCO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs index e990e9c9a..bca4c4ecb 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy65 [TestFixture] public class UDCo_obsolete : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCo_OBS"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskCopy65/UDRO.cs b/Aaru.Tests/Images/DiskCopy65/UDRO.cs index 3e9092ecb..8a68d713a 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDRO.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDRO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy65 [TestFixture] public class UDRO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs index 7a683f99f..ee34b9fa2 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy65 [TestFixture] public class UDRo_obsolete : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRo_OBS"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs index 53aac249b..61cbd5f58 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework [TestFixture] public class DiskCopy42 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2"); public override IMediaImage _plugin => new DiscImages.DiskCopy42(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs index 0148a3521..a06204752 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF [TestFixture] public class ROCo : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs index c1caf22ff..b5f7aac14 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF [TestFixture] public class RdWr : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs index f6efd80ed..4133938f7 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF [TestFixture] public class Rdxx : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx"); public override IMediaImage _plugin => new Ndif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs index a9fdb75de..a91a8d9a8 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class IPOD : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs index 680573e1e..9e89c0e73 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDBZ : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs index d96c39be5..682cdac9d 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDCO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs index 222ac9e57..1b1e51837 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDRO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs index c0989a433..2edb9e39f 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDRW : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs index 066603d2e..c65978a2c 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDTO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs index bd5a155e1..41d1157c5 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UDZO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs index 12191fdbe..4e7787ecb 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class UFBI : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs index 828d000b6..e3e809ded 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF [TestFixture] public class ULMO : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO"); public override IMediaImage _plugin => new Udif(); diff --git a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs index e9a256ec9..c53efdeb2 100644 --- a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs +++ b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskUtilities [TestFixture] public class ImageDisk : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "ImageDisk"); public override IMediaImage _plugin => new Imd(); diff --git a/Aaru.Tests/Images/DiskUtilities/Raw.cs b/Aaru.Tests/Images/DiskUtilities/Raw.cs index 9fb6bcc85..7710d553d 100644 --- a/Aaru.Tests/Images/DiskUtilities/Raw.cs +++ b/Aaru.Tests/Images/DiskUtilities/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskUtilities [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/DriDiskCopy.cs b/Aaru.Tests/Images/DriDiskCopy.cs index 6e1d15c41..ae82a0505 100644 --- a/Aaru.Tests/Images/DriDiskCopy.cs +++ b/Aaru.Tests/Images/DriDiskCopy.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class DriDiskCopy : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DRI DISKCOPY"); public override IMediaImage _plugin => new DiscImages.DriDiskCopy(); diff --git a/Aaru.Tests/Images/GameJack6.cs b/Aaru.Tests/Images/GameJack6.cs index a9466f002..715f20cfa 100644 --- a/Aaru.Tests/Images/GameJack6.cs +++ b/Aaru.Tests/Images/GameJack6.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class GameJack6 : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY"); public override IMediaImage _plugin => new DiscImages.Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/HDCopy.cs b/Aaru.Tests/Images/HDCopy.cs index 15fad0ecb..f0ff50ecf 100644 --- a/Aaru.Tests/Images/HDCopy.cs +++ b/Aaru.Tests/Images/HDCopy.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class HDCopy : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY"); public override IMediaImage _plugin => new HdCopy(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs index 90f0bed93..d71557928 100644 --- a/Aaru.Tests/Images/HxC/ImageDisk.cs +++ b/Aaru.Tests/Images/HxC/ImageDisk.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.HxC [TestFixture] public class ImageDisk : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "ImageDisk"); public override IMediaImage _plugin => new Imd(); diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs index 7a233d4ac..6370c607b 100644 --- a/Aaru.Tests/Images/HxC/Raw.cs +++ b/Aaru.Tests/Images/HxC/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.HxC [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/HyperV.cs b/Aaru.Tests/Images/HyperV.cs index 3e4edfe3e..c4bf93ba0 100644 --- a/Aaru.Tests/Images/HyperV.cs +++ b/Aaru.Tests/Images/HyperV.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class HyperV : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V"); public override IMediaImage _plugin => new Vhdx(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/ImageDisk.cs b/Aaru.Tests/Images/ImageDisk.cs index ec4031252..e50e93712 100644 --- a/Aaru.Tests/Images/ImageDisk.cs +++ b/Aaru.Tests/Images/ImageDisk.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class ImageDisk : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk"); public override IMediaImage _plugin => new Imd(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs index 92feb4353..869d3e1d6 100644 --- a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs +++ b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.IsoBuster [TestFixture] public class Cuesheet : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "IsoBuster", "Cuesheet"); public override IMediaImage _plugin => new CdrWin(); diff --git a/Aaru.Tests/Images/KryoFlux/Raw.cs b/Aaru.Tests/Images/KryoFlux/Raw.cs index 1534d7c1c..56d0dab2c 100644 --- a/Aaru.Tests/Images/KryoFlux/Raw.cs +++ b/Aaru.Tests/Images/KryoFlux/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.KryoFlux [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "KryoFlux", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/Lisa/Raw.cs b/Aaru.Tests/Images/Lisa/Raw.cs index 38c0cb257..12ca4dea0 100644 --- a/Aaru.Tests/Images/Lisa/Raw.cs +++ b/Aaru.Tests/Images/Lisa/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.Lisa [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Lisa emulators", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/MAME/v1.cs b/Aaru.Tests/Images/MAME/v1.cs index 0aa50078c..253d6fd52 100644 --- a/Aaru.Tests/Images/MAME/v1.cs +++ b/Aaru.Tests/Images/MAME/v1.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME [TestFixture] public class V1 : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1"); public override IMediaImage _plugin => new Chd(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/MAME/v3.cs b/Aaru.Tests/Images/MAME/v3.cs index c813cfa8d..0da642b03 100644 --- a/Aaru.Tests/Images/MAME/v3.cs +++ b/Aaru.Tests/Images/MAME/v3.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME [TestFixture] public class V3 : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3"); public override IMediaImage _plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/MAME/v4.cs b/Aaru.Tests/Images/MAME/v4.cs index 0c9a9847e..0cf4b817b 100644 --- a/Aaru.Tests/Images/MAME/v4.cs +++ b/Aaru.Tests/Images/MAME/v4.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME [TestFixture] public class V4 : OpticalMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4"); public override IMediaImage _plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/MAME/v5/compressed.cs b/Aaru.Tests/Images/MAME/v5/compressed.cs index 622828d6f..9dac61d57 100644 --- a/Aaru.Tests/Images/MAME/v5/compressed.cs +++ b/Aaru.Tests/Images/MAME/v5/compressed.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME.v5 [TestFixture] public class Compressed : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "compressed"); public override IMediaImage _plugin => new Chd(); diff --git a/Aaru.Tests/Images/MAME/v5/uncompressed.cs b/Aaru.Tests/Images/MAME/v5/uncompressed.cs index 120da2a51..e9e3447c4 100644 --- a/Aaru.Tests/Images/MAME/v5/uncompressed.cs +++ b/Aaru.Tests/Images/MAME/v5/uncompressed.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME.v5 [TestFixture] public class Uncompressed : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "uncompressed"); public override IMediaImage _plugin => new Chd(); diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs index aee4e0c3c..1d20f4d95 100644 --- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs +++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MagicISO [TestFixture] public class Cuesheet : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Cuesheet"); public override IMediaImage _plugin => new CdrWin(); diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs index 9d776f192..b1d76a663 100644 --- a/Aaru.Tests/Images/MagicISO/Nero.cs +++ b/Aaru.Tests/Images/MagicISO/Nero.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.MagicISO [TestFixture] public class Nero : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Nero"); public override IMediaImage _plugin => new DiscImages.Nero(); diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs index 461028f4f..b3748bbca 100644 --- a/Aaru.Tests/Images/MaxiDisk.cs +++ b/Aaru.Tests/Images/MaxiDisk.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class MaxiDisk : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk"); public override IMediaImage _plugin => new DiscImages.MaxiDisk(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/NHDr0.cs b/Aaru.Tests/Images/NHDr0.cs index ea8fcfe5a..806cabc87 100644 --- a/Aaru.Tests/Images/NHDr0.cs +++ b/Aaru.Tests/Images/NHDr0.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class NHDr0 : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next"); public override IMediaImage _plugin => new Nhdr0(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/Nero/V1.cs b/Aaru.Tests/Images/Nero/V1.cs index 61f87843c..9cc6b2719 100644 --- a/Aaru.Tests/Images/Nero/V1.cs +++ b/Aaru.Tests/Images/Nero/V1.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.Nero [TestFixture] public class V1 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V1"); public override IMediaImage _plugin => new DiscImages.Nero(); diff --git a/Aaru.Tests/Images/Nero/V2.cs b/Aaru.Tests/Images/Nero/V2.cs index 24092649f..6e28ed8d7 100644 --- a/Aaru.Tests/Images/Nero/V2.cs +++ b/Aaru.Tests/Images/Nero/V2.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.Nero [TestFixture] public class V2 : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V2"); public override IMediaImage _plugin => new DiscImages.Nero(); diff --git a/Aaru.Tests/Images/OpticalMediaImageTest.cs b/Aaru.Tests/Images/OpticalMediaImageTest.cs index 09131a0f8..ab848b33d 100644 --- a/Aaru.Tests/Images/OpticalMediaImageTest.cs +++ b/Aaru.Tests/Images/OpticalMediaImageTest.cs @@ -20,7 +20,7 @@ namespace Aaru.Tests.Images [Test] public void Info() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { @@ -91,7 +91,7 @@ namespace Aaru.Tests.Images [Test] public void Hashes() { - Environment.CurrentDirectory = Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs index 2c14a8bb1..b19196857 100644 --- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs +++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.PowerISO [TestFixture] public class Cuesheet : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "PowerISO", "Cuesheet"); public override IMediaImage _plugin => new DiscImages.DiscJuggler(); diff --git a/Aaru.Tests/Images/QEMU/HyperV.cs b/Aaru.Tests/Images/QEMU/HyperV.cs index efd7747c0..50752878b 100644 --- a/Aaru.Tests/Images/QEMU/HyperV.cs +++ b/Aaru.Tests/Images/QEMU/HyperV.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class HyperV : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Hyper-V"); public override IMediaImage _plugin => new Vhdx(); diff --git a/Aaru.Tests/Images/QEMU/Parallels.cs b/Aaru.Tests/Images/QEMU/Parallels.cs index 0bc389f33..0533ea40b 100644 --- a/Aaru.Tests/Images/QEMU/Parallels.cs +++ b/Aaru.Tests/Images/QEMU/Parallels.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class Parallels : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Parallels"); public override IMediaImage _plugin => new DiscImages.Parallels(); diff --git a/Aaru.Tests/Images/QEMU/QCOW.cs b/Aaru.Tests/Images/QEMU/QCOW.cs index ea2965db1..9cde89b8e 100644 --- a/Aaru.Tests/Images/QEMU/QCOW.cs +++ b/Aaru.Tests/Images/QEMU/QCOW.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class QCOW : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write"); public override IMediaImage _plugin => new Qcow(); diff --git a/Aaru.Tests/Images/QEMU/QCOW2.cs b/Aaru.Tests/Images/QEMU/QCOW2.cs index d59380571..508a4c2bc 100644 --- a/Aaru.Tests/Images/QEMU/QCOW2.cs +++ b/Aaru.Tests/Images/QEMU/QCOW2.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class QCOW2 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 2"); public override IMediaImage _plugin => new Qcow2(); diff --git a/Aaru.Tests/Images/QEMU/QCOW3.cs b/Aaru.Tests/Images/QEMU/QCOW3.cs index f0eb302cf..864ad617a 100644 --- a/Aaru.Tests/Images/QEMU/QCOW3.cs +++ b/Aaru.Tests/Images/QEMU/QCOW3.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class QCOW3 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 3"); public override IMediaImage _plugin => new Qcow2(); diff --git a/Aaru.Tests/Images/QEMU/QED.cs b/Aaru.Tests/Images/QEMU/QED.cs index be270bdc3..d63ed903d 100644 --- a/Aaru.Tests/Images/QEMU/QED.cs +++ b/Aaru.Tests/Images/QEMU/QED.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class QED : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Enhanced Disk"); public override IMediaImage _plugin => new Qed(); diff --git a/Aaru.Tests/Images/QEMU/Raw.cs b/Aaru.Tests/Images/QEMU/Raw.cs index 8634be7ac..e618eb35b 100644 --- a/Aaru.Tests/Images/QEMU/Raw.cs +++ b/Aaru.Tests/Images/QEMU/Raw.cs @@ -37,8 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => - Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/QEMU/VMware5.cs b/Aaru.Tests/Images/QEMU/VMware5.cs index b8087cf19..2b4c1838e 100644 --- a/Aaru.Tests/Images/QEMU/VMware5.cs +++ b/Aaru.Tests/Images/QEMU/VMware5.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class VMware5 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 5"); public override IMediaImage _plugin => new VMware(); diff --git a/Aaru.Tests/Images/QEMU/VMware6.cs b/Aaru.Tests/Images/QEMU/VMware6.cs index 526049907..d53b50e19 100644 --- a/Aaru.Tests/Images/QEMU/VMware6.cs +++ b/Aaru.Tests/Images/QEMU/VMware6.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class VMware6 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 6"); public override IMediaImage _plugin => new VMware(); diff --git a/Aaru.Tests/Images/QEMU/VirtualBox.cs b/Aaru.Tests/Images/QEMU/VirtualBox.cs index 1800f8e4a..1c5aed029 100644 --- a/Aaru.Tests/Images/QEMU/VirtualBox.cs +++ b/Aaru.Tests/Images/QEMU/VirtualBox.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class VirtualBox : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualBox"); public override IMediaImage _plugin => new Vdi(); diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs index 9303a894e..67be64847 100644 --- a/Aaru.Tests/Images/QEMU/VirtualPC.cs +++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU [TestFixture] public class VirtualPC : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualPC"); public override IMediaImage _plugin => new Vhd(); diff --git a/Aaru.Tests/Images/RayDIM.cs b/Aaru.Tests/Images/RayDIM.cs index b6bcff7a1..330c6b490 100644 --- a/Aaru.Tests/Images/RayDIM.cs +++ b/Aaru.Tests/Images/RayDIM.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class RayDIM : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Disk IMage Archiver"); public override IMediaImage _plugin => new RayDim(); diff --git a/Aaru.Tests/Images/RsIde.cs b/Aaru.Tests/Images/RsIde.cs index f0da69c99..0726a5d87 100644 --- a/Aaru.Tests/Images/RsIde.cs +++ b/Aaru.Tests/Images/RsIde.cs @@ -36,8 +36,8 @@ namespace Aaru.Tests.Images [TestFixture] public class RsIde : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "RS-IDE"); - public override IMediaImage _plugin => new DiscImages.RsIde(); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "RS-IDE"); + public override IMediaImage _plugin => new DiscImages.RsIde(); public override BlockImageTestExpected[] Tests => new[] { diff --git a/Aaru.Tests/Images/SaveDskF.cs b/Aaru.Tests/Images/SaveDskF.cs index 42bc337aa..1ea417626 100644 --- a/Aaru.Tests/Images/SaveDskF.cs +++ b/Aaru.Tests/Images/SaveDskF.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class SaveDskF : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF"); public override IMediaImage _plugin => new DiscImages.SaveDskF(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs index 02b02d4df..ca39a288b 100644 --- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs +++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.ShrinkWrap [TestFixture] public class DiskCopy42 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2"); public override IMediaImage _plugin => new DiscImages.DiskCopy42(); diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs index f3ed72a64..758874438 100644 --- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs +++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap [TestFixture] public class DiskDup : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskDup+"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs index 83c599afd..946c8858e 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs @@ -37,8 +37,8 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF [TestFixture] public class ROCo : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", - "ShrinkWrap 3", "NDIF", "DiskCopy compression"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", + "NDIF", "DiskCopy compression"); public override IMediaImage _plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs index 69ed020db..bb9934b82 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs @@ -37,8 +37,8 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF [TestFixture] public class RdWr : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", - "ShrinkWrap 3", "NDIF", "No compression", "No encryption"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", + "NDIF", "No compression", "No encryption"); public override IMediaImage _plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs index fc76b0d28..da495ca86 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs @@ -37,8 +37,8 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF [TestFixture] public class Rdxx : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", - "ShrinkWrap 3", "NDIF", "Simple compression"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", + "NDIF", "Simple compression"); public override IMediaImage _plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs index 3ab78e321..362a812f5 100644 --- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs +++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); diff --git a/Aaru.Tests/Images/TapeMediaImageTest.cs b/Aaru.Tests/Images/TapeMediaImageTest.cs index cc57af5e1..f41d4ead6 100644 --- a/Aaru.Tests/Images/TapeMediaImageTest.cs +++ b/Aaru.Tests/Images/TapeMediaImageTest.cs @@ -18,7 +18,7 @@ namespace Aaru.Tests.Images [Test] public void Tape() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { @@ -57,7 +57,7 @@ namespace Aaru.Tests.Images [Test] public void Info() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { @@ -93,7 +93,7 @@ namespace Aaru.Tests.Images [Test] public void Hashes() { - Environment.CurrentDirectory = _dataFolder; + Environment.CurrentDirectory = DataFolder; Assert.Multiple(() => { diff --git a/Aaru.Tests/Images/TeleDisk.cs b/Aaru.Tests/Images/TeleDisk.cs index 0a82ee060..ef561ff09 100644 --- a/Aaru.Tests/Images/TeleDisk.cs +++ b/Aaru.Tests/Images/TeleDisk.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class TeleDisk : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk"); public override IMediaImage _plugin => new DiscImages.TeleDisk(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/Toast.cs b/Aaru.Tests/Images/Toast.cs index 6f717004b..7810c5af8 100644 --- a/Aaru.Tests/Images/Toast.cs +++ b/Aaru.Tests/Images/Toast.cs @@ -37,8 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class Toast : OpticalMediaImageTest { - public override string _dataFolder => - Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast"); public override IMediaImage _plugin => new ZZZRawImage(); public override OpticalImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/UltraISO/Alcohol.cs b/Aaru.Tests/Images/UltraISO/Alcohol.cs index a3c23dd73..f43923aac 100644 --- a/Aaru.Tests/Images/UltraISO/Alcohol.cs +++ b/Aaru.Tests/Images/UltraISO/Alcohol.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.UltraISO [TestFixture] public class Alcohol : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Alcohol"); public override IMediaImage _plugin => new DiscImages.Alcohol120(); diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs index 4c1200187..653e09e72 100644 --- a/Aaru.Tests/Images/UltraISO/CloneCD.cs +++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.UltraISO [TestFixture] public class CloneCD : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "CloneCD"); public override IMediaImage _plugin => new CloneCd(); diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs index 6569f2ab9..470423305 100644 --- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs +++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.UltraISO [TestFixture] public class Cuesheet : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Cuesheet"); public override IMediaImage _plugin => new CdrWin(); diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs index 2056ee1bc..0ef5d4a12 100644 --- a/Aaru.Tests/Images/UltraISO/Nero.cs +++ b/Aaru.Tests/Images/UltraISO/Nero.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.UltraISO [TestFixture] public class Nero : OpticalMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Nero"); public override IMediaImage _plugin => new DiscImages.Nero(); diff --git a/Aaru.Tests/Images/Virtual98.cs b/Aaru.Tests/Images/Virtual98.cs index 8f4afbbaf..2d658d071 100644 --- a/Aaru.Tests/Images/Virtual98.cs +++ b/Aaru.Tests/Images/Virtual98.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images [TestFixture] public class Virtual98 : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98"); public override IMediaImage _plugin => new DiscImages.Virtual98(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs index d810be2e5..764686a7a 100644 --- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs +++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.VirtualBox [TestFixture] public class VirtualPc : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualBox", "VirtualPC"); public override IMediaImage _plugin => new Vhd(); diff --git a/Aaru.Tests/Images/VirtualPC/Raw.cs b/Aaru.Tests/Images/VirtualPC/Raw.cs index de8e53504..5bf290e62 100644 --- a/Aaru.Tests/Images/VirtualPC/Raw.cs +++ b/Aaru.Tests/Images/VirtualPC/Raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.VirtualPC [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); public override IMediaImage _plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs index cf9b61eb8..e0b03a8c4 100644 --- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs +++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.VirtualPC [TestFixture] public class VirtualPc : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); public override IMediaImage _plugin => new Vhd(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/partclone.cs b/Aaru.Tests/Images/partclone.cs index f6b6a7ea3..584012a44 100644 --- a/Aaru.Tests/Images/partclone.cs +++ b/Aaru.Tests/Images/partclone.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images [TestFixture] public class Partclone : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone"); public override IMediaImage _plugin => new PartClone(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/pce/DiskCopy42.cs b/Aaru.Tests/Images/pce/DiskCopy42.cs index c494a47bd..9a1c6f910 100644 --- a/Aaru.Tests/Images/pce/DiskCopy42.cs +++ b/Aaru.Tests/Images/pce/DiskCopy42.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.pce [TestFixture] public class DiskCopy42 : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "DiskCopy 4.2"); public override IMediaImage _plugin => new DiscImages.DiskCopy42(); diff --git a/Aaru.Tests/Images/pce/ImageDisk.cs b/Aaru.Tests/Images/pce/ImageDisk.cs index d2b4e585e..63ec42618 100644 --- a/Aaru.Tests/Images/pce/ImageDisk.cs +++ b/Aaru.Tests/Images/pce/ImageDisk.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce [TestFixture] public class ImageDisk : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "ImageDisk"); public override IMediaImage _plugin => new Imd(); diff --git a/Aaru.Tests/Images/pce/TeleDisk.cs b/Aaru.Tests/Images/pce/TeleDisk.cs index 5de9b5070..a38a68def 100644 --- a/Aaru.Tests/Images/pce/TeleDisk.cs +++ b/Aaru.Tests/Images/pce/TeleDisk.cs @@ -36,7 +36,7 @@ namespace Aaru.Tests.Images.pce [TestFixture] public class TeleDisk : BlockMediaImageTest { - public override string _dataFolder => + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "TeleDisk"); public override IMediaImage _plugin => new DiscImages.TeleDisk(); diff --git a/Aaru.Tests/Images/pce/XDF.cs b/Aaru.Tests/Images/pce/XDF.cs index 33511034c..dd802dadf 100644 --- a/Aaru.Tests/Images/pce/XDF.cs +++ b/Aaru.Tests/Images/pce/XDF.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce [TestFixture] public class XDF : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF"); public override IMediaImage _plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] diff --git a/Aaru.Tests/Images/pce/raw.cs b/Aaru.Tests/Images/pce/raw.cs index 349c769bd..5324f740d 100644 --- a/Aaru.Tests/Images/pce/raw.cs +++ b/Aaru.Tests/Images/pce/raw.cs @@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce [TestFixture] public class Raw : BlockMediaImageTest { - public override string _dataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw"); + public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw"); public override IMediaImage _plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[]