diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 8d40f3e39..7455b48f8 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 8d40f3e395e751ff62e7678252e9eac6b21b27ff +Subproject commit 7455b48f8f33cb3d201165fb975c3dbb86284f09 diff --git a/Aaru.Compression/ADC.cs b/Aaru.Compression/ADC.cs index 53c720269..42f0dabcd 100644 --- a/Aaru.Compression/ADC.cs +++ b/Aaru.Compression/ADC.cs @@ -42,6 +42,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; /// Implements the Apple version of RLE +// ReSharper disable once InconsistentNaming public static class ADC { const int PLAIN = 1; @@ -51,7 +52,7 @@ public static class ADC public static bool IsSupported => true; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_adc_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size); + static extern int AARU_adc_decode_buffer(byte[] dstBuffer, int dstSize, byte[] srcBuffer, int srcSize); [MethodImpl(MethodImplOptions.AggressiveInlining)] static int GetChunkType(byte byt) => (byt & 0x80) == 0x80 diff --git a/Aaru.Compression/AppleRle.cs b/Aaru.Compression/AppleRle.cs index 0f3baad55..5f8dd818d 100644 --- a/Aaru.Compression/AppleRle.cs +++ b/Aaru.Compression/AppleRle.cs @@ -43,7 +43,7 @@ public static class AppleRle public static bool IsSupported => true; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_apple_rle_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size); + static extern int AARU_apple_rle_decode_buffer(byte[] dstBuffer, int dstSize, byte[] srcBuffer, int srcSize); /// Decodes a buffer compressed with Apple RLE /// Encoded buffer diff --git a/Aaru.Compression/BZip2.cs b/Aaru.Compression/BZip2.cs index a8b30bd1a..9accf5278 100644 --- a/Aaru.Compression/BZip2.cs +++ b/Aaru.Compression/BZip2.cs @@ -38,11 +38,11 @@ public class BZip2 public static bool IsSupported => true; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_bzip2_decode_buffer(byte[] dst_buffer, ref uint dst_size, byte[] src_buffer, uint src_size); + static extern int AARU_bzip2_decode_buffer(byte[] dstBuffer, ref uint dstSize, byte[] srcBuffer, uint srcSize); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_bzip2_encode_buffer(byte[] dst_buffer, ref uint dst_size, byte[] src_buffer, uint src_size, - int blockSize100k); + static extern int AARU_bzip2_encode_buffer(byte[] dstBuffer, ref uint dstSize, byte[] srcBuffer, uint srcSize, + int blockSize100K); /// Decodes a buffer compressed with BZIP2 /// Encoded buffer @@ -68,21 +68,21 @@ public class BZip2 /// Compresses a buffer using BZIP2 /// Data to compress /// Buffer to store the compressed data - /// Block size in 100KiB units + /// Block size in 100KiB units /// - public static int EncodeBuffer(byte[] source, byte[] destination, int blockSize100k) + public static int EncodeBuffer(byte[] source, byte[] destination, int blockSize100K) { var destinationSize = (uint)destination.Length; if(Native.IsSupported) { - AARU_bzip2_encode_buffer(destination, ref destinationSize, source, (uint)source.Length, blockSize100k); + AARU_bzip2_encode_buffer(destination, ref destinationSize, source, (uint)source.Length, blockSize100K); return (int)destinationSize; } using var cmpMs = new MemoryStream(source); - using var encStream = new BZip2OutputStream(new MemoryStream(destination), blockSize100k); + using var encStream = new BZip2OutputStream(new MemoryStream(destination), blockSize100K); encStream.Write(source, 0, source.Length); return source.Length; diff --git a/Aaru.Compression/FLAC.cs b/Aaru.Compression/FLAC.cs index 74e780142..5bf9567f8 100644 --- a/Aaru.Compression/FLAC.cs +++ b/Aaru.Compression/FLAC.cs @@ -33,24 +33,25 @@ using System.Runtime.InteropServices; using CUETools.Codecs; using CUETools.Codecs.Flake; +// ReSharper disable once InconsistentNaming public class FLAC { /// Set to true if this algorithm is supported, false otherwise. public static bool IsSupported => true; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_flac_decode_redbook_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, - nuint src_size); + static extern nuint AARU_flac_decode_redbook_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, + nuint srcSize); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_flac_encode_redbook_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, - nuint src_size, uint blocksize, int do_mid_side_stereo, - int loose_mid_side_stereo, string apodization, - uint max_lpc_order, uint qlp_coeff_precision, - int do_qlp_coeff_prec_search, int do_exhaustive_model_search, - uint min_residual_partition_order, - uint max_residual_partition_order, string application_id, - uint application_id_len); + static extern nuint AARU_flac_encode_redbook_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, + nuint srcSize, uint blocksize, int doMidSideStereo, + int looseMidSideStereo, string apodization, + uint maxLpcOrder, uint qlpCoeffPrecision, + int doQlpCoeffPrecSearch, int doExhaustiveModelSearch, + uint minResidualPartitionOrder, + uint maxResidualPartitionOrder, string applicationID, + uint applicationIDLen); /// Decodes a buffer compressed with FLAC /// Encoded buffer @@ -78,14 +79,14 @@ public class FLAC /// Buffer to store the compressed data /// public static int EncodeBuffer(byte[] source, byte[] destination, uint blockSize, bool doMidSideStereo, - bool looseMidSideStereo, string apodization, uint max_lpc_order, + bool looseMidSideStereo, string apodization, uint maxLpcOrder, uint qlpCoeffPrecision, bool doQlpCoeffPrecSearch, bool doExhaustiveModelSearch, uint minResidualPartitionOrder, uint maxResidualPartitionOrder, string applicationID) { if(Native.IsSupported) return (int)AARU_flac_encode_redbook_buffer(destination, (nuint)destination.Length, source, (nuint)source.Length, blockSize, doMidSideStereo ? 1 : 0, - looseMidSideStereo ? 1 : 0, apodization, max_lpc_order, + looseMidSideStereo ? 1 : 0, apodization, maxLpcOrder, qlpCoeffPrecision, doQlpCoeffPrecSearch ? 1 : 0, doExhaustiveModelSearch ? 1 : 0, minResidualPartitionOrder, maxResidualPartitionOrder, applicationID, diff --git a/Aaru.Compression/LZFSE.cs b/Aaru.Compression/LZFSE.cs index 9992fc957..d3ae4d2bd 100644 --- a/Aaru.Compression/LZFSE.cs +++ b/Aaru.Compression/LZFSE.cs @@ -30,18 +30,19 @@ namespace Aaru.Compression; using System.Runtime.InteropServices; +// ReSharper disable once InconsistentNaming public class LZFSE { /// Set to true if this algorithm is supported, false otherwise. public static bool IsSupported => Native.IsSupported; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_lzfse_decode_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, nuint src_size, - byte[] scratch_buffer); + static extern nuint AARU_lzfse_decode_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, nuint srcSize, + byte[] scratchBuffer); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_lzfse_encode_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, nuint src_size, - byte[] scratch_buffer); + static extern nuint AARU_lzfse_encode_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, nuint srcSize, + byte[] scratchBuffer); /// Decodes a buffer compressed with LZFSE /// Encoded buffer diff --git a/Aaru.Compression/LZIP.cs b/Aaru.Compression/LZIP.cs index f669fc2dc..66af13402 100644 --- a/Aaru.Compression/LZIP.cs +++ b/Aaru.Compression/LZIP.cs @@ -30,17 +30,18 @@ namespace Aaru.Compression; using System.Runtime.InteropServices; +// ReSharper disable once InconsistentNaming public class LZIP { /// Set to true if this algorithm is supported, false otherwise. public static bool IsSupported => Native.IsSupported; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_lzip_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size); + static extern int AARU_lzip_decode_buffer(byte[] dstBuffer, int dstSize, byte[] srcBuffer, int srcSize); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_lzip_encode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size, - int dictionary_size, int match_len_limit); + static extern int AARU_lzip_encode_buffer(byte[] dstBuffer, int dstSize, byte[] srcBuffer, int srcSize, + int dictionarySize, int matchLenLimit); /// Decodes a buffer compressed with LZIP /// Encoded buffer diff --git a/Aaru.Compression/LZMA.cs b/Aaru.Compression/LZMA.cs index e855eac86..7f05f6a22 100644 --- a/Aaru.Compression/LZMA.cs +++ b/Aaru.Compression/LZMA.cs @@ -38,11 +38,11 @@ public class LZMA public static bool IsSupported => true; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_lzma_decode_buffer(byte[] dst_buffer, ref nuint dst_size, byte[] src_buffer, - ref nuint src_size, byte[] props, nuint propsSize); + static extern int AARU_lzma_decode_buffer(byte[] dstBuffer, ref nuint dstSize, byte[] srcBuffer, + ref nuint srcSize, byte[] props, nuint propsSize); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern int AARU_lzma_encode_buffer(byte[] dst_buffer, ref nuint dst_size, byte[] src_buffer, nuint src_size, + static extern int AARU_lzma_encode_buffer(byte[] dstBuffer, ref nuint dstSize, byte[] srcBuffer, nuint srcSize, byte[] outProps, ref nuint outPropsSize, int level, uint dictSize, int lc, int lp, int pb, int fb, int numThreads); @@ -90,9 +90,9 @@ public class LZMA return (int)dstSize; } - var _lzmaEncoderProperties = new LzmaEncoderProperties(true, (int)dictSize, fb); + var lzmaEncoderProperties = new LzmaEncoderProperties(true, (int)dictSize, fb); - using var lzmaStream = new LzmaStream(_lzmaEncoderProperties, false, new MemoryStream(destination)); + using var lzmaStream = new LzmaStream(lzmaEncoderProperties, false, new MemoryStream(destination)); lzmaStream.Write(source, 0, source.Length); properties = new byte[lzmaStream.Properties.Length]; diff --git a/Aaru.Compression/ZSTD.cs b/Aaru.Compression/ZSTD.cs index 0ea2791cf..9ee226b09 100644 --- a/Aaru.Compression/ZSTD.cs +++ b/Aaru.Compression/ZSTD.cs @@ -30,16 +30,17 @@ namespace Aaru.Compression; using System.Runtime.InteropServices; +// ReSharper disable once InconsistentNaming public class ZSTD { /// Set to true if this algorithm is supported, false otherwise. public static bool IsSupported => Native.IsSupported; [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_zstd_decode_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, nuint src_size); + static extern nuint AARU_zstd_decode_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, nuint srcSize); [DllImport("libAaru.Compression.Native", SetLastError = true)] - static extern nuint AARU_zstd_encode_buffer(byte[] dst_buffer, nuint dst_size, byte[] src_buffer, nuint src_size, + static extern nuint AARU_zstd_encode_buffer(byte[] dstBuffer, nuint dstSize, byte[] srcBuffer, nuint srcSize, int compressionLevel); /// Decodes a buffer compressed with ZSTD diff --git a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs index 1c78e4a74..109b29e7b 100644 --- a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs +++ b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs @@ -38,6 +38,7 @@ namespace Aaru.Filesystems; using System; +using System.Diagnostics.CodeAnalysis; public sealed partial class ISO9660 { @@ -53,6 +54,7 @@ public sealed partial class ISO9660 LastHeader = 0x91 } + [SuppressMessage("ReSharper", "InconsistentNaming")] enum ElToritoPlatform : byte { x86 = 0, diff --git a/Aaru.Filesystems/exFAT.cs b/Aaru.Filesystems/exFAT.cs index 46fe3dc61..f53b81aa6 100644 --- a/Aaru.Filesystems/exFAT.cs +++ b/Aaru.Filesystems/exFAT.cs @@ -47,6 +47,7 @@ using Marshal = Aaru.Helpers.Marshal; /// /// Implements detection of the exFAT filesystem [SuppressMessage("ReSharper", "UnusedMember.Local")] +// ReSharper disable once InconsistentNaming public sealed class exFAT : IFilesystem { readonly Guid _oemFlashParameterGuid = new("0A0C7E46-3399-4021-90C8-FA6D389C4BA2"); diff --git a/Aaru.Filesystems/ext2FS.cs b/Aaru.Filesystems/ext2FS.cs index 6601a7586..5046f0aa2 100644 --- a/Aaru.Filesystems/ext2FS.cs +++ b/Aaru.Filesystems/ext2FS.cs @@ -47,6 +47,7 @@ using Marshal = Aaru.Helpers.Marshal; /// /// Implements detection of the Linux extended filesystem v2, v3 and v4 [SuppressMessage("ReSharper", "UnusedMember.Local")] +// ReSharper disable once InconsistentNaming public sealed class ext2FS : IFilesystem { const int SB_POS = 0x400; @@ -147,6 +148,7 @@ public sealed class ext2FS : IFilesystem /// Volume use extents *ext4* const uint EXT4_FEATURE_INCOMPAT_EXTENTS = 0x00000040; /// Supports volumes bigger than 2^32 blocks *ext4* + // ReSharper disable once InconsistentNaming const uint EXT4_FEATURE_INCOMPAT_64BIT = 0x00000080; /// Multi-mount protection *ext4* const uint EXT4_FEATURE_INCOMPAT_MMP = 0x00000100; diff --git a/Aaru.Filesystems/extFS.cs b/Aaru.Filesystems/extFS.cs index 93e921e62..f430334a1 100644 --- a/Aaru.Filesystems/extFS.cs +++ b/Aaru.Filesystems/extFS.cs @@ -43,6 +43,7 @@ using Schemas; // Information from the Linux kernel /// /// Implements detection of the Linux extended filesystem +// ReSharper disable once InconsistentNaming public sealed class extFS : IFilesystem { const int SB_POS = 0x400; diff --git a/Aaru.Images/CHD/Constants.cs b/Aaru.Images/CHD/Constants.cs index f33dcf87d..7c0e5db5f 100644 --- a/Aaru.Images/CHD/Constants.cs +++ b/Aaru.Images/CHD/Constants.cs @@ -69,6 +69,7 @@ public sealed partial class Chd const string REGEX_METADATA_GDROM = @"TRACK:(?\d+) TYPE:(?\S+) SUBTYPE:(?\S+) FRAMES:(?\d+) PAD:(?\d+) PREGAP:(?\d+) PGTYPE:(?\S+) PGSUB:(?\S+) POSTGAP:(?\d+)"; + // ReSharper disable InconsistentNaming const string TRACK_TYPE_MODE1 = "MODE1"; const string TRACK_TYPE_MODE1_2K = "MODE1/2048"; const string TRACK_TYPE_MODE1_RAW = "MODE1_RAW"; @@ -83,6 +84,7 @@ public sealed partial class Chd const string TRACK_TYPE_MODE2_RAW = "MODE2_RAW"; const string TRACK_TYPE_MODE2_RAW_2K = "MODE2/2352"; const string TRACK_TYPE_AUDIO = "AUDIO"; + // ReSharper restore InconsistentNaming const string SUB_TYPE_COOKED = "RW"; const string SUB_TYPE_RAW = "RW_RAW"; diff --git a/Aaru.Images/IMD/Constants.cs b/Aaru.Images/IMD/Constants.cs index dc069df0b..b303373c2 100644 --- a/Aaru.Images/IMD/Constants.cs +++ b/Aaru.Images/IMD/Constants.cs @@ -44,6 +44,7 @@ public sealed partial class Imd @"IMD (?\d.\d+):\s+(?\d+)\/\s*(?\d+)\/(?\d+)\s+(?\d+):(?\d+):(?\d+)\r\n"; const string REGEX_SAMDISK = @"IMD SAMdisk(?\d.\d+),\s+(?\d+)\/\s*(?\d+)\/(?\d+)\s+(?\d+):\s*(?\d+):(?\d+)"; + // ReSharper disable once InconsistentNaming const string REGEX_Z88DK = @"IMD z88dk:\s+(?\d+)\/\s*(?\d+)\/(?\d+)\s+(?\d+):\s*(?\d+):(?\d+)\r\n"; } \ No newline at end of file diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs index 2f89a34c2..737b4df61 100644 --- a/Aaru.Partitions/VTOC.cs +++ b/Aaru.Partitions/VTOC.cs @@ -451,6 +451,7 @@ public sealed class VTOC : IPartition } [StructLayout(LayoutKind.Sequential, Pack = 1)] + // ReSharper disable once InconsistentNaming struct PDInfo { public readonly uint driveid; /*identifies the device type*/ @@ -493,6 +494,7 @@ public sealed class VTOC : IPartition } [StructLayout(LayoutKind.Sequential, Pack = 1)] + // ReSharper disable once InconsistentNaming struct PDInfoOld { public readonly uint driveid; /*identifies the device type*/ @@ -520,6 +522,7 @@ public sealed class VTOC : IPartition } [StructLayout(LayoutKind.Sequential, Pack = 1)] + // ReSharper disable once InconsistentNaming struct vtocold { [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] @@ -539,6 +542,7 @@ public sealed class VTOC : IPartition } [StructLayout(LayoutKind.Sequential, Pack = 1)] + // ReSharper disable once InconsistentNaming struct vtoc { public readonly uint v_sanity; /*to verify vtoc sanity*/ diff --git a/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs b/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs index c713b4841..fc52b1db9 100644 --- a/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs +++ b/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs @@ -7,7 +7,7 @@ using NUnit.Framework; [TestFixture] public class ExtendedCSD { - readonly byte[][] ecsd = + readonly byte[][] _ecsd = { new byte[] { @@ -43,7 +43,7 @@ public class ExtendedCSD } }; - readonly Aaru.Decoders.MMC.ExtendedCSD[] decoded = + readonly Aaru.Decoders.MMC.ExtendedCSD[] _decoded = { new() { @@ -212,11 +212,11 @@ public class ExtendedCSD [Test] public void Test() { - for(var i = 0; i < ecsd.Length; i++) + for(var i = 0; i < _ecsd.Length; i++) { - Aaru.Decoders.MMC.ExtendedCSD csd = Decoders.DecodeExtendedCSD(ecsd[i]); + Aaru.Decoders.MMC.ExtendedCSD csd = Decoders.DecodeExtendedCSD(_ecsd[i]); Assert.IsNotNull(csd, $"Not decoded - {i}"); - csd.Should().BeEquivalentTo(decoded[i]); + csd.Should().BeEquivalentTo(_decoded[i]); } } } \ No newline at end of file diff --git a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs index 44cb94f30..bcef13fd5 100644 --- a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Filesystems.AFFS; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,6 +36,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class MBR_RDB : FilesystemTest { public MBR_RDB() : base("Amiga FFS") {} diff --git a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs index cdd858bd0..3e4019867 100644 --- a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Filesystems.AOFS; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,6 +36,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class MBR_RDB : FilesystemTest { public MBR_RDB() : base("Amiga OFS") {} diff --git a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs index 0a8cdcd31..b18d55196 100644 --- a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs @@ -27,6 +27,7 @@ namespace Aaru.Tests.Filesystems.CPM; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -34,6 +35,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class AMSDOS : FilesystemTest { public AMSDOS() : base("CP/M") {} diff --git a/Aaru.Tests/Filesystems/CPM/KayproII.cs b/Aaru.Tests/Filesystems/CPM/KayproII.cs index 41a920498..5d211b0d4 100644 --- a/Aaru.Tests/Filesystems/CPM/KayproII.cs +++ b/Aaru.Tests/Filesystems/CPM/KayproII.cs @@ -27,6 +27,7 @@ namespace Aaru.Tests.Filesystems.CPM; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -34,6 +35,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class KayproII : ReadOnlyFilesystemTest { public KayproII() : base("CP/M") {} diff --git a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs index ab6e1fab0..df1c74a1d 100644 --- a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs +++ b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs @@ -27,6 +27,7 @@ namespace Aaru.Tests.Filesystems.CPM; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -34,6 +35,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class Plus3DOS : FilesystemTest { public Plus3DOS() : base("CP/M") {} diff --git a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs index ff83187ba..fe110611e 100644 --- a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs +++ b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs @@ -27,6 +27,7 @@ namespace Aaru.Tests.Filesystems.CPM; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -34,6 +35,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class ROMDOS : FilesystemTest { public ROMDOS() : base("CP/M") {} diff --git a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs index 4c91a7b4a..4757275cc 100644 --- a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs +++ b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs @@ -260,7 +260,7 @@ public abstract class ReadOnlyFilesystemTest : FilesystemTest data.LinkTarget = link; } else - data.MD5 = BuildFile(fs, childPath, stat.Length); + data.Md5 = BuildFile(fs, childPath, stat.Length); children[child] = data; } @@ -342,7 +342,7 @@ public abstract class ReadOnlyFilesystemTest : FilesystemTest else // This ensure the buffer does not hang for collection - TestFile(fs, childPath, child.Value.MD5, child.Value.Info.Length, testFile); + TestFile(fs, childPath, child.Value.Md5, child.Value.Info.Length, testFile); if(!testXattr) continue; diff --git a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs index 31f6be472..3fec7a1a0 100644 --- a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs +++ b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Filesystems.SFS; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,6 +36,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class MBR_RDB : FilesystemTest { public MBR_RDB() : base("SmartFileSystem") {} diff --git a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs index c4041da6e..f424e0bd3 100644 --- a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs +++ b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Filesystems.UFS; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,6 +36,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class NeXT_Floppy : FilesystemTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)"); diff --git a/Aaru.Tests/Filesystems/UFS/Sun i86.cs b/Aaru.Tests/Filesystems/UFS/Sun i86.cs index 6b0da453c..4a4fc7ef5 100644 --- a/Aaru.Tests/Filesystems/UFS/Sun i86.cs +++ b/Aaru.Tests/Filesystems/UFS/Sun i86.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Filesystems.UFS; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,6 +36,7 @@ using Aaru.Filesystems; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class Sun_i86 : FilesystemTest { public override string DataFolder => diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs index f457e6340..087ef8865 100644 --- a/Aaru.Tests/Images/2MG.cs +++ b/Aaru.Tests/Images/2MG.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.Apple2Mg(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "7db5d585270ab858043d50e60068d45f" + Md5 = "7db5d585270ab858043d50e60068d45f" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple32SS, Sectors = 455, SectorSize = 256, - MD5 = "906c1bdbf76bf089ea47aae98151df5d", + Md5 = "906c1bdbf76bf089ea47aae98151df5d", Partitions = new[] { new BlockPartitionVolumes @@ -71,7 +71,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple32SS, Sectors = 455, SectorSize = 256, - MD5 = "76f8fe4c5bc1976f99641ad7cdf53109", + Md5 = "76f8fe4c5bc1976f99641ad7cdf53109", Partitions = new[] { new BlockPartitionVolumes @@ -87,7 +87,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -103,7 +103,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "91d020725d081500caa1fd8aad959397", + Md5 = "91d020725d081500caa1fd8aad959397", Partitions = new[] { new BlockPartitionVolumes @@ -119,7 +119,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "91d020725d081500caa1fd8aad959397", + Md5 = "91d020725d081500caa1fd8aad959397", Partitions = new[] { new BlockPartitionVolumes @@ -135,7 +135,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -151,7 +151,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "91d020725d081500caa1fd8aad959397", + Md5 = "91d020725d081500caa1fd8aad959397", Partitions = new[] { new BlockPartitionVolumes @@ -167,7 +167,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -183,7 +183,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "535648d1f9838b695403f2f48d5ac94c" + Md5 = "535648d1f9838b695403f2f48d5ac94c" }, new BlockImageTestExpected { @@ -191,7 +191,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2762f41d0379b476042fc62891baac84" + Md5 = "2762f41d0379b476042fc62891baac84" }, new BlockImageTestExpected { @@ -199,7 +199,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2762f41d0379b476042fc62891baac84" + Md5 = "2762f41d0379b476042fc62891baac84" }, new BlockImageTestExpected { @@ -207,7 +207,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2762f41d0379b476042fc62891baac84" + Md5 = "2762f41d0379b476042fc62891baac84" }, new BlockImageTestExpected { @@ -215,7 +215,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "b748f6df3e60e7169d42ec6fcc857ea4" + Md5 = "b748f6df3e60e7169d42ec6fcc857ea4" }, new BlockImageTestExpected { @@ -223,7 +223,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "b748f6df3e60e7169d42ec6fcc857ea4" + Md5 = "b748f6df3e60e7169d42ec6fcc857ea4" }, new BlockImageTestExpected { @@ -231,7 +231,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "dbd0ec8a3126236910709faf923adcf2" + Md5 = "dbd0ec8a3126236910709faf923adcf2" }, new BlockImageTestExpected { @@ -239,7 +239,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "dbd0ec8a3126236910709faf923adcf2" + Md5 = "dbd0ec8a3126236910709faf923adcf2" }, new BlockImageTestExpected { @@ -247,7 +247,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -255,7 +255,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -263,7 +263,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -271,7 +271,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -279,7 +279,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "eb9b60c78b30d2b6541ed0781944b6da" + Md5 = "eb9b60c78b30d2b6541ed0781944b6da" }, new BlockImageTestExpected { @@ -287,7 +287,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1fe841b418ede51133878641e01544b5" + Md5 = "1fe841b418ede51133878641e01544b5" }, new BlockImageTestExpected { @@ -295,7 +295,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 10240, SectorSize = 512, - MD5 = "b156441e159a625ee00a0659dfb6e2f8" + Md5 = "b156441e159a625ee00a0659dfb6e2f8" }, new BlockImageTestExpected { @@ -303,7 +303,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 10240, SectorSize = 512, - MD5 = "b156441e159a625ee00a0659dfb6e2f8" + Md5 = "b156441e159a625ee00a0659dfb6e2f8" }, new BlockImageTestExpected { @@ -311,7 +311,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fcf747bd356b48d442ff74adb8f3516b" + Md5 = "fcf747bd356b48d442ff74adb8f3516b" }, new BlockImageTestExpected { @@ -319,7 +319,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fcf747bd356b48d442ff74adb8f3516b" + Md5 = "fcf747bd356b48d442ff74adb8f3516b" }, new BlockImageTestExpected { @@ -327,7 +327,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fcf747bd356b48d442ff74adb8f3516b" + Md5 = "fcf747bd356b48d442ff74adb8f3516b" }, new BlockImageTestExpected { @@ -335,7 +335,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" }, new BlockImageTestExpected { @@ -343,7 +343,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" }, new BlockImageTestExpected { @@ -351,7 +351,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" }, new BlockImageTestExpected { @@ -359,7 +359,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" }, new BlockImageTestExpected { @@ -367,7 +367,7 @@ public class Apple2Mg : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "6f692a8fadfaa243d9f2d8d41f0e4cad" + Md5 = "6f692a8fadfaa243d9f2d8d41f0e4cad" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs index a24ed048e..2af657d2c 100644 --- a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs +++ b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs @@ -40,7 +40,7 @@ public class V1 : TapeMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1"); - public override IMediaImage _plugin => new AaruFormat(); + public override IMediaImage Plugin => new AaruFormat(); public override TapeImageTestExpected[] Tests => new[] { @@ -50,7 +50,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 1604, SectorSize = 10240, - MD5 = "a6334d975523b3422fea522b0cc118a9", + Md5 = "a6334d975523b3422fea522b0cc118a9", Partitions = new[] { new TapePartition @@ -77,7 +77,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 15485, SectorSize = 512, - MD5 = "17ef78d9e5c53b976f530d4ca44223fd", + Md5 = "17ef78d9e5c53b976f530d4ca44223fd", Partitions = new[] { new TapePartition @@ -104,7 +104,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 15, SectorSize = 32256, - MD5 = "76c0ae10f4ec70ef8681b212f02a71c8", + Md5 = "76c0ae10f4ec70ef8681b212f02a71c8", Partitions = new[] { new TapePartition @@ -131,7 +131,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 3298, SectorSize = 32256, - MD5 = "e331c9d0ae7c25c81c6580bc9965e2d0", + Md5 = "e331c9d0ae7c25c81c6580bc9965e2d0", Partitions = new[] { new TapePartition @@ -158,7 +158,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 3152, SectorSize = 32256, - MD5 = "018c37c40f8df91ab9b098d643c9ae6c", + Md5 = "018c37c40f8df91ab9b098d643c9ae6c", Partitions = new[] { new TapePartition @@ -185,7 +185,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 818, SectorSize = 32256, - MD5 = "eb3ce36b2c3afeeec59e5b8ed802a393", + Md5 = "eb3ce36b2c3afeeec59e5b8ed802a393", Partitions = new[] { new TapePartition @@ -212,7 +212,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 7, SectorSize = 32256, - MD5 = "b057656698a224187afb2bdbb8caf7f3", + Md5 = "b057656698a224187afb2bdbb8caf7f3", Partitions = new[] { new TapePartition @@ -239,7 +239,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 684, SectorSize = 32256, - MD5 = "8e48e388e7094f3170065718ab618b53", + Md5 = "8e48e388e7094f3170065718ab618b53", Partitions = new[] { new TapePartition @@ -266,7 +266,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 73525, SectorSize = 1024, - MD5 = "8861f8c06a2e93ca5a81d729ad3e1de1", + Md5 = "8861f8c06a2e93ca5a81d729ad3e1de1", Partitions = new[] { new TapePartition @@ -321,7 +321,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 290, SectorSize = 262144, - MD5 = "bfc402b23af0cf1ad22d9fb2ea29b58f", + Md5 = "bfc402b23af0cf1ad22d9fb2ea29b58f", Partitions = new[] { new TapePartition @@ -376,7 +376,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 37587, SectorSize = 8192, - MD5 = "e4a3e2fe26c72ca025ac0c017ec73ee9", + Md5 = "e4a3e2fe26c72ca025ac0c017ec73ee9", Partitions = new[] { new TapePartition @@ -627,7 +627,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 25046, SectorSize = 1024, - MD5 = "e625c03d7493dc22fe49f91f731446e8", + Md5 = "e625c03d7493dc22fe49f91f731446e8", Partitions = new[] { new TapePartition @@ -689,7 +689,7 @@ public class V1 : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 102, SectorSize = 262144, - MD5 = "198464b1daf8e674debf8eda0fcbf016", + Md5 = "198464b1daf8e674debf8eda0fcbf016", Partitions = new[] { new TapePartition diff --git a/Aaru.Tests/Images/AaruFormat/V1.cs b/Aaru.Tests/Images/AaruFormat/V1.cs index 15794262e..82e36048c 100644 --- a/Aaru.Tests/Images/AaruFormat/V1.cs +++ b/Aaru.Tests/Images/AaruFormat/V1.cs @@ -39,7 +39,7 @@ public class V1 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1"); - public override IMediaImage _plugin => new AaruFormat(); + public override IMediaImage Plugin => new AaruFormat(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +49,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDIREADY, Sectors = 279300, SectorSize = 2352, - MD5 = "ad6b898e5f93faf33967fe53fea7037e", - LongMD5 = "8c897ff39ce1ae7b091bfd00fbc3c1bb", - SubchannelMD5 = "579e2b502d86bc1eb7d6aded2b752c36", + Md5 = "ad6b898e5f93faf33967fe53fea7037e", + LongMd5 = "8c897ff39ce1ae7b091bfd00fbc3c1bb", + SubchannelMd5 = "579e2b502d86bc1eb7d6aded2b752c36", Tracks = new[] { new TrackInfoTestExpected @@ -257,9 +257,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c9036cb72bcb67d469ca82eb7a66cb2a", - LongMD5 = "c9036cb72bcb67d469ca82eb7a66cb2a", - SubchannelMD5 = "6d2ae02b362918f531ad414c736d349a", + Md5 = "c9036cb72bcb67d469ca82eb7a66cb2a", + LongMd5 = "c9036cb72bcb67d469ca82eb7a66cb2a", + SubchannelMd5 = "6d2ae02b362918f531ad414c736d349a", Tracks = new[] { new TrackInfoTestExpected @@ -382,9 +382,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "34b8e75c3038deceaea7d382f22740cb", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "34b8e75c3038deceaea7d382f22740cb", Tracks = new[] { new TrackInfoTestExpected @@ -421,9 +421,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "5d7f79a75e21f56e62d6fc894ee71ee6", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "5d7f79a75e21f56e62d6fc894ee71ee6", Tracks = new[] { new TrackInfoTestExpected @@ -460,9 +460,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDRW, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "80a59aaf861f925a530e1b0d7857fe25", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "80a59aaf861f925a530e1b0d7857fe25", Tracks = new[] { new TrackInfoTestExpected @@ -493,8 +493,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDPR, Sectors = 2146368, SectorSize = 2048, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -524,8 +524,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDR, Sectors = 2146368, SectorSize = 2048, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -555,8 +555,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDRAM, Sectors = 1218960, SectorSize = 2048, - MD5 = "c22b7796791cd4299d74863ed04496c6", - LongMD5 = "c22b7796791cd4299d74863ed04496c6", + Md5 = "c22b7796791cd4299d74863ed04496c6", + LongMd5 = "c22b7796791cd4299d74863ed04496c6", Tracks = new[] { new TrackInfoTestExpected @@ -586,8 +586,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDRAM, Sectors = 2236704, SectorSize = 2048, - MD5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", - LongMD5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", + Md5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", + LongMd5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", Tracks = new[] { new TrackInfoTestExpected @@ -617,8 +617,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDROM, Sectors = 16384000, SectorSize = 2048, - MD5 = "63d0fd3f25ab503a1818b15ca5eb86b5", - LongMD5 = "63d0fd3f25ab503a1818b15ca5eb86b5", + Md5 = "63d0fd3f25ab503a1818b15ca5eb86b5", + LongMd5 = "63d0fd3f25ab503a1818b15ca5eb86b5", Tracks = new[] { new TrackInfoTestExpected @@ -648,8 +648,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDROM, Sectors = 2146368, SectorSize = 2048, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -679,8 +679,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDPRW, Sectors = 2295104, SectorSize = 2048, - MD5 = "3c03ab1def372553f1b04afa0fdbc527", - LongMD5 = "3c03ab1def372553f1b04afa0fdbc527", + Md5 = "3c03ab1def372553f1b04afa0fdbc527", + LongMd5 = "3c03ab1def372553f1b04afa0fdbc527", Tracks = new[] { new TrackInfoTestExpected @@ -710,8 +710,8 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.DVDRWDL, Sectors = 2146368, SectorSize = 2048, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -741,9 +741,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CD, Sectors = 303316, SectorSize = 2352, - MD5 = "b6cb0d4b3a7763dc2ba6b5256a23bcbe", - LongMD5 = "74cf2db1d7a0c1d790728e6250f866b7", - SubchannelMD5 = "27d433659fd0142310b81175fbd610a7", + Md5 = "b6cb0d4b3a7763dc2ba6b5256a23bcbe", + LongMd5 = "74cf2db1d7a0c1d790728e6250f866b7", + SubchannelMd5 = "27d433659fd0142310b81175fbd610a7", Tracks = new[] { new TrackInfoTestExpected @@ -877,9 +877,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 277696, SectorSize = 2352, - MD5 = "78466ec1a08d7804a6cb38f2ed89b10f", - LongMD5 = "78466ec1a08d7804a6cb38f2ed89b10f", - SubchannelMD5 = "ac39ed98b7033da6aa936b4314574a2a", + Md5 = "78466ec1a08d7804a6cb38f2ed89b10f", + LongMd5 = "78466ec1a08d7804a6cb38f2ed89b10f", + SubchannelMd5 = "ac39ed98b7033da6aa936b4314574a2a", Tracks = new[] { new TrackInfoTestExpected @@ -978,9 +978,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 65536, SectorSize = 2352, - MD5 = "d5d22e15dcf3f081d562b351611a8991", - LongMD5 = "d5d22e15dcf3f081d562b351611a8991", - SubchannelMD5 = "3546cc3e1b2b3898de5a03083af9d6ee", + Md5 = "d5d22e15dcf3f081d562b351611a8991", + LongMd5 = "d5d22e15dcf3f081d562b351611a8991", + SubchannelMd5 = "3546cc3e1b2b3898de5a03083af9d6ee", Tracks = new[] { new TrackInfoTestExpected @@ -1031,9 +1031,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 350134, SectorSize = 2048, - MD5 = "edc146b00d622f92c6a9bb4648cbea82", - LongMD5 = "6b36340c27d5583e73539175eb87c683", - SubchannelMD5 = "663da762a5bef780d09217fca9d23e08", + Md5 = "edc146b00d622f92c6a9bb4648cbea82", + LongMd5 = "6b36340c27d5583e73539175eb87c683", + SubchannelMd5 = "663da762a5bef780d09217fca9d23e08", Tracks = new[] { new TrackInfoTestExpected @@ -1071,9 +1071,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 59206, SectorSize = 2352, - MD5 = "3e9862ad534415cb3b1ef216f9446d4e", - LongMD5 = "502cdc0391687bc2e2a89ea7a5906ebb", - SubchannelMD5 = "1aa52cf9468044489d791ab69a023a31", + Md5 = "3e9862ad534415cb3b1ef216f9446d4e", + LongMd5 = "502cdc0391687bc2e2a89ea7a5906ebb", + SubchannelMd5 = "1aa52cf9468044489d791ab69a023a31", Tracks = new[] { new TrackInfoTestExpected @@ -1119,9 +1119,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CD, Sectors = 329158, SectorSize = 2352, - MD5 = "fef9ff409aa2643ac0c0649e84346f5f", - LongMD5 = "ef18dc4f63ad59c6294ab09da7704366", - SubchannelMD5 = "aa71734f6385319656e2f1a64af5328b", + Md5 = "fef9ff409aa2643ac0c0649e84346f5f", + LongMd5 = "ef18dc4f63ad59c6294ab09da7704366", + SubchannelMd5 = "aa71734f6385319656e2f1a64af5328b", Tracks = new[] { new TrackInfoTestExpected @@ -1271,9 +1271,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected @@ -1392,9 +1392,9 @@ public class V1 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 48794, SectorSize = 2328, - MD5 = "a5531d15eefe70ff21718b3b5da08255", - LongMD5 = "11a0d9994ee761655ef4d61c6cda99e9", - SubchannelMD5 = "f49e383ccee2f3cb97aeb82fcb4fdb18", + Md5 = "a5531d15eefe70ff21718b3b5da08255", + LongMd5 = "11a0d9994ee761655ef4d61c6cda99e9", + SubchannelMd5 = "f49e383ccee2f3cb97aeb82fcb4fdb18", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs index bdd615ac2..1e8b0f050 100644 --- a/Aaru.Tests/Images/Alcohol120.cs +++ b/Aaru.Tests/Images/Alcohol120.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class Alcohol120 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Alcohol 120%"); - public override IMediaImage _plugin => new DiscImages.Alcohol120(); + public override IMediaImage Plugin => new DiscImages.Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,9 +46,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.mds", MediaType = MediaType.CDROMXA, Sectors = 279300, - MD5 = "556d7d32e3c01c2087cc56b25fe5f66d", - LongMD5 = "556d7d32e3c01c2087cc56b25fe5f66d", - SubchannelMD5 = "6ffdfdeacee7cd3caf6316f6b5f3a635", + Md5 = "556d7d32e3c01c2087cc56b25fe5f66d", + LongMd5 = "556d7d32e3c01c2087cc56b25fe5f66d", + SubchannelMd5 = "6ffdfdeacee7cd3caf6316f6b5f3a635", Tracks = new[] { new TrackInfoTestExpected @@ -234,9 +234,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "gigarec.mds", MediaType = MediaType.CDR, Sectors = 469652, - MD5 = "dc8aaff9bd1a8a6f642e15bce29cd03e", - LongMD5 = "1ba5f0fb9f3572197a8d039fd341c0aa", - SubchannelMD5 = "95ef603d7dc9e285929cbf3c79ba9db2", + Md5 = "dc8aaff9bd1a8a6f642e15bce29cd03e", + LongMd5 = "1ba5f0fb9f3572197a8d039fd341c0aa", + SubchannelMd5 = "95ef603d7dc9e285929cbf3c79ba9db2", Tracks = new[] { new TrackInfoTestExpected @@ -265,9 +265,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "jaguarcd.mds", MediaType = MediaType.CDROMXA, Sectors = 243587, - MD5 = "1dee46e2fa0de388d1f225ab8fa6d0b4", - LongMD5 = "1dee46e2fa0de388d1f225ab8fa6d0b4", - SubchannelMD5 = "b765ee54404c081b6aa8e67181d04e17", + Md5 = "1dee46e2fa0de388d1f225ab8fa6d0b4", + LongMd5 = "1dee46e2fa0de388d1f225ab8fa6d0b4", + SubchannelMd5 = "b765ee54404c081b6aa8e67181d04e17", Tracks = new[] { new TrackInfoTestExpected @@ -365,9 +365,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "pcengine.mds", MediaType = MediaType.CDROMXA, Sectors = 160956, - MD5 = "248ff28ea147ecdf0724fdfb0e59174a", - LongMD5 = "eb48e46f5bd085dd6f9936d89afe6e9b", - SubchannelMD5 = "42eea856ab1bbb04d16b1efed7c54d3f", + Md5 = "248ff28ea147ecdf0724fdfb0e59174a", + LongMd5 = "eb48e46f5bd085dd6f9936d89afe6e9b", + SubchannelMd5 = "42eea856ab1bbb04d16b1efed7c54d3f", Tracks = new[] { new TrackInfoTestExpected @@ -515,9 +515,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "pcfx.mds", MediaType = MediaType.CDROMXA, Sectors = 246680, - MD5 = "64d6baf711d2e0f24499d284ac2bc580", - LongMD5 = "f0af56f9d093b214e1b7c9148a869eb3", - SubchannelMD5 = "e596bcd432f69758678cda1e04207de5", + Md5 = "64d6baf711d2e0f24499d284ac2bc580", + LongMd5 = "f0af56f9d093b214e1b7c9148a869eb3", + SubchannelMd5 = "e596bcd432f69758678cda1e04207de5", Tracks = new[] { new TrackInfoTestExpected @@ -603,9 +603,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_audiocd.mds", MediaType = MediaType.CDROMXA, Sectors = 247073, - MD5 = "ff35cfa013871b322ef54612e719c185", - LongMD5 = "ff35cfa013871b322ef54612e719c185", - SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296", + Md5 = "ff35cfa013871b322ef54612e719c185", + LongMd5 = "ff35cfa013871b322ef54612e719c185", + SubchannelMd5 = "9da6ad8f6f0cadd92509c10809da7296", Tracks = new[] { new TrackInfoTestExpected @@ -729,9 +729,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_cdr.mds", MediaType = MediaType.CDR, Sectors = 254265, - MD5 = "016e9431ca3161d427b29dbc1312a232", - LongMD5 = "6b4e35ec371770751f26163629253015", - SubchannelMD5 = "6ea1db8638c111b7fd45b35a138d24fe", + Md5 = "016e9431ca3161d427b29dbc1312a232", + LongMd5 = "6b4e35ec371770751f26163629253015", + SubchannelMd5 = "6ea1db8638c111b7fd45b35a138d24fe", Tracks = new[] { new TrackInfoTestExpected @@ -769,9 +769,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_cdrom.mds", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "016e9431ca3161d427b29dbc1312a232", - LongMD5 = "6b4e35ec371770751f26163629253015", - SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515", + Md5 = "016e9431ca3161d427b29dbc1312a232", + LongMd5 = "6b4e35ec371770751f26163629253015", + SubchannelMd5 = "1994c303674718c74b35f9a4ea1d3515", Tracks = new[] { new TrackInfoTestExpected @@ -807,9 +807,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_cdrw_12x.mds", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "a1890f71563eb9907e4a08fef6afd6bf", - SubchannelMD5 = "337aefffca57a2d0222dabd8989f0b3f", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "a1890f71563eb9907e4a08fef6afd6bf", + SubchannelMd5 = "337aefffca57a2d0222dabd8989f0b3f", Tracks = new[] { new TrackInfoTestExpected @@ -839,9 +839,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_cdrw_2x.mds", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "6fe81a972e750c68e08f6935e4d91e34", Tracks = new[] { new TrackInfoTestExpected @@ -871,9 +871,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_cdrw_4x.mds", MediaType = MediaType.CDRW, Sectors = 254265, - MD5 = "fe67ffb95da123e060a1c4d278df3c5a", - LongMD5 = "9c13c4f7dcb76feae684ba9a368094c5", - SubchannelMD5 = "e4095cb91fa40382dcadc22433b281c3", + Md5 = "fe67ffb95da123e060a1c4d278df3c5a", + LongMd5 = "9c13c4f7dcb76feae684ba9a368094c5", + SubchannelMd5 = "e4095cb91fa40382dcadc22433b281c3", Tracks = new[] { new TrackInfoTestExpected @@ -909,8 +909,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvd+r-dl.mds", MediaType = MediaType.DVDROM, Sectors = 3455936, - MD5 = "692148a01b4204160b088141fb52bd70", - LongMD5 = "692148a01b4204160b088141fb52bd70", + Md5 = "692148a01b4204160b088141fb52bd70", + LongMd5 = "692148a01b4204160b088141fb52bd70", Tracks = new[] { new TrackInfoTestExpected @@ -941,8 +941,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvd+r.mds", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "32746029d25e430cd50c464232536d1a", - LongMD5 = "32746029d25e430cd50c464232536d1a", + Md5 = "32746029d25e430cd50c464232536d1a", + LongMd5 = "32746029d25e430cd50c464232536d1a", Tracks = new[] { new TrackInfoTestExpected @@ -973,8 +973,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvd-r.mds", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "c20217c0356fcd074c33b5f4b1355914", - LongMD5 = "c20217c0356fcd074c33b5f4b1355914", + Md5 = "c20217c0356fcd074c33b5f4b1355914", + LongMd5 = "c20217c0356fcd074c33b5f4b1355914", Tracks = new[] { new TrackInfoTestExpected @@ -1005,8 +1005,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvdrom.mds", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "0a49394278360f737a22e48ef125d7cd", - LongMD5 = "0a49394278360f737a22e48ef125d7cd", + Md5 = "0a49394278360f737a22e48ef125d7cd", + LongMd5 = "0a49394278360f737a22e48ef125d7cd", Tracks = new[] { new TrackInfoTestExpected @@ -1037,8 +1037,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvd+rw.mds", MediaType = MediaType.DVDROM, Sectors = 2295104, - MD5 = "4d0cac3a6f56c581870de38682408f95", - LongMD5 = "4d0cac3a6f56c581870de38682408f95", + Md5 = "4d0cac3a6f56c581870de38682408f95", + LongMd5 = "4d0cac3a6f56c581870de38682408f95", Tracks = new[] { new TrackInfoTestExpected @@ -1069,8 +1069,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_dvd-rw.mds", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "4844a94a97027b0fea664a1fba3ecbb2", - LongMD5 = "4844a94a97027b0fea664a1fba3ecbb2", + Md5 = "4844a94a97027b0fea664a1fba3ecbb2", + LongMd5 = "4844a94a97027b0fea664a1fba3ecbb2", Tracks = new[] { new TrackInfoTestExpected @@ -1099,9 +1099,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "report_enhancedcd.mds", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "7246ab63afe862677302929fb3514676", - LongMD5 = "797e7cb29028763ab827212d8630cb50", - SubchannelMD5 = "ceee6cf49071da484dd995c50a0b09fb", + Md5 = "7246ab63afe862677302929fb3514676", + LongMd5 = "797e7cb29028763ab827212d8630cb50", + SubchannelMd5 = "ceee6cf49071da484dd995c50a0b09fb", Tracks = new[] { new TrackInfoTestExpected @@ -1234,9 +1234,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.mds", MediaType = MediaType.CDR, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", + SubchannelMd5 = "ca781a7afc4eb77c51f7c551ed45c03c", Tracks = new[] { new TrackInfoTestExpected @@ -1334,9 +1334,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_enhancedcd.mds", MediaType = MediaType.CDR, Sectors = 59206, - MD5 = "947139fcc9924337f11040945ee8f1f7", - LongMD5 = "5d755e3ea7c66f81a381b9c59168107a", - SubchannelMD5 = "84cb28d835c25e51fdcb6c2291707786", + Md5 = "947139fcc9924337f11040945ee8f1f7", + LongMd5 = "5d755e3ea7c66f81a381b9c59168107a", + SubchannelMd5 = "84cb28d835c25e51fdcb6c2291707786", Tracks = new[] { new TrackInfoTestExpected @@ -1381,9 +1381,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.mds", MediaType = MediaType.CDR, Sectors = 350134, - MD5 = "f95d6f978ddb4f98bbffda403f627fe1", - LongMD5 = "6751e0ae7821f92221672b1cd5a1ff36", - SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5", + Md5 = "f95d6f978ddb4f98bbffda403f627fe1", + LongMd5 = "6751e0ae7821f92221672b1cd5a1ff36", + SubchannelMd5 = "65f938f7f9ac34fabd3ab94c14eb76b5", Tracks = new[] { new TrackInfoTestExpected @@ -1422,9 +1422,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.mds", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "064afaa489a2f402f42aaf9b546a3fef", - LongMD5 = "4d02563f72bdfbbf5a41bacf7a0fe916", - SubchannelMD5 = "e5e51af5f0a689f956ffc52df2949e71", + Md5 = "064afaa489a2f402f42aaf9b546a3fef", + LongMd5 = "4d02563f72bdfbbf5a41bacf7a0fe916", + SubchannelMd5 = "e5e51af5f0a689f956ffc52df2949e71", Tracks = new[] { new TrackInfoTestExpected @@ -1573,9 +1573,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_multiple_indexes.mds", MediaType = MediaType.CDR, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", + SubchannelMd5 = "25bae9e30657e2f64a45e5f690e3ae9e", Tracks = new[] { new TrackInfoTestExpected @@ -1625,8 +1625,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_multisession_dvd+r.mds", MediaType = MediaType.DVDROM, Sectors = 230624, - MD5 = "020993315e49ab0d36bc7248819162ea", - LongMD5 = "020993315e49ab0d36bc7248819162ea", + Md5 = "020993315e49ab0d36bc7248819162ea", + LongMd5 = "020993315e49ab0d36bc7248819162ea", Tracks = new[] { new TrackInfoTestExpected @@ -1654,8 +1654,8 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_multisession_dvd-r.mds", MediaType = MediaType.DVDROM, Sectors = 257264, - MD5 = "dff8f2107a4ea9633a88ce38ff609b8e", - LongMD5 = "dff8f2107a4ea9633a88ce38ff609b8e", + Md5 = "dff8f2107a4ea9633a88ce38ff609b8e", + LongMd5 = "dff8f2107a4ea9633a88ce38ff609b8e", Tracks = new[] { new TrackInfoTestExpected @@ -1683,9 +1683,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_multisession.mds", MediaType = MediaType.CDR, Sectors = 51168, - MD5 = "236f95016ad395ba691517d35a05b767", - LongMD5 = "8c48c8951229fd083c1aafcb3e062f2b", - SubchannelMD5 = "5731d17924f9fa8934c1e1ac076c6259", + Md5 = "236f95016ad395ba691517d35a05b767", + LongMd5 = "8c48c8951229fd083c1aafcb3e062f2b", + SubchannelMd5 = "5731d17924f9fa8934c1e1ac076c6259", Tracks = new[] { new TrackInfoTestExpected @@ -1803,9 +1803,9 @@ public class Alcohol120 : OpticalMediaImageTest TestFile = "test_videocd.mds", MediaType = MediaType.CDR, Sectors = 48794, - MD5 = "ab3cf9dfcc3e79c57e11e4675655d5e2", - LongMD5 = "cadb31c693c0996f50ba47e262d84518", - SubchannelMD5 = "4da6d2891fc0f916c1d6cd6eebe4586a", + Md5 = "ab3cf9dfcc3e79c57e11e4675655d5e2", + LongMd5 = "cadb31c693c0996f50ba47e262d84518", + SubchannelMd5 = "4da6d2891fc0f916c1d6cd6eebe4586a", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs index 65befdb70..60bb8c934 100644 --- a/Aaru.Tests/Images/Anex86.cs +++ b/Aaru.Tests/Images/Anex86.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.Anex86(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 40920, SectorSize = 256, - MD5 = "1c5387e38e58165c517c059e5d48905d" + Md5 = "1c5387e38e58165c517c059e5d48905d" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 61380, SectorSize = 256, - MD5 = "a84366658c1c3bd09af4d0d42fbf716e" + Md5 = "a84366658c1c3bd09af4d0d42fbf716e" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 81840, SectorSize = 256, - MD5 = "919c9eecf1b65b10870f617cb976668a" + Md5 = "919c9eecf1b65b10870f617cb976668a" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 121770, SectorSize = 256, - MD5 = "02d35af02581afb2e56792dcaba2c1af" + Md5 = "02d35af02581afb2e56792dcaba2c1af" }, new BlockImageTestExpected { @@ -79,7 +79,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 162360, SectorSize = 256, - MD5 = "b8c3f858f1a9d300d3e74f36eea04354" + Md5 = "b8c3f858f1a9d300d3e74f36eea04354" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 20196, SectorSize = 256, - MD5 = "c348bbbaf99fcb8c8e66de157aef62f4" + Md5 = "c348bbbaf99fcb8c8e66de157aef62f4" }, new BlockImageTestExpected { @@ -95,7 +95,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "c3587f7020743067cf948c9d5c5edb27" + Md5 = "c3587f7020743067cf948c9d5c5edb27" }, new BlockImageTestExpected { @@ -103,7 +103,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "a23874a4474334b035a24c6924140744" + Md5 = "a23874a4474334b035a24c6924140744" /* TODO: NullReferenceException Partitions = new[] { @@ -121,7 +121,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "bc1ef3236e75cb09575037b884ee9dce", + Md5 = "bc1ef3236e75cb09575037b884ee9dce", Partitions = new[] { new BlockPartitionVolumes @@ -137,7 +137,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "243036c4617b666a6c886cc23d7274e0", + Md5 = "243036c4617b666a6c886cc23d7274e0", Partitions = new[] { new BlockPartitionVolumes @@ -153,7 +153,7 @@ public class Anex86 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "09bb2ff964a0c5c223a1900f085e3955", + Md5 = "09bb2ff964a0c5c223a1900f085e3955", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/AppleDOS/DOS.cs b/Aaru.Tests/Images/AppleDOS/DOS.cs index a7815829b..683d03097 100644 --- a/Aaru.Tests/Images/AppleDOS/DOS.cs +++ b/Aaru.Tests/Images/AppleDOS/DOS.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class DOS : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS Order"); - public override IMediaImage _plugin => new AppleDos(); + public override IMediaImage Plugin => new AppleDos(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "ddd04ef378552c789f85382b4f49da06" + Md5 = "ddd04ef378552c789f85382b4f49da06" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "5158e2fe9d8e7ae1f7db73156478e4f4" + Md5 = "5158e2fe9d8e7ae1f7db73156478e4f4" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "193c5cc22f07e5aeb96eb187cb59c2d9" + Md5 = "193c5cc22f07e5aeb96eb187cb59c2d9" }, new BlockImageTestExpected { @@ -96,7 +96,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "23f42e529c9fde2a8033f1bc6a7bca93" + Md5 = "23f42e529c9fde2a8033f1bc6a7bca93" }, new BlockImageTestExpected { @@ -104,7 +104,7 @@ public class DOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "a7ec980472c320da5ea6f2f0aec0f502" + Md5 = "a7ec980472c320da5ea6f2f0aec0f502" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/AppleDOS/DOS32.cs b/Aaru.Tests/Images/AppleDOS/DOS32.cs index 168038c14..e62712a4b 100644 --- a/Aaru.Tests/Images/AppleDOS/DOS32.cs +++ b/Aaru.Tests/Images/AppleDOS/DOS32.cs @@ -39,7 +39,7 @@ public class DOS32 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS 13 sectors"); - public override IMediaImage _plugin => new AppleDos(); + public override IMediaImage Plugin => new AppleDos(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class DOS32 : BlockMediaImageTest MediaType = MediaType.Apple32SS, Sectors = 455, SectorSize = 256, - MD5 = "76f8fe4c5bc1976f99641ad7cdf53109", + Md5 = "76f8fe4c5bc1976f99641ad7cdf53109", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/AppleDOS/ProDOS.cs b/Aaru.Tests/Images/AppleDOS/ProDOS.cs index 1eb27af56..11d0dcd25 100644 --- a/Aaru.Tests/Images/AppleDOS/ProDOS.cs +++ b/Aaru.Tests/Images/AppleDOS/ProDOS.cs @@ -39,7 +39,7 @@ public class ProDOS : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple ProDOS Order"); - public override IMediaImage _plugin => new AppleDos(); + public override IMediaImage Plugin => new AppleDos(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "2c0b397aa3fe23a52cf7908340739f78" + Md5 = "2c0b397aa3fe23a52cf7908340739f78" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "ddd04ef378552c789f85382b4f49da06" + Md5 = "ddd04ef378552c789f85382b4f49da06" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "5158e2fe9d8e7ae1f7db73156478e4f4" + Md5 = "5158e2fe9d8e7ae1f7db73156478e4f4" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -97,7 +97,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "55ff5838139c0e8fa3f904397dc22fa5" + Md5 = "55ff5838139c0e8fa3f904397dc22fa5" }, new BlockImageTestExpected { @@ -105,7 +105,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "137463bc1f758fb8f2c354b02603817b" + Md5 = "137463bc1f758fb8f2c354b02603817b" }, new BlockImageTestExpected { @@ -113,7 +113,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "193c5cc22f07e5aeb96eb187cb59c2d9" + Md5 = "193c5cc22f07e5aeb96eb187cb59c2d9" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "26d9c57e262f61c4eb6c150eefafe4c0" + Md5 = "26d9c57e262f61c4eb6c150eefafe4c0" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class ProDOS : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/AppleNIB.cs b/Aaru.Tests/Images/AppleNIB.cs index 68c3d4bfe..8bd3849fe 100644 --- a/Aaru.Tests/Images/AppleNIB.cs +++ b/Aaru.Tests/Images/AppleNIB.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class AppleNib : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles"); - public override IMediaImage _plugin => new DiscImages.AppleNib(); + public override IMediaImage Plugin => new DiscImages.AppleNib(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class AppleNib : BlockMediaImageTest MediaType = MediaType.Apple32SS, Sectors = 455, SectorSize = 256, - MD5 = "76f8fe4c5bc1976f99641ad7cdf53109", + Md5 = "76f8fe4c5bc1976f99641ad7cdf53109", Partitions = new[] { new BlockPartitionVolumes @@ -63,7 +63,7 @@ public class AppleNib : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "0ffcbd4180306192726926b43755db2f", + Md5 = "0ffcbd4180306192726926b43755db2f", Partitions = new[] { new BlockPartitionVolumes @@ -79,7 +79,7 @@ public class AppleNib : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "4c4926103a32ac15f7e430ec3ced4be5" + Md5 = "4c4926103a32ac15f7e430ec3ced4be5" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class AppleNib : BlockMediaImageTest MediaType = MediaType.Apple33SS, Sectors = 560, SectorSize = 256, - MD5 = "11ef56c80c94347d2e3f921d5c36c8de" + Md5 = "11ef56c80c94347d2e3f921d5c36c8de" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/Apridisk.cs b/Aaru.Tests/Images/Apridisk.cs index ba46d5fdb..1ed834ed9 100644 --- a/Aaru.Tests/Images/Apridisk.cs +++ b/Aaru.Tests/Images/Apridisk.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class Apridisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk"); - public override IMediaImage _plugin => new DiscImages.Apridisk(); + public override IMediaImage Plugin => new DiscImages.Apridisk(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class Apridisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "6c264287a3260a6d89e36dfcb1c98dce", + Md5 = "6c264287a3260a6d89e36dfcb1c98dce", Partitions = new[] { new BlockPartitionVolumes @@ -63,7 +63,7 @@ public class Apridisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "dd8e04939baeb0fcdb11ddade60c9a93", + Md5 = "dd8e04939baeb0fcdb11ddade60c9a93", Partitions = new[] { new BlockPartitionVolumes @@ -79,7 +79,7 @@ public class Apridisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "89132d303ef6b0ff69f4cfd38e2a22a6", + Md5 = "89132d303ef6b0ff69f4cfd38e2a22a6", Partitions = new[] { new BlockPartitionVolumes @@ -95,7 +95,7 @@ public class Apridisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "cd34832ca3aa7f55e0dd8ba126372f97", + Md5 = "cd34832ca3aa7f55e0dd8ba126372f97", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/BaseMediaImageTest.cs b/Aaru.Tests/Images/BaseMediaImageTest.cs index b4df8a55f..9eb774c67 100644 --- a/Aaru.Tests/Images/BaseMediaImageTest.cs +++ b/Aaru.Tests/Images/BaseMediaImageTest.cs @@ -5,5 +5,5 @@ using Aaru.CommonTypes.Interfaces; public abstract class BaseMediaImageTest { public abstract string DataFolder { get; } - public abstract IMediaImage _plugin { 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 92073390e..63eab8159 100644 --- a/Aaru.Tests/Images/BlindWrite4.cs +++ b/Aaru.Tests/Images/BlindWrite4.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class BlindWrite4 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 4"); - public override IMediaImage _plugin => new DiscImages.BlindWrite4(); + public override IMediaImage Plugin => new DiscImages.BlindWrite4(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,9 +46,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.BWT", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "e202d6851822b03b537f7b356e61ebcc", - LongMD5 = "e202d6851822b03b537f7b356e61ebcc", - SubchannelMD5 = "b158732e5396be73a25e2a12bce4ec28", + Md5 = "e202d6851822b03b537f7b356e61ebcc", + LongMd5 = "e202d6851822b03b537f7b356e61ebcc", + SubchannelMd5 = "b158732e5396be73a25e2a12bce4ec28", Tracks = new[] { new TrackInfoTestExpected @@ -234,9 +234,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "report_audiocd.BWT", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "2cf7f3f06c28032f7609aaab970c001f", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "2cf7f3f06c28032f7609aaab970c001f", Tracks = new[] { new TrackInfoTestExpected @@ -358,9 +358,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "report_cdr.BWT", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "00c0dd9095dcc8ac17246dd56d2a368c", Tracks = new[] { new TrackInfoTestExpected @@ -396,9 +396,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "report_cdrom.BWT", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "00c0dd9095dcc8ac17246dd56d2a368c", Tracks = new[] { new TrackInfoTestExpected @@ -434,9 +434,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "report_cdrw.BWT", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "3aa50e929756b926e7471255fd1aa894", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "3aa50e929756b926e7471255fd1aa894", Tracks = new[] { new TrackInfoTestExpected @@ -466,9 +466,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "report_enhancedcd.BWT", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "c15f0beeed08f943cfc50c3246334dd2", - LongMD5 = "1aab899e2965a74763b1bb232ff8bf21", - SubchannelMD5 = "d5a424eedad28620468f215d5b24d453", + Md5 = "c15f0beeed08f943cfc50c3246334dd2", + LongMd5 = "1aab899e2965a74763b1bb232ff8bf21", + SubchannelMd5 = "d5a424eedad28620468f215d5b24d453", Tracks = new[] { new TrackInfoTestExpected @@ -601,9 +601,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.BWT", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - SubchannelMD5 = "4637654a333c5917232b343ba465fba0", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", + SubchannelMd5 = "4637654a333c5917232b343ba465fba0", Tracks = new[] { new TrackInfoTestExpected @@ -701,9 +701,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_enhancedcd.BWT", MediaType = MediaType.CDPLUS, Sectors = 59206, - MD5 = "c0cdd94f1488226d37f0398eef75eb4c", - LongMD5 = "843302a664a074dc4c02b27e53eb228a", - SubchannelMD5 = "fd13f0194b8e141d4384abf1ad00fbf2", + Md5 = "c0cdd94f1488226d37f0398eef75eb4c", + LongMd5 = "843302a664a074dc4c02b27e53eb228a", + SubchannelMd5 = "fd13f0194b8e141d4384abf1ad00fbf2", Tracks = new[] { new TrackInfoTestExpected @@ -748,9 +748,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.BWT", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "f95d6f978ddb4f98bbffda403f627fe1", - LongMD5 = "6751e0ae7821f92221672b1cd5a1ff36", - SubchannelMD5 = "d651d48c8839ad94f0a285660999db00", + Md5 = "f95d6f978ddb4f98bbffda403f627fe1", + LongMd5 = "6751e0ae7821f92221672b1cd5a1ff36", + SubchannelMd5 = "d651d48c8839ad94f0a285660999db00", Tracks = new[] { new TrackInfoTestExpected @@ -787,9 +787,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.BWT", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "a34e29e42b60023a6ae59f37d2bd4bea", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "00045e5e72d806f84fb363e4ae73cf46", + Md5 = "a34e29e42b60023a6ae59f37d2bd4bea", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "00045e5e72d806f84fb363e4ae73cf46", Tracks = new[] { new TrackInfoTestExpected @@ -938,9 +938,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_multiple_indexes.BWT", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - SubchannelMD5 = "2ff4170eafb73c4be3a81c35f37e9c3d", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", + SubchannelMd5 = "2ff4170eafb73c4be3a81c35f37e9c3d", Tracks = new[] { new TrackInfoTestExpected @@ -990,9 +990,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_multisession.BWT", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "3e646a04eb29a8e0ad892b6ac00ba962", - SubchannelMD5 = "b0b18100d5d38211f057bd3781407fc6", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "3e646a04eb29a8e0ad892b6ac00ba962", + SubchannelMd5 = "b0b18100d5d38211f057bd3781407fc6", Tracks = new[] { new TrackInfoTestExpected @@ -1110,9 +1110,9 @@ public class BlindWrite4 : OpticalMediaImageTest TestFile = "test_videocd.BWT", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "67ed7ec2aac06b56b4d693146d64adb7", - LongMD5 = "84c5329e55e3cc8c125c636c71ba2c17", - SubchannelMD5 = "5027417c4cbb4975482b902c57232dfb", + Md5 = "67ed7ec2aac06b56b4d693146d64adb7", + LongMd5 = "84c5329e55e3cc8c125c636c71ba2c17", + SubchannelMd5 = "5027417c4cbb4975482b902c57232dfb", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs index 71175b523..abecbbf50 100644 --- a/Aaru.Tests/Images/BlindWrite5.cs +++ b/Aaru.Tests/Images/BlindWrite5.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class BlindWrite5 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 5"); - public override IMediaImage _plugin => new DiscImages.BlindWrite5(); + public override IMediaImage Plugin => new DiscImages.BlindWrite5(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,8 +46,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "dvdrom.B5T", MediaType = MediaType.DVDROM, Sectors = 2287072, - MD5 = "b9b0b4318e6264c405c3f96128901815", - LongMD5 = "b9b0b4318e6264c405c3f96128901815", + Md5 = "b9b0b4318e6264c405c3f96128901815", + LongMd5 = "b9b0b4318e6264c405c3f96128901815", Tracks = new[] { new TrackInfoTestExpected @@ -75,9 +75,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "gigarec.B5T", MediaType = MediaType.CDR, Sectors = 469652, - MD5 = "e2e967adc0e5c530964ac4eebe8cac47", - LongMD5 = "1dc7801008110af6b8015aad64d91739", - SubchannelMD5 = "26c27541d0d55fe9a87f3f7de622466d", + Md5 = "e2e967adc0e5c530964ac4eebe8cac47", + LongMd5 = "1dc7801008110af6b8015aad64d91739", + SubchannelMd5 = "26c27541d0d55fe9a87f3f7de622466d", Tracks = new[] { new TrackInfoTestExpected @@ -106,8 +106,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "jaguarcd.B5T", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "3dd5bd0f7d95a40d411761d69255567a", - LongMD5 = "3dd5bd0f7d95a40d411761d69255567a", + Md5 = "3dd5bd0f7d95a40d411761d69255567a", + LongMd5 = "3dd5bd0f7d95a40d411761d69255567a", Tracks = new[] { new TrackInfoTestExpected @@ -205,8 +205,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "pcengine.B5T", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "4f5165069b3c5f11afe5f59711bd945d", - LongMD5 = "fd30db9486f67654179c90c8a5052edb", + Md5 = "4f5165069b3c5f11afe5f59711bd945d", + LongMd5 = "fd30db9486f67654179c90c8a5052edb", Tracks = new[] { new TrackInfoTestExpected @@ -354,8 +354,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "pcfx.B5T", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "c1bc8de499756453d1387542bb32bb4d", - LongMD5 = "455ec326506d2c5b974c4617c1010796", + Md5 = "c1bc8de499756453d1387542bb32bb4d", + LongMd5 = "455ec326506d2c5b974c4617c1010796", Tracks = new[] { new TrackInfoTestExpected @@ -441,8 +441,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "report_audiocd.B5T", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", Tracks = new[] { new TrackInfoTestExpected @@ -564,9 +564,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "report_cdr.B5T", MediaType = MediaType.CDR, Sectors = 254265, - MD5 = "65e79ef740833188a0f5be19da14c09d", - LongMD5 = "47b32c32a6427ad1e6b4b1bd047df716", - SubchannelMD5 = "f2246afbf3dfbcad5acd2c85134b568e", + Md5 = "65e79ef740833188a0f5be19da14c09d", + LongMd5 = "47b32c32a6427ad1e6b4b1bd047df716", + SubchannelMd5 = "f2246afbf3dfbcad5acd2c85134b568e", Tracks = new[] { new TrackInfoTestExpected @@ -602,9 +602,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "report_cdrom.B5T", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "7a01c3f2fe95664ef5726b3ad9597282", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "7a01c3f2fe95664ef5726b3ad9597282", Tracks = new[] { new TrackInfoTestExpected @@ -640,9 +640,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "report_cdrw_2x.B5T", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "6da685990c9b366bf49d556dc3e1db08", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "6da685990c9b366bf49d556dc3e1db08", Tracks = new[] { new TrackInfoTestExpected @@ -672,8 +672,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.B5T", MediaType = MediaType.CDR, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", Tracks = new[] { new TrackInfoTestExpected @@ -771,9 +771,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_enhancedcd.B5T", MediaType = MediaType.CDR, Sectors = 59206, - MD5 = "3736dbfcb7bf5648e3ac067379087001", - LongMD5 = "c2dfd5a32678c3ff049c143c98ad36a5", - SubchannelMD5 = "f486c17d8b43d802e8f00637d4b27de1", + Md5 = "3736dbfcb7bf5648e3ac067379087001", + LongMd5 = "c2dfd5a32678c3ff049c143c98ad36a5", + SubchannelMd5 = "f486c17d8b43d802e8f00637d4b27de1", Tracks = new[] { new TrackInfoTestExpected @@ -818,9 +818,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.B5T", MediaType = MediaType.CDR, Sectors = 350134, - MD5 = "901e4fe17ea6591b1fd53ba822428ef4", - LongMD5 = "7b489457540c40037aabcf3f21e0201e", - SubchannelMD5 = "51f7e060a5d85539bfea0fd7aa3ee107", + Md5 = "901e4fe17ea6591b1fd53ba822428ef4", + LongMd5 = "7b489457540c40037aabcf3f21e0201e", + SubchannelMd5 = "51f7e060a5d85539bfea0fd7aa3ee107", Tracks = new[] { new TrackInfoTestExpected @@ -857,8 +857,8 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_multiple_indexes.B5T", MediaType = MediaType.CDR, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", Tracks = new[] { new TrackInfoTestExpected @@ -908,9 +908,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_multisession.B5T", MediaType = MediaType.CDR, Sectors = 51168, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "3e646a04eb29a8e0ad892b6ac00ba962", - SubchannelMD5 = "94c9b99c0ca454bbbb399da2b7e4c86d", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "3e646a04eb29a8e0ad892b6ac00ba962", + SubchannelMd5 = "94c9b99c0ca454bbbb399da2b7e4c86d", Tracks = new[] { new TrackInfoTestExpected @@ -1028,9 +1028,9 @@ public class BlindWrite5 : OpticalMediaImageTest TestFile = "test_videocd.B5T", MediaType = MediaType.CDR, Sectors = 48794, - MD5 = "203a40d27b9bee018705c2df8d15e96d", - LongMD5 = "a686cade367db0a12fef1d9862f39e1d", - SubchannelMD5 = "177b666c1fb45c85f5a2bfe690046802", + Md5 = "203a40d27b9bee018705c2df8d15e96d", + LongMd5 = "a686cade367db0a12fef1d9862f39e1d", + SubchannelMd5 = "177b666c1fb45c85f5a2bfe690046802", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs index d7fb3e63c..2e0274c52 100644 --- a/Aaru.Tests/Images/BlindWrite6.cs +++ b/Aaru.Tests/Images/BlindWrite6.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class BlindWrite6 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 6"); - public override IMediaImage _plugin => new DiscImages.BlindWrite5(); + public override IMediaImage Plugin => new DiscImages.BlindWrite5(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,8 +46,8 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "dvdrom.B6T", MediaType = MediaType.DVDROM, Sectors = 2287072, - MD5 = "7272cae103a922910a09fdb6a6841dff", - LongMD5 = "7272cae103a922910a09fdb6a6841dff", + Md5 = "7272cae103a922910a09fdb6a6841dff", + LongMd5 = "7272cae103a922910a09fdb6a6841dff", Tracks = new[] { new TrackInfoTestExpected @@ -75,8 +75,8 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "jaguarcd.B6T", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "3dd5bd0f7d95a40d411761d69255567a", - LongMD5 = "3dd5bd0f7d95a40d411761d69255567a", + Md5 = "3dd5bd0f7d95a40d411761d69255567a", + LongMd5 = "3dd5bd0f7d95a40d411761d69255567a", Tracks = new[] { new TrackInfoTestExpected @@ -174,8 +174,8 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "pcengine.B6T", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "4f5165069b3c5f11afe5f59711bd945d", - LongMD5 = "fd30db9486f67654179c90c8a5052edb", + Md5 = "4f5165069b3c5f11afe5f59711bd945d", + LongMd5 = "fd30db9486f67654179c90c8a5052edb", Tracks = new[] { new TrackInfoTestExpected @@ -323,8 +323,8 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "pcfx.B6T", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "c1bc8de499756453d1387542bb32bb4d", - LongMD5 = "455ec326506d2c5b974c4617c1010796", + Md5 = "c1bc8de499756453d1387542bb32bb4d", + LongMd5 = "455ec326506d2c5b974c4617c1010796", Tracks = new[] { new TrackInfoTestExpected @@ -410,9 +410,9 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "report_cdr.B6T", MediaType = MediaType.CDR, Sectors = 254265, - MD5 = "63c99a087570b8936bb55156f5502f38", - LongMD5 = "368c06d4b42ed581f3ad7f6ad57f70f6", - SubchannelMD5 = "9c231e680e601cd10bb61fb519f00c84", + Md5 = "63c99a087570b8936bb55156f5502f38", + LongMd5 = "368c06d4b42ed581f3ad7f6ad57f70f6", + SubchannelMd5 = "9c231e680e601cd10bb61fb519f00c84", Tracks = new[] { new TrackInfoTestExpected @@ -448,9 +448,9 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "report_cdrom.B6T", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "46b6244ed63434cb0f91e0610c63fec8", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "46b6244ed63434cb0f91e0610c63fec8", Tracks = new[] { new TrackInfoTestExpected @@ -486,9 +486,9 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "report_cdrw_2x.B6T", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "19f74cd5f05894203465374111be2aa7", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "19f74cd5f05894203465374111be2aa7", Tracks = new[] { new TrackInfoTestExpected @@ -518,9 +518,9 @@ public class BlindWrite6 : OpticalMediaImageTest TestFile = "test_karaoke_multi_sampler.B6T", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "a34e29e42b60023a6ae59f37d2bd4bea", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "485a233924c003a1ab2ea9228f582344", + Md5 = "a34e29e42b60023a6ae59f37d2bd4bea", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "485a233924c003a1ab2ea9228f582344", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs index 5cf578e9a..34fde1d20 100644 --- a/Aaru.Tests/Images/BlindWrite7.cs +++ b/Aaru.Tests/Images/BlindWrite7.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class BlindWrite7 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 7"); - public override IMediaImage _plugin => new DiscImages.BlindWrite5(); + public override IMediaImage Plugin => new DiscImages.BlindWrite5(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,8 +47,8 @@ public class BlindWrite7 : OpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 254265, SectorSize = 2048, - MD5 = "86b8a763ef6522fccf97f743d7bf4fa3", - LongMD5 = "a292359cce05849dec1d06ae471ecf9e", + Md5 = "86b8a763ef6522fccf97f743d7bf4fa3", + LongMd5 = "a292359cce05849dec1d06ae471ecf9e", Tracks = new[] { new TrackInfoTestExpected @@ -85,8 +85,8 @@ public class BlindWrite7 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -123,8 +123,8 @@ public class BlindWrite7 : OpticalMediaImageTest MediaType = MediaType.CDRW, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/BlockMediaImageTest.cs b/Aaru.Tests/Images/BlockMediaImageTest.cs index 6b969a128..817a0dffe 100644 --- a/Aaru.Tests/Images/BlockMediaImageTest.cs +++ b/Aaru.Tests/Images/BlockMediaImageTest.cs @@ -43,7 +43,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -87,7 +87,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -119,7 +119,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest ctx.Update(sector); } - Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}"); + Assert.AreEqual(test.Md5, ctx.End(), $"Hash: {testFile}"); } }); } @@ -151,7 +151,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs index bae8c956b..2417a9e9e 100644 --- a/Aaru.Tests/Images/CDRWin.cs +++ b/Aaru.Tests/Images/CDRWin.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] 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 IMediaImage Plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,8 +49,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "pcengine.cue", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "875ea735f0d10d6fa321fb222714117b", - LongMD5 = "0188cf74fdc367a8e370bbe236a5100c", + Md5 = "875ea735f0d10d6fa321fb222714117b", + LongMd5 = "0188cf74fdc367a8e370bbe236a5100c", Tracks = new[] { new TrackInfoTestExpected @@ -206,8 +208,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "pcfx.cue", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "d2fbcb46735a5ac90c10f81ca564c9dd", - LongMD5 = "f10ae52c1a530ba3ed49447417d9451e", + Md5 = "d2fbcb46735a5ac90c10f81ca564c9dd", + LongMd5 = "f10ae52c1a530ba3ed49447417d9451e", Tracks = new[] { new TrackInfoTestExpected @@ -293,8 +295,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "report_audiocd.cue", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", Tracks = new[] { new TrackInfoTestExpected @@ -416,8 +418,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "report_cdr.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -453,8 +455,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "report_cdrw.cue", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -484,8 +486,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.cue", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", Tracks = new[] { new TrackInfoTestExpected @@ -583,8 +585,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.cue", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "13d4c3def37e968b2ddc5cf5a9f18fdc", - LongMD5 = "31e772f6997eb8dbf3ecf9aca9ea6bc6", + Md5 = "13d4c3def37e968b2ddc5cf5a9f18fdc", + LongMd5 = "31e772f6997eb8dbf3ecf9aca9ea6bc6", Tracks = new[] { new TrackInfoTestExpected @@ -621,8 +623,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "397d93a649a2a502cf831b49771a2c35", - LongMD5 = "c92ec0c7671b1b992d94a726ea10a238", + Md5 = "397d93a649a2a502cf831b49771a2c35", + LongMd5 = "c92ec0c7671b1b992d94a726ea10a238", Tracks = new[] { new TrackInfoTestExpected @@ -771,8 +773,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "test_multiple_indexes.cue", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", Tracks = new[] { new TrackInfoTestExpected @@ -822,8 +824,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "test_videocd.cue", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "0d80890beeadf3f6e2cf2f88d0067afe", - LongMD5 = "96ac6c364e4c3cb2f043197a45a97183", + Md5 = "0d80890beeadf3f6e2cf2f88d0067afe", + LongMd5 = "96ac6c364e4c3cb2f043197a45a97183", Tracks = new[] { new TrackInfoTestExpected @@ -860,9 +862,9 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cdg_report_audiocd.cue", MediaType = MediaType.CDG, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "1d0e4118993a75311fe774e46326306a", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "1d0e4118993a75311fe774e46326306a", Tracks = new[] { new TrackInfoTestExpected @@ -984,9 +986,9 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cdg_test_multi_karaoke_sampler.cue", MediaType = MediaType.CDG, Sectors = 329158, - MD5 = "be1bdbd55883dd53397ea21715107706", - LongMD5 = "3d3a8e2243f40201c6bdc5c10a65bb76", - SubchannelMD5 = "f9794c8d8ab2c7bf7815e740a77b12f4", + Md5 = "be1bdbd55883dd53397ea21715107706", + LongMd5 = "3d3a8e2243f40201c6bdc5c10a65bb76", + SubchannelMd5 = "f9794c8d8ab2c7bf7815e740a77b12f4", Tracks = new[] { new TrackInfoTestExpected @@ -1135,9 +1137,9 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cooked_cdg_test_multi_karaoke_sampler.cue", MediaType = MediaType.CDG, Sectors = 329158, - MD5 = "215c0b3efab1b04e4f2d35b323cdbc96", - LongMD5 = "296cfef5de90e1cfadaf2ecf41f2e184", - SubchannelMD5 = "536ebf5b21280a721dc0604739ca7db3", + Md5 = "215c0b3efab1b04e4f2d35b323cdbc96", + LongMd5 = "296cfef5de90e1cfadaf2ecf41f2e184", + SubchannelMd5 = "536ebf5b21280a721dc0604739ca7db3", Tracks = new[] { new TrackInfoTestExpected @@ -1286,8 +1288,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cooked_report_cdrom.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -1323,8 +1325,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cooked_report_cdrw.cue", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -1354,8 +1356,8 @@ public class CDRWin : OpticalMediaImageTest TestFile = "cooked_test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "bb1ace550c0a22f18c32bd053739d6ce", - LongMD5 = "857b80195d1e29bd0bace2ef20b733ed", + Md5 = "bb1ace550c0a22f18c32bd053739d6ce", + LongMd5 = "857b80195d1e29bd0bace2ef20b733ed", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/CDRWin10.cs b/Aaru.Tests/Images/CDRWin10.cs index f9679691c..d9d2ed91f 100644 --- a/Aaru.Tests/Images/CDRWin10.cs +++ b/Aaru.Tests/Images/CDRWin10.cs @@ -28,16 +28,18 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class CDRWin10 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10"); - public override IMediaImage _plugin => new DiscImages.Alcohol120(); + public override IMediaImage Plugin => new DiscImages.Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,9 +48,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "report_audiocd.xmd", MediaType = MediaType.CDROMXA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "d4075209391c6955f438d0fa6095c6e2", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "d4075209391c6955f438d0fa6095c6e2", Tracks = new[] { new TrackInfoTestExpected @@ -170,9 +172,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "report_cdrom.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "811058470f33be5988ea1c2627200039", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "811058470f33be5988ea1c2627200039", Tracks = new[] { new TrackInfoTestExpected @@ -208,9 +210,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "report_cdrw_2x.xmd", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "6d0cd8e56dada05a86a4abd10f77e054", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "6d0cd8e56dada05a86a4abd10f77e054", Tracks = new[] { new TrackInfoTestExpected @@ -240,9 +242,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "report_cdr.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "d814823071e3671fbf204e5bf063f432", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "d814823071e3671fbf204e5bf063f432", Tracks = new[] { new TrackInfoTestExpected @@ -278,9 +280,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "report_enhancedcd.xmd", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "557b9658671c16602e635f157b7525db", - LongMD5 = "76454ac3a025857dc41e05c430783eab", - SubchannelMD5 = "5a33440f5c51acff1921e92269978645", + Md5 = "557b9658671c16602e635f157b7525db", + LongMd5 = "76454ac3a025857dc41e05c430783eab", + SubchannelMd5 = "5a33440f5c51acff1921e92269978645", Tracks = new[] { new TrackInfoTestExpected @@ -413,9 +415,9 @@ public class CDRWin10 : OpticalMediaImageTest TestFile = "test_karaoke_multi_sampler.xmd", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "9a19aa0df066732a8ec34025e8160248", - LongMD5 = "f4adafc5f2bdda2e4d70dce667cf47c1", - SubchannelMD5 = "b349f26946197859f6a0ef5c3881b8ca", + Md5 = "9a19aa0df066732a8ec34025e8160248", + LongMd5 = "f4adafc5f2bdda2e4d70dce667cf47c1", + SubchannelMd5 = "b349f26946197859f6a0ef5c3881b8ca", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/CPCDSK.cs b/Aaru.Tests/Images/CPCDSK.cs index 57c8fa836..f3588875e 100644 --- a/Aaru.Tests/Images/CPCDSK.cs +++ b/Aaru.Tests/Images/CPCDSK.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] 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 IMediaImage Plugin => new Cpcdsk(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +50,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "ee601c0d2beade20bb5c04b3f5800ff6", + Md5 = "ee601c0d2beade20bb5c04b3f5800ff6", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +66,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "ee601c0d2beade20bb5c04b3f5800ff6", + Md5 = "ee601c0d2beade20bb5c04b3f5800ff6", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +82,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "dcb039b3b2ff2d6bdef8bf6c13ef3f83", + Md5 = "dcb039b3b2ff2d6bdef8bf6c13ef3f83", Partitions = new[] { new BlockPartitionVolumes @@ -96,7 +98,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "dcb039b3b2ff2d6bdef8bf6c13ef3f83", + Md5 = "dcb039b3b2ff2d6bdef8bf6c13ef3f83", Partitions = new[] { new BlockPartitionVolumes @@ -121,7 +123,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 387, SectorSize = 512, - MD5 = "82007217a3aa6bb91468b71a6dc4bfe5", + Md5 = "82007217a3aa6bb91468b71a6dc4bfe5", Partitions = new[] { new BlockPartitionVolumes @@ -137,7 +139,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "acd60bb0119e0b5aa1790bef344211ac", + Md5 = "acd60bb0119e0b5aa1790bef344211ac", Partitions = new[] { new BlockPartitionVolumes @@ -153,7 +155,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "0330956c2fe38f278d7cba6f7bd8aa2d", + Md5 = "0330956c2fe38f278d7cba6f7bd8aa2d", Partitions = new[] { new BlockPartitionVolumes @@ -169,7 +171,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 359, SectorSize = 512, - MD5 = "a568e44f556661f9e4b7db01c126c676" + Md5 = "a568e44f556661f9e4b7db01c126c676" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "5dc0d482a773043d8683a84c8220df95", + Md5 = "5dc0d482a773043d8683a84c8220df95", Partitions = new[] { new BlockPartitionVolumes @@ -193,7 +195,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "64edd62fabb381ef49bf3a8f43435824", + Md5 = "64edd62fabb381ef49bf3a8f43435824", Partitions = new[] { new BlockPartitionVolumes @@ -209,7 +211,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "b381bbc72ab664d658ddd5898c7ff266", + Md5 = "b381bbc72ab664d658ddd5898c7ff266", Partitions = new[] { new BlockPartitionVolumes @@ -225,7 +227,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "ad43345ac469844465da6d73369cc6b1", + Md5 = "ad43345ac469844465da6d73369cc6b1", Partitions = new[] { new BlockPartitionVolumes @@ -241,7 +243,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "6e4ab38fcc5dc2d8173173dcbf8ca2e1", + Md5 = "6e4ab38fcc5dc2d8173173dcbf8ca2e1", Partitions = new[] { new BlockPartitionVolumes @@ -257,7 +259,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 360, SectorSize = 512, - MD5 = "37cfac07eb636ca8181878a06101a955" + Md5 = "37cfac07eb636ca8181878a06101a955" }, new BlockImageTestExpected { @@ -265,7 +267,7 @@ public class CPCDSK : BlockMediaImageTest MediaType = MediaType.CompactFloppy, Sectors = 1440, SectorSize = 512, - MD5 = "17b79ecfd045d1d5d3526b182b32064a", + Md5 = "17b79ecfd045d1d5d3526b182b32064a", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/CisCopy/Uncompressed.cs b/Aaru.Tests/Images/CisCopy/Uncompressed.cs index 01174ba3e..49e9bbbc9 100644 --- a/Aaru.Tests/Images/CisCopy/Uncompressed.cs +++ b/Aaru.Tests/Images/CisCopy/Uncompressed.cs @@ -39,7 +39,7 @@ public class Uncompressed : BlockMediaImageTest { // TODO: Support compression public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy"); - public override IMediaImage _plugin => new CisCopy(); + public override IMediaImage Plugin => new CisCopy(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "95c0b76419c1c74db6dbe1d790f97dde", + Md5 = "95c0b76419c1c74db6dbe1d790f97dde", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "95c0b76419c1c74db6dbe1d790f97dde", + Md5 = "95c0b76419c1c74db6dbe1d790f97dde", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6f6507e416b7320d583dc347b8e57844", + Md5 = "6f6507e416b7320d583dc347b8e57844", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "48b93e8619c4c13f4a3724b550e4b371", + Md5 = "48b93e8619c4c13f4a3724b550e4b371", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "48b93e8619c4c13f4a3724b550e4b371", + Md5 = "48b93e8619c4c13f4a3724b550e4b371", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +129,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "1d060d2e2543e1c2e8569f5451660060", + Md5 = "1d060d2e2543e1c2e8569f5451660060", Partitions = new[] { new BlockPartitionVolumes @@ -145,7 +145,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "0c93155bbc5e412f5014e037d08c2745", + Md5 = "0c93155bbc5e412f5014e037d08c2745", Partitions = new[] { new BlockPartitionVolumes @@ -161,7 +161,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "0c93155bbc5e412f5014e037d08c2745", + Md5 = "0c93155bbc5e412f5014e037d08c2745", Partitions = new[] { new BlockPartitionVolumes @@ -177,7 +177,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "0c93155bbc5e412f5014e037d08c2745", + Md5 = "0c93155bbc5e412f5014e037d08c2745", Partitions = new[] { new BlockPartitionVolumes @@ -195,7 +195,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "d2a33090ec03bfb536e7356deacf4bbc" + Md5 = "d2a33090ec03bfb536e7356deacf4bbc" }, // TODO: False positive CP/M filesystem @@ -205,7 +205,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "d2a33090ec03bfb536e7356deacf4bbc" + Md5 = "d2a33090ec03bfb536e7356deacf4bbc" }, new BlockImageTestExpected { @@ -213,7 +213,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "d2a33090ec03bfb536e7356deacf4bbc" + Md5 = "d2a33090ec03bfb536e7356deacf4bbc" }, new BlockImageTestExpected { @@ -221,7 +221,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "181f3bc62f0b90f74af9d8027ebf7512", + Md5 = "181f3bc62f0b90f74af9d8027ebf7512", Partitions = new[] { new BlockPartitionVolumes @@ -237,7 +237,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "181f3bc62f0b90f74af9d8027ebf7512", + Md5 = "181f3bc62f0b90f74af9d8027ebf7512", Partitions = new[] { new BlockPartitionVolumes @@ -253,7 +253,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "181f3bc62f0b90f74af9d8027ebf7512", + Md5 = "181f3bc62f0b90f74af9d8027ebf7512", Partitions = new[] { new BlockPartitionVolumes @@ -269,7 +269,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "783559ee5e774515d5e7d2feab9c333e", + Md5 = "783559ee5e774515d5e7d2feab9c333e", Partitions = new[] { new BlockPartitionVolumes @@ -285,7 +285,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "783559ee5e774515d5e7d2feab9c333e", + Md5 = "783559ee5e774515d5e7d2feab9c333e", Partitions = new[] { new BlockPartitionVolumes @@ -301,7 +301,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "783559ee5e774515d5e7d2feab9c333e", + Md5 = "783559ee5e774515d5e7d2feab9c333e", Partitions = new[] { new BlockPartitionVolumes @@ -317,7 +317,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "91f3fde8d56a536cdda4c6758e5dbc93", + Md5 = "91f3fde8d56a536cdda4c6758e5dbc93", Partitions = new[] { new BlockPartitionVolumes @@ -333,7 +333,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "91f3fde8d56a536cdda4c6758e5dbc93", + Md5 = "91f3fde8d56a536cdda4c6758e5dbc93", Partitions = new[] { new BlockPartitionVolumes @@ -349,7 +349,7 @@ public class Uncompressed : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "91f3fde8d56a536cdda4c6758e5dbc93", + Md5 = "91f3fde8d56a536cdda4c6758e5dbc93", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs index 5dd2b54f6..036fe6470 100644 --- a/Aaru.Tests/Images/CloneCD.cs +++ b/Aaru.Tests/Images/CloneCD.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class CloneCD : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD"); - public override IMediaImage _plugin => new CloneCd(); + public override IMediaImage Plugin => new CloneCd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,9 +49,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "cdiready_theapprentice.ccd", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "a9412931e69111ba162d5d8b4822ac3f", - LongMD5 = "a9412931e69111ba162d5d8b4822ac3f", - SubchannelMD5 = "96f314754e66d95133308d5bb8573536", + Md5 = "a9412931e69111ba162d5d8b4822ac3f", + LongMd5 = "a9412931e69111ba162d5d8b4822ac3f", + SubchannelMd5 = "96f314754e66d95133308d5bb8573536", Tracks = new[] { new TrackInfoTestExpected @@ -235,9 +237,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "jaguarcd.ccd", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "530a6d7a9ce9b60f8c727d2db0f6039e", - LongMD5 = "530a6d7a9ce9b60f8c727d2db0f6039e", - SubchannelMD5 = "47d4397c640734f5f85fe0c843e480f8", + Md5 = "530a6d7a9ce9b60f8c727d2db0f6039e", + LongMd5 = "530a6d7a9ce9b60f8c727d2db0f6039e", + SubchannelMd5 = "47d4397c640734f5f85fe0c843e480f8", Tracks = new[] { new TrackInfoTestExpected @@ -335,9 +337,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "pcengine.ccd", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "127b0a92b00ea9a67df1ed8c80daadc7", - LongMD5 = "6ead3bdedb374f7b9bdf24773d30e491", - SubchannelMD5 = "315ee5ebb36969b4ce0fb0162f7a9932", + Md5 = "127b0a92b00ea9a67df1ed8c80daadc7", + LongMd5 = "6ead3bdedb374f7b9bdf24773d30e491", + SubchannelMd5 = "315ee5ebb36969b4ce0fb0162f7a9932", Tracks = new[] { new TrackInfoTestExpected @@ -485,9 +487,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "pcfx.ccd", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "9d538bd1ee1db068685ed59d29185941", - LongMD5 = "76f4bd63c13db3e44fbf7acda20f49e2", - SubchannelMD5 = "d9804e5f919ffb1531832049df8f0165", + Md5 = "9d538bd1ee1db068685ed59d29185941", + LongMd5 = "76f4bd63c13db3e44fbf7acda20f49e2", + SubchannelMd5 = "d9804e5f919ffb1531832049df8f0165", Tracks = new[] { new TrackInfoTestExpected @@ -573,9 +575,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_audiocd.ccd", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "b744ddaf1d4ebd3bd0b96a160f55637d", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "b744ddaf1d4ebd3bd0b96a160f55637d", Tracks = new[] { new TrackInfoTestExpected @@ -697,9 +699,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_cdrom.ccd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "c5ae648d586e55afd1108294c9b86ca6", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "c5ae648d586e55afd1108294c9b86ca6", Tracks = new[] { new TrackInfoTestExpected @@ -735,9 +737,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_cdrw_2x.ccd", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "c73559a91abd57f732c7ea609fef547a", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "c73559a91abd57f732c7ea609fef547a", Tracks = new[] { new TrackInfoTestExpected @@ -767,9 +769,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_enhancedcd.ccd", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "97e5bf1caf3998e818d40cd845c6ecc9", - LongMD5 = "07b4d88c8f38cc0168a2f5725b31c52e", - SubchannelMD5 = "a71264ddd9d364a4b1cd0ee4d4a7e1ad", + Md5 = "97e5bf1caf3998e818d40cd845c6ecc9", + LongMd5 = "07b4d88c8f38cc0168a2f5725b31c52e", + SubchannelMd5 = "a71264ddd9d364a4b1cd0ee4d4a7e1ad", Tracks = new[] { new TrackInfoTestExpected @@ -902,9 +904,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.ccd", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - SubchannelMD5 = "2a2918ad19f5bf1b6e52b57e40fe47eb", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", + SubchannelMd5 = "2a2918ad19f5bf1b6e52b57e40fe47eb", Tracks = new[] { new TrackInfoTestExpected @@ -1002,9 +1004,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_enhancedcd.ccd", MediaType = MediaType.CDPLUS, Sectors = 59206, - MD5 = "0ddda63b1cb61f8f961eabfa90737171", - LongMD5 = "666ec8a1213cf4f6adc4675d9dd5955a", - SubchannelMD5 = "d6184c3ac1966e61c528ae875627e65c", + Md5 = "0ddda63b1cb61f8f961eabfa90737171", + LongMd5 = "666ec8a1213cf4f6adc4675d9dd5955a", + SubchannelMd5 = "d6184c3ac1966e61c528ae875627e65c", Tracks = new[] { new TrackInfoTestExpected @@ -1049,9 +1051,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.ccd", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "f95d6f978ddb4f98bbffda403f627fe1", - LongMD5 = "6751e0ae7821f92221672b1cd5a1ff36", - SubchannelMD5 = "569c87cdc115f2d02b2268fc2b4d8b11", + Md5 = "f95d6f978ddb4f98bbffda403f627fe1", + LongMd5 = "6751e0ae7821f92221672b1cd5a1ff36", + SubchannelMd5 = "569c87cdc115f2d02b2268fc2b4d8b11", Tracks = new[] { new TrackInfoTestExpected @@ -1088,9 +1090,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_karaoke_multi_sampler.ccd", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "9a19aa0df066732a8ec34025e8160248", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "c48c09b8c7c4af99de1cf97faaef32fc", + Md5 = "9a19aa0df066732a8ec34025e8160248", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "c48c09b8c7c4af99de1cf97faaef32fc", Tracks = new[] { new TrackInfoTestExpected @@ -1239,9 +1241,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_multiple_indexes.ccd", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - SubchannelMD5 = "d374e82dfcbc4515c09a9a6e5955bf1d", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", + SubchannelMd5 = "d374e82dfcbc4515c09a9a6e5955bf1d", Tracks = new[] { new TrackInfoTestExpected @@ -1291,9 +1293,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_multisession.ccd", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "236f95016ad395ba691517d35a05b767", - LongMD5 = "8c48c8951229fd083c1aafcb3e062f2b", - SubchannelMD5 = "a49b0b2dcebcc4a106524cb7f0f3c331", + Md5 = "236f95016ad395ba691517d35a05b767", + LongMd5 = "8c48c8951229fd083c1aafcb3e062f2b", + SubchannelMd5 = "a49b0b2dcebcc4a106524cb7f0f3c331", Tracks = new[] { new TrackInfoTestExpected @@ -1392,9 +1394,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_videocd.ccd", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "b640eed2eba209ebba4e6cd3171883a4", - LongMD5 = "a1194d29dfb4e207eabf6208f908a213", - SubchannelMD5 = "712725733e44be46e55f16569659fd07", + Md5 = "b640eed2eba209ebba4e6cd3171883a4", + LongMd5 = "a1194d29dfb4e207eabf6208f908a213", + SubchannelMd5 = "712725733e44be46e55f16569659fd07", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/Commodore64/D64.cs b/Aaru.Tests/Images/Commodore64/D64.cs index a66b22874..a4825c90e 100644 --- a/Aaru.Tests/Images/Commodore64/D64.cs +++ b/Aaru.Tests/Images/Commodore64/D64.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class D64 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D64"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class D64 : BlockMediaImageTest MediaType = MediaType.CBM_1540, Sectors = 683, SectorSize = 256, - MD5 = "9205f7ccdb19cfbdb0b46d10e40b2a90" + Md5 = "9205f7ccdb19cfbdb0b46d10e40b2a90" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/Commodore64/D81.cs b/Aaru.Tests/Images/Commodore64/D81.cs index f7f8551ac..ef112c98c 100644 --- a/Aaru.Tests/Images/Commodore64/D81.cs +++ b/Aaru.Tests/Images/Commodore64/D81.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class D81 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D81"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class D81 : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 3200, SectorSize = 256, - MD5 = "e84d86b63e798747c42b27b58ab88665" + Md5 = "e84d86b63e798747c42b27b58ab88665" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs index 4cf6161f2..ef36c6226 100644 --- a/Aaru.Tests/Images/CopyQM.cs +++ b/Aaru.Tests/Images/CopyQM.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.CopyQm(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "e8bbbd22db87181974e12ba0227ea011" + Md5 = "e8bbbd22db87181974e12ba0227ea011" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "9f5635f3df4d880a500910b0ad1ab535" + Md5 = "9f5635f3df4d880a500910b0ad1ab535" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "9176f59e9205846b6212e084f46ed95c" + Md5 = "9176f59e9205846b6212e084f46ed95c" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -79,7 +79,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "1045bfd216ae1ae480dd0ef626f5ff39" + Md5 = "1045bfd216ae1ae480dd0ef626f5ff39" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "46fce47baf08c6f093f2c355a603543d" + Md5 = "46fce47baf08c6f093f2c355a603543d" }, new BlockImageTestExpected { @@ -95,7 +95,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "95ea232f59e44db374b994cfe7f1c07f", + Md5 = "95ea232f59e44db374b994cfe7f1c07f", Partitions = new[] { new BlockPartitionVolumes @@ -111,7 +111,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9e2b01f4397db2a6c76e2bc267df37b3" + Md5 = "9e2b01f4397db2a6c76e2bc267df37b3" }, new BlockImageTestExpected { @@ -119,7 +119,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "dbbf55398d930e14c2b0a035dd1277b9" + Md5 = "dbbf55398d930e14c2b0a035dd1277b9" }, new BlockImageTestExpected { @@ -127,7 +127,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "656002e6e620cb3b73c27f4c21d32edb" + Md5 = "656002e6e620cb3b73c27f4c21d32edb" }, new BlockImageTestExpected { @@ -135,7 +135,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1244cc2c101c66e6bb4ad5183b356b19" + Md5 = "1244cc2c101c66e6bb4ad5183b356b19" }, new BlockImageTestExpected { @@ -143,7 +143,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8cad624afc06ab756f9800eba22ee886" + Md5 = "8cad624afc06ab756f9800eba22ee886" }, new BlockImageTestExpected { @@ -151,7 +151,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "84cce7b4d8c8e21040163cd2d03a730c" + Md5 = "84cce7b4d8c8e21040163cd2d03a730c" }, new BlockImageTestExpected { @@ -159,7 +159,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 1024, - MD5 = "76a1ef9485ffd5da1e9836725e375ada" + Md5 = "76a1ef9485ffd5da1e9836725e375ada" }, new BlockImageTestExpected { @@ -167,7 +167,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d236783dfd1dc29f350c51949b1e9e68" + Md5 = "d236783dfd1dc29f350c51949b1e9e68" }, new BlockImageTestExpected { @@ -175,7 +175,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "6915f208cdda762eea2fe64ad754e72f" + Md5 = "6915f208cdda762eea2fe64ad754e72f" }, new BlockImageTestExpected { @@ -183,7 +183,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "b52f26c3c5b9b2cfc93a287a7fca3548" + Md5 = "b52f26c3c5b9b2cfc93a287a7fca3548" }, new BlockImageTestExpected { @@ -191,7 +191,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2302991363cb3681cffdc4388915b51e", + Md5 = "2302991363cb3681cffdc4388915b51e", Partitions = new[] { new BlockPartitionVolumes @@ -207,7 +207,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4e4cafed1cc22ea72201169427e5e1b6" + Md5 = "4e4cafed1cc22ea72201169427e5e1b6" }, new BlockImageTestExpected { @@ -215,7 +215,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "a579b349a5a24218d59a44e36bdb1333" + Md5 = "a579b349a5a24218d59a44e36bdb1333" }, new BlockImageTestExpected { @@ -223,7 +223,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 1024, - MD5 = "3135430552171a832339a8a93d44cc90" + Md5 = "3135430552171a832339a8a93d44cc90" }, new BlockImageTestExpected { @@ -231,7 +231,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1a4c7487382c98b7bc74623ddfb488e6" + Md5 = "1a4c7487382c98b7bc74623ddfb488e6" }, new BlockImageTestExpected { @@ -239,7 +239,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 576, SectorSize = 1024, - MD5 = "a8a9caa886a338b66181cfa21db6b620" + Md5 = "a8a9caa886a338b66181cfa21db6b620" }, new BlockImageTestExpected { @@ -247,7 +247,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "af83d011608042d35021e39aa5e10b2f", + Md5 = "af83d011608042d35021e39aa5e10b2f", Partitions = new[] { new BlockPartitionVolumes @@ -263,7 +263,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "e640835966327f3f662e1db8e0575510" + Md5 = "e640835966327f3f662e1db8e0575510" }, new BlockImageTestExpected { @@ -271,7 +271,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "ff3534234d1d2dd88bf6e83be23d9227" + Md5 = "ff3534234d1d2dd88bf6e83be23d9227" }, new BlockImageTestExpected { @@ -279,7 +279,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "dfaff34a6556b515642f1e54f839b02e" + Md5 = "dfaff34a6556b515642f1e54f839b02e" }, new BlockImageTestExpected { @@ -287,7 +287,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "ca8f5c7f9ed161b03ccb166eb9d62146" + Md5 = "ca8f5c7f9ed161b03ccb166eb9d62146" }, new BlockImageTestExpected { @@ -295,7 +295,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6642c1a32d2c58e93481d664974fc202", + Md5 = "6642c1a32d2c58e93481d664974fc202", Partitions = new[] { new BlockPartitionVolumes @@ -311,7 +311,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "846f01b8b60cb3c775bd66419e977926", + Md5 = "846f01b8b60cb3c775bd66419e977926", Partitions = new[] { new BlockPartitionVolumes @@ -327,7 +327,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5101f89850dc28efbcfb7622086a9ddf", + Md5 = "5101f89850dc28efbcfb7622086a9ddf", Partitions = new[] { new BlockPartitionVolumes @@ -343,7 +343,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "8e570be2ed1f00ddea82e50a2d9c446a", + Md5 = "8e570be2ed1f00ddea82e50a2d9c446a", Partitions = new[] { new BlockPartitionVolumes @@ -359,7 +359,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "abba2a1ddd60a649047a9c44d94bbeae", + Md5 = "abba2a1ddd60a649047a9c44d94bbeae", Partitions = new[] { new BlockPartitionVolumes @@ -375,7 +375,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e3bc48bec81be5b35be73d41fdffd2ab", + Md5 = "e3bc48bec81be5b35be73d41fdffd2ab", Partitions = new[] { new BlockPartitionVolumes @@ -391,7 +391,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "43b5068af9d016d1432eb2e12d2b802a", + Md5 = "43b5068af9d016d1432eb2e12d2b802a", Partitions = new[] { new BlockPartitionVolumes @@ -407,7 +407,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5bf2ad4dc300592604b6e32f8b8e2656", + Md5 = "5bf2ad4dc300592604b6e32f8b8e2656", Partitions = new[] { new BlockPartitionVolumes @@ -423,7 +423,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", + Md5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", Partitions = new[] { new BlockPartitionVolumes @@ -439,7 +439,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "56d181a6bb8713e6b2854fe8887faab6", + Md5 = "56d181a6bb8713e6b2854fe8887faab6", Partitions = new[] { new BlockPartitionVolumes @@ -455,7 +455,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "41aef7cff26aefda1add8d49c5b962c2", + Md5 = "41aef7cff26aefda1add8d49c5b962c2", Partitions = new[] { new BlockPartitionVolumes @@ -471,7 +471,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "2437c5f089f1cba3866b36360b016f16", + Md5 = "2437c5f089f1cba3866b36360b016f16", Partitions = new[] { new BlockPartitionVolumes @@ -487,7 +487,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "bdaa8f17373b265830fdf3a06b794367", + Md5 = "bdaa8f17373b265830fdf3a06b794367", Partitions = new[] { new BlockPartitionVolumes @@ -503,7 +503,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "629932c285478d0540ff7936aa008351", + Md5 = "629932c285478d0540ff7936aa008351", Partitions = new[] { new BlockPartitionVolumes @@ -519,7 +519,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "7a2abef5d4701e2e49abb05af8d4da50", + Md5 = "7a2abef5d4701e2e49abb05af8d4da50", Partitions = new[] { new BlockPartitionVolumes @@ -535,7 +535,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "e3507522c914264f44fb2c92c3170c09", + Md5 = "e3507522c914264f44fb2c92c3170c09", Partitions = new[] { new BlockPartitionVolumes @@ -551,7 +551,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "824fe65dbb1a42b6b94f05405ef984f2", + Md5 = "824fe65dbb1a42b6b94f05405ef984f2", Partitions = new[] { new BlockPartitionVolumes @@ -567,7 +567,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", + Md5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", Partitions = new[] { new BlockPartitionVolumes @@ -583,7 +583,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "936b20bb0966fe693b4d5e2353e24846", + Md5 = "936b20bb0966fe693b4d5e2353e24846", Partitions = new[] { new BlockPartitionVolumes @@ -599,7 +599,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "803b01a0b440c2837d37c21308f30cd5", + Md5 = "803b01a0b440c2837d37c21308f30cd5", Partitions = new[] { new BlockPartitionVolumes @@ -615,7 +615,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "aa0d31f914760cc4cde75479779ebed6", + Md5 = "aa0d31f914760cc4cde75479779ebed6", Partitions = new[] { new BlockPartitionVolumes @@ -631,7 +631,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "31269ed6464302ae26d22b7c87bceb23", + Md5 = "31269ed6464302ae26d22b7c87bceb23", Partitions = new[] { new BlockPartitionVolumes @@ -647,7 +647,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "5e413433c54f48978d281c6e66d1106e", + Md5 = "5e413433c54f48978d281c6e66d1106e", Partitions = new[] { new BlockPartitionVolumes @@ -663,7 +663,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "4fc28b0128543b2eb70f6432c4c8a980", + Md5 = "4fc28b0128543b2eb70f6432c4c8a980", Partitions = new[] { new BlockPartitionVolumes @@ -679,7 +679,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "24a7459d080cea3a60d131b8fd7dc5d1", + Md5 = "24a7459d080cea3a60d131b8fd7dc5d1", Partitions = new[] { new BlockPartitionVolumes @@ -695,7 +695,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3570, SectorSize = 512, - MD5 = "2031b1e16ee2defc0d15f732f633df33", + Md5 = "2031b1e16ee2defc0d15f732f633df33", Partitions = new[] { new BlockPartitionVolumes @@ -711,7 +711,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5fc19ca552b6db957061e9a1750394d2", + Md5 = "5fc19ca552b6db957061e9a1750394d2", Partitions = new[] { new BlockPartitionVolumes @@ -727,7 +727,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "d1e978b679c63a218c3f77a7ca2c7206" + Md5 = "d1e978b679c63a218c3f77a7ca2c7206" }, new BlockImageTestExpected { @@ -735,7 +735,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "a33b46f042b78fe3d0b3c5dbb3908a93", + Md5 = "a33b46f042b78fe3d0b3c5dbb3908a93", Partitions = new[] { new BlockPartitionVolumes @@ -751,7 +751,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "565d3c001cbb532154aa5d3c65b2439c", + Md5 = "565d3c001cbb532154aa5d3c65b2439c", Partitions = new[] { new BlockPartitionVolumes @@ -767,7 +767,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e60442c3ebd72c99bdd7545fdba59613", + Md5 = "e60442c3ebd72c99bdd7545fdba59613", Partitions = new[] { new BlockPartitionVolumes @@ -783,7 +783,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "058a33a129539285c9b64010496af52f", + Md5 = "058a33a129539285c9b64010496af52f", Partitions = new[] { new BlockPartitionVolumes @@ -799,7 +799,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0726ecbc38965d30a6222c3e74cd1aa3", + Md5 = "0726ecbc38965d30a6222c3e74cd1aa3", Partitions = new[] { new BlockPartitionVolumes @@ -815,7 +815,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "c9a193837db7d8a5eb025eb41e8a76d7" + Md5 = "c9a193837db7d8a5eb025eb41e8a76d7" }, new BlockImageTestExpected { @@ -823,7 +823,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c38d69ac88520f14fcc6d6ced22b065d", + Md5 = "c38d69ac88520f14fcc6d6ced22b065d", Partitions = new[] { new BlockPartitionVolumes @@ -839,7 +839,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "91d51964e1e64ef3f6f622fa19aa833c", + Md5 = "91d51964e1e64ef3f6f622fa19aa833c", Partitions = new[] { new BlockPartitionVolumes @@ -855,7 +855,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "db36d9651c952ff679ec33223c8db2d3", + Md5 = "db36d9651c952ff679ec33223c8db2d3", Partitions = new[] { new BlockPartitionVolumes @@ -871,7 +871,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "5f1d98806309aee7f81de72e51e6d386", + Md5 = "5f1d98806309aee7f81de72e51e6d386", Partitions = new[] { new BlockPartitionVolumes @@ -887,7 +887,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1207a1cc7ff73d4f74c8984b4e7db33f", + Md5 = "1207a1cc7ff73d4f74c8984b4e7db33f", Partitions = new[] { new BlockPartitionVolumes @@ -903,7 +903,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "c97a3081fd25474b6b7945b8572d5ab8", + Md5 = "c97a3081fd25474b6b7945b8572d5ab8", Partitions = new[] { new BlockPartitionVolumes @@ -919,7 +919,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", + Md5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", Partitions = new[] { new BlockPartitionVolumes @@ -935,7 +935,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 410, SectorSize = 512, - MD5 = "7b41dd9ca7eb32828960eb1417a6092a", + Md5 = "7b41dd9ca7eb32828960eb1417a6092a", Partitions = new[] { new BlockPartitionVolumes @@ -951,7 +951,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "126dfd25363c076727dfaab03955c931", + Md5 = "126dfd25363c076727dfaab03955c931", Partitions = new[] { new BlockPartitionVolumes @@ -967,7 +967,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "e6492aac144f5f6f593b84c64680cf64", + Md5 = "e6492aac144f5f6f593b84c64680cf64", Partitions = new[] { new BlockPartitionVolumes @@ -983,7 +983,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -999,7 +999,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1015,7 +1015,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -1031,7 +1031,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1047,7 +1047,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1063,7 +1063,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1079,7 +1079,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1095,7 +1095,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6631b66fdfd89319323771c41334c7ba", + Md5 = "6631b66fdfd89319323771c41334c7ba", Partitions = new[] { new BlockPartitionVolumes @@ -1111,7 +1111,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "56471a253f4d6803b634e2bbff6c0931", + Md5 = "56471a253f4d6803b634e2bbff6c0931", Partitions = new[] { new BlockPartitionVolumes @@ -1127,7 +1127,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "7d36aee5a3071ff75b979f3acb649c40", + Md5 = "7d36aee5a3071ff75b979f3acb649c40", Partitions = new[] { new BlockPartitionVolumes @@ -1143,7 +1143,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "0ccb62039363ab544c69eca229a17fae", + Md5 = "0ccb62039363ab544c69eca229a17fae", Partitions = new[] { new BlockPartitionVolumes @@ -1159,7 +1159,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "7851d31fad9302ff45d3ded4fba25387", + Md5 = "7851d31fad9302ff45d3ded4fba25387", Partitions = new[] { new BlockPartitionVolumes @@ -1175,7 +1175,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "915b08c82591e8488320e001b7303b6d", + Md5 = "915b08c82591e8488320e001b7303b6d", Partitions = new[] { new BlockPartitionVolumes @@ -1191,7 +1191,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "5e5ea6fe9adf842221fdc60e56630405", + Md5 = "5e5ea6fe9adf842221fdc60e56630405", Partitions = new[] { new BlockPartitionVolumes @@ -1207,7 +1207,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1223,7 +1223,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ddc6c1200c60e9f7796280f50c2e5283", + Md5 = "ddc6c1200c60e9f7796280f50c2e5283", Partitions = new[] { new BlockPartitionVolumes @@ -1239,7 +1239,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6efa72a33021d5051546c3e0dd4c3c09" + Md5 = "6efa72a33021d5051546c3e0dd4c3c09" }, new BlockImageTestExpected { @@ -1247,7 +1247,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1255,7 +1255,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 200, SectorSize = 1024, - MD5 = "cf42d08469548a31caf2649a1d08a85f" + Md5 = "cf42d08469548a31caf2649a1d08a85f" }, new BlockImageTestExpected { @@ -1263,7 +1263,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 1024, - MD5 = "62745e10683cf2ec1dac177535459891" + Md5 = "62745e10683cf2ec1dac177535459891" }, new BlockImageTestExpected { @@ -1271,7 +1271,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "298c377de52947c472a85d281b6d3d4d" + Md5 = "298c377de52947c472a85d281b6d3d4d" }, new BlockImageTestExpected { @@ -1279,7 +1279,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "298c377de52947c472a85d281b6d3d4d" + Md5 = "298c377de52947c472a85d281b6d3d4d" }, new BlockImageTestExpected { @@ -1287,7 +1287,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1295,7 +1295,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "6efa72a33021d5051546c3e0dd4c3c09" + Md5 = "6efa72a33021d5051546c3e0dd4c3c09" }, new BlockImageTestExpected { @@ -1303,7 +1303,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "e63014a4299f52f22e6e2c9609f51979" + Md5 = "e63014a4299f52f22e6e2c9609f51979" }, new BlockImageTestExpected { @@ -1311,7 +1311,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -1327,7 +1327,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "32823b9009c99b6711e89336ad03ec7f", + Md5 = "32823b9009c99b6711e89336ad03ec7f", Partitions = new[] { new BlockPartitionVolumes @@ -1343,7 +1343,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c8b03a8550ed3e70e1c78316aa445aa", + Md5 = "1c8b03a8550ed3e70e1c78316aa445aa", Partitions = new[] { new BlockPartitionVolumes @@ -1359,7 +1359,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "185bc63e4304a2d2554615362b2d25c5" + Md5 = "185bc63e4304a2d2554615362b2d25c5" }, new BlockImageTestExpected { @@ -1367,7 +1367,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -1383,7 +1383,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -1399,7 +1399,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "028769dc0abefab1740cc309432588b6", + Md5 = "028769dc0abefab1740cc309432588b6", Partitions = new[] { new BlockPartitionVolumes @@ -1415,7 +1415,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "152023525154b45ab26687190bac94db", + Md5 = "152023525154b45ab26687190bac94db", Partitions = new[] { new BlockPartitionVolumes @@ -1431,7 +1431,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "db38ecd93f28dd065927fed21917eed5", + Md5 = "db38ecd93f28dd065927fed21917eed5", Partitions = new[] { new BlockPartitionVolumes @@ -1447,7 +1447,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "f206c0caa4e0eda37233ab6e89ab5493", + Md5 = "f206c0caa4e0eda37233ab6e89ab5493", Partitions = new[] { new BlockPartitionVolumes @@ -1463,7 +1463,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "554492a7b41f4cd9068a3a2b70eb0e5f", + Md5 = "554492a7b41f4cd9068a3a2b70eb0e5f", Partitions = new[] { new BlockPartitionVolumes @@ -1479,7 +1479,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3402, SectorSize = 512, - MD5 = "865ad9072cb6c7458f7d86d7e9368622" + Md5 = "865ad9072cb6c7458f7d86d7e9368622" }, new BlockImageTestExpected { @@ -1487,7 +1487,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "2461e458438f0033bc5811fd6958ad02" + Md5 = "2461e458438f0033bc5811fd6958ad02" }, new BlockImageTestExpected { @@ -1495,7 +1495,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "606d5fbf174708c7ecfbfdd2a50fec9c" + Md5 = "606d5fbf174708c7ecfbfdd2a50fec9c" }, new BlockImageTestExpected { @@ -1503,7 +1503,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 2048, - MD5 = "6173d4c7b6a1addb14a4cbe088ede9d7" + Md5 = "6173d4c7b6a1addb14a4cbe088ede9d7" }, new BlockImageTestExpected { @@ -1511,7 +1511,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 160, SectorSize = 8192, - MD5 = "5f47876d515d9495789f5e27ed313959" + Md5 = "5f47876d515d9495789f5e27ed313959" }, new BlockImageTestExpected { @@ -1519,7 +1519,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 600, SectorSize = 256, - MD5 = "65531301132413a81f3994eaf0b16f50" + Md5 = "65531301132413a81f3994eaf0b16f50" }, new BlockImageTestExpected { @@ -1527,7 +1527,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1200, SectorSize = 256, - MD5 = "a13fbf4d230f421d1bc4d21b714dc36b" + Md5 = "a13fbf4d230f421d1bc4d21b714dc36b" }, new BlockImageTestExpected { @@ -1535,7 +1535,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2400, SectorSize = 256, - MD5 = "de0170cd10ddd839a63370355b2ba4ed" + Md5 = "de0170cd10ddd839a63370355b2ba4ed" }, new BlockImageTestExpected { @@ -1543,7 +1543,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "1045bfd216ae1ae480dd0ef626f5ff39" + Md5 = "1045bfd216ae1ae480dd0ef626f5ff39" }, new BlockImageTestExpected { @@ -1551,7 +1551,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1559,7 +1559,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "1045bfd216ae1ae480dd0ef626f5ff39" + Md5 = "1045bfd216ae1ae480dd0ef626f5ff39" }, new BlockImageTestExpected { @@ -1567,7 +1567,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "8a16a3008739516fc3ba4c878868d056" + Md5 = "8a16a3008739516fc3ba4c878868d056" }, new BlockImageTestExpected { @@ -1575,7 +1575,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "46fce47baf08c6f093f2c355a603543d" + Md5 = "46fce47baf08c6f093f2c355a603543d" }, new BlockImageTestExpected { @@ -1583,7 +1583,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "ee73a5d5c8dfac236baf7b99811696f9" + Md5 = "ee73a5d5c8dfac236baf7b99811696f9" }, new BlockImageTestExpected { @@ -1591,7 +1591,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "8245ddd644583bd78ac0638133c89824" + Md5 = "8245ddd644583bd78ac0638133c89824" }, new BlockImageTestExpected { @@ -1599,7 +1599,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "33c51a3d6f13cfedb5f08bf4c3cba7b9" + Md5 = "33c51a3d6f13cfedb5f08bf4c3cba7b9" }, new BlockImageTestExpected { @@ -1607,7 +1607,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1615,7 +1615,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1623,7 +1623,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "647f14749f59be471aac04a71a079a64" + Md5 = "647f14749f59be471aac04a71a079a64" }, new BlockImageTestExpected { @@ -1631,7 +1631,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "517cdd5e42a4673f733d1aedfb46770f" + Md5 = "517cdd5e42a4673f733d1aedfb46770f" }, new BlockImageTestExpected { @@ -1639,7 +1639,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "6ad92e9522e4ba902c01beecb5943bb1" + Md5 = "6ad92e9522e4ba902c01beecb5943bb1" }, new BlockImageTestExpected { @@ -1647,7 +1647,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "8e077143864bb20e36f25a4685860a1e" + Md5 = "8e077143864bb20e36f25a4685860a1e" }, new BlockImageTestExpected { @@ -1655,7 +1655,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "9724c94417cef88b2ad2f3c1db9d8730" + Md5 = "9724c94417cef88b2ad2f3c1db9d8730" }, new BlockImageTestExpected { @@ -1663,7 +1663,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "40199611e6e75bbc37ad6c52a5b77eae" + Md5 = "40199611e6e75bbc37ad6c52a5b77eae" }, new BlockImageTestExpected { @@ -1671,7 +1671,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5120, SectorSize = 256, - MD5 = "f92b2e52259531d50bfb403dc1274ab1" + Md5 = "f92b2e52259531d50bfb403dc1274ab1" }, new BlockImageTestExpected { @@ -1679,7 +1679,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1687,7 +1687,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 990, SectorSize = 256, - MD5 = "dbcd4aa7c1c670a667c89b309bd9de42" + Md5 = "dbcd4aa7c1c670a667c89b309bd9de42" }, new BlockImageTestExpected { @@ -1695,7 +1695,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1050, SectorSize = 256, - MD5 = "d88f521c048df99b8ef5f01a8a001455" + Md5 = "d88f521c048df99b8ef5f01a8a001455" }, new BlockImageTestExpected { @@ -1703,7 +1703,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 621, SectorSize = 512, - MD5 = "b76bd117ce24d933cdefe09b1de2164a" + Md5 = "b76bd117ce24d933cdefe09b1de2164a" }, new BlockImageTestExpected { @@ -1711,7 +1711,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2400, SectorSize = 256, - MD5 = "a50f82253aa4d8dea4fb193d64a66778" + Md5 = "a50f82253aa4d8dea4fb193d64a66778" }, new BlockImageTestExpected { @@ -1719,7 +1719,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ATARI_525_DD, Sectors = 720, SectorSize = 256, - MD5 = "d1ab955f0961ab94e6cf69f78134a84b" + Md5 = "d1ab955f0961ab94e6cf69f78134a84b" }, new BlockImageTestExpected { @@ -1727,7 +1727,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 714, SectorSize = 256, - MD5 = "8b62738f15bcc916a668eaa67eec86e7" + Md5 = "8b62738f15bcc916a668eaa67eec86e7" }, new BlockImageTestExpected { @@ -1735,7 +1735,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "87a432496cb23b5c2299545500df3553", + Md5 = "87a432496cb23b5c2299545500df3553", Partitions = new[] { new BlockPartitionVolumes @@ -1751,7 +1751,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "9866ab8e58fa4be25010184aec4ad3aa" + Md5 = "9866ab8e58fa4be25010184aec4ad3aa" }, new BlockImageTestExpected { @@ -1759,7 +1759,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "9dab329ae098b29889ab08278de38f95" + Md5 = "9dab329ae098b29889ab08278de38f95" }, new BlockImageTestExpected { @@ -1767,7 +1767,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "0d71b4952dadbfb1061acc1f4640c787" + Md5 = "0d71b4952dadbfb1061acc1f4640c787" }, new BlockImageTestExpected { @@ -1775,7 +1775,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" + Md5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" }, new BlockImageTestExpected { @@ -1783,7 +1783,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "f8f81f945aaad6fbfe7e2db1905302c1" + Md5 = "f8f81f945aaad6fbfe7e2db1905302c1" }, new BlockImageTestExpected { @@ -1791,7 +1791,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "f6f81c75b5ba45d91c1886c6dda9caee" + Md5 = "f6f81c75b5ba45d91c1886c6dda9caee" }, new BlockImageTestExpected { @@ -1799,7 +1799,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 1024, - MD5 = "0b9cb8107cbb94c5e36aea438a04dc98" + Md5 = "0b9cb8107cbb94c5e36aea438a04dc98" }, new BlockImageTestExpected { @@ -1807,7 +1807,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "d075e50705f4ddca7ba4dbc981ec1176" + Md5 = "d075e50705f4ddca7ba4dbc981ec1176" }, new BlockImageTestExpected { @@ -1815,7 +1815,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "9f86480c86bae33a5b444e4a7ed55048" + Md5 = "9f86480c86bae33a5b444e4a7ed55048" }, new BlockImageTestExpected { @@ -1823,7 +1823,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 1024, - MD5 = "231891ccd0cc599cfe25419c669fc5f8" + Md5 = "231891ccd0cc599cfe25419c669fc5f8" }, new BlockImageTestExpected { @@ -1831,7 +1831,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5dc0d482a773043d8683a84c8220df95", + Md5 = "5dc0d482a773043d8683a84c8220df95", Partitions = new[] { new BlockPartitionVolumes @@ -1847,7 +1847,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "855943f9caecdcce9b06f0098d773c6b", + Md5 = "855943f9caecdcce9b06f0098d773c6b", Partitions = new[] { new BlockPartitionVolumes @@ -1863,7 +1863,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5ac0a9fc7337f761098f816359b0f6f7", + Md5 = "5ac0a9fc7337f761098f816359b0f6f7", Partitions = new[] { new BlockPartitionVolumes @@ -1879,7 +1879,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ea6ec8e663218b1372048f6e25795b5", + Md5 = "1ea6ec8e663218b1372048f6e25795b5", Partitions = new[] { new BlockPartitionVolumes @@ -1895,7 +1895,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "77a1167b1b9043496e32b8578cde0ff0", + Md5 = "77a1167b1b9043496e32b8578cde0ff0", Partitions = new[] { new BlockPartitionVolumes @@ -1911,7 +1911,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4b07d760d65f3f0f8ffa5f2b81cee907", + Md5 = "4b07d760d65f3f0f8ffa5f2b81cee907", Partitions = new[] { new BlockPartitionVolumes @@ -1927,7 +1927,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "32c044c5c2b0bd13806149a759c14935", + Md5 = "32c044c5c2b0bd13806149a759c14935", Partitions = new[] { new BlockPartitionVolumes @@ -1943,7 +1943,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8752095abc13dba3f3467669da333891", + Md5 = "8752095abc13dba3f3467669da333891", Partitions = new[] { new BlockPartitionVolumes @@ -1959,7 +1959,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "aece7cd34bbba3e75307fa70404d9d30", + Md5 = "aece7cd34bbba3e75307fa70404d9d30", Partitions = new[] { new BlockPartitionVolumes @@ -1975,7 +1975,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "5289afb16a6e4a33213e3bcca56c6230", + Md5 = "5289afb16a6e4a33213e3bcca56c6230", Partitions = new[] { new BlockPartitionVolumes @@ -1991,7 +1991,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "1aef0a0ba233476db6567878c3c2b266", + Md5 = "1aef0a0ba233476db6567878c3c2b266", Partitions = new[] { new BlockPartitionVolumes @@ -2007,7 +2007,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b96596711f4d2ee85dfda0fe3b9f26c3", + Md5 = "b96596711f4d2ee85dfda0fe3b9f26c3", Partitions = new[] { new BlockPartitionVolumes @@ -2023,7 +2023,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a4f461af7fda5e93a7ab63fcbb7e7683", + Md5 = "a4f461af7fda5e93a7ab63fcbb7e7683", Partitions = new[] { new BlockPartitionVolumes @@ -2039,7 +2039,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "8f7f7099d4475f6631fcf0a79b031d61", + Md5 = "8f7f7099d4475f6631fcf0a79b031d61", Partitions = new[] { new BlockPartitionVolumes @@ -2055,7 +2055,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", + Md5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", Partitions = new[] { new BlockPartitionVolumes @@ -2071,7 +2071,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "3c77ca681df78e4cd7baa162aa9b0859", + Md5 = "3c77ca681df78e4cd7baa162aa9b0859", Partitions = new[] { new BlockPartitionVolumes @@ -2087,7 +2087,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "51da1f86c49657ffdb367bb2ddeb7990", + Md5 = "51da1f86c49657ffdb367bb2ddeb7990", Partitions = new[] { new BlockPartitionVolumes @@ -2103,7 +2103,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "b81a4987f89936630b8ebc62e4bbce6e" + Md5 = "b81a4987f89936630b8ebc62e4bbce6e" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -2121,7 +2121,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "f76f92dd326c99c5efad5ee58daf72e1", + Md5 = "f76f92dd326c99c5efad5ee58daf72e1", Partitions = new[] { new BlockPartitionVolumes @@ -2137,7 +2137,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "b6f2c10e42908e334025bc4ffd81e771", + Md5 = "b6f2c10e42908e334025bc4ffd81e771", Partitions = new[] { new BlockPartitionVolumes @@ -2153,7 +2153,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f2f409ea2a62a7866fd2777cc4fc9739", + Md5 = "f2f409ea2a62a7866fd2777cc4fc9739", Partitions = new[] { new BlockPartitionVolumes @@ -2169,7 +2169,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "3e441d69cec5c3169274e1379de4af4b", + Md5 = "3e441d69cec5c3169274e1379de4af4b", Partitions = new[] { new BlockPartitionVolumes @@ -2185,7 +2185,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "30a93f30dd4485c6fc037fe0775d3fc7", + Md5 = "30a93f30dd4485c6fc037fe0775d3fc7", Partitions = new[] { new BlockPartitionVolumes @@ -2201,7 +2201,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "e0caf02cce5597c98313bcc480366ec7", + Md5 = "e0caf02cce5597c98313bcc480366ec7", Partitions = new[] { new BlockPartitionVolumes @@ -2217,7 +2217,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4af4904d2b3c815da7bef7049209f5eb", + Md5 = "4af4904d2b3c815da7bef7049209f5eb", Partitions = new[] { new BlockPartitionVolumes @@ -2233,7 +2233,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "39bf5a98bcb2185d855ac06378febcfa", + Md5 = "39bf5a98bcb2185d855ac06378febcfa", Partitions = new[] { new BlockPartitionVolumes @@ -2249,7 +2249,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "dc20055b6e6fd6f8e1114d4be2effeed", + Md5 = "dc20055b6e6fd6f8e1114d4be2effeed", Partitions = new[] { new BlockPartitionVolumes @@ -2265,7 +2265,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "56af9256cf71d5aac5fd5d363674bc49", + Md5 = "56af9256cf71d5aac5fd5d363674bc49", Partitions = new[] { new BlockPartitionVolumes @@ -2281,7 +2281,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "bbba1e2d1418e05c3a4e7b4d585d160b", + Md5 = "bbba1e2d1418e05c3a4e7b4d585d160b", Partitions = new[] { new BlockPartitionVolumes @@ -2297,7 +2297,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "bca3a045e81617f7f5ebb5a8818eac47", + Md5 = "bca3a045e81617f7f5ebb5a8818eac47", Partitions = new[] { new BlockPartitionVolumes @@ -2313,7 +2313,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a296663cb8e75e94603221352f29cfff", + Md5 = "a296663cb8e75e94603221352f29cfff", Partitions = new[] { new BlockPartitionVolumes @@ -2329,7 +2329,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ecda36ebf0e1100233cb0ec722c18583", + Md5 = "ecda36ebf0e1100233cb0ec722c18583", Partitions = new[] { new BlockPartitionVolumes @@ -2345,7 +2345,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "cef2f4fe9b1a32d5c0544f814e634264", + Md5 = "cef2f4fe9b1a32d5c0544f814e634264", Partitions = new[] { new BlockPartitionVolumes @@ -2361,7 +2361,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "bbe58e26b8f8f822cd3edfd37a4e4924", + Md5 = "bbe58e26b8f8f822cd3edfd37a4e4924", Partitions = new[] { new BlockPartitionVolumes @@ -2377,7 +2377,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "b9b6ebdf711364c979de7cf70c3a438a", + Md5 = "b9b6ebdf711364c979de7cf70c3a438a", Partitions = new[] { new BlockPartitionVolumes @@ -2393,7 +2393,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d37424f367f545acbb397f2bed766843", + Md5 = "d37424f367f545acbb397f2bed766843", Partitions = new[] { new BlockPartitionVolumes @@ -2409,7 +2409,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9963dd6f19ce6bd56eabeccdfbbd821a", + Md5 = "9963dd6f19ce6bd56eabeccdfbbd821a", Partitions = new[] { new BlockPartitionVolumes @@ -2425,7 +2425,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "acf6604559ae8217f7869823e2429024", + Md5 = "acf6604559ae8217f7869823e2429024", Partitions = new[] { new BlockPartitionVolumes @@ -2441,7 +2441,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "23bf2139cdfdc4c16db058fd31ea6481", + Md5 = "23bf2139cdfdc4c16db058fd31ea6481", Partitions = new[] { new BlockPartitionVolumes @@ -2457,7 +2457,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "fa26adda0415f02057b113ad29c80c8d", + Md5 = "fa26adda0415f02057b113ad29c80c8d", Partitions = new[] { new BlockPartitionVolumes @@ -2473,7 +2473,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", + Md5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", Partitions = new[] { new BlockPartitionVolumes @@ -2489,7 +2489,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1386, SectorSize = 512, - MD5 = "e794a3ffa4069ea999fdf7146710fa9e", + Md5 = "e794a3ffa4069ea999fdf7146710fa9e", Partitions = new[] { new BlockPartitionVolumes @@ -2505,7 +2505,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -2521,7 +2521,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -2537,7 +2537,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ff7649b679ba22ff20d39ff717dbec8", + Md5 = "1ff7649b679ba22ff20d39ff717dbec8", Partitions = new[] { new BlockPartitionVolumes @@ -2553,7 +2553,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56", + Md5 = "b4a602f67903c46eef62addb0780aa56", Partitions = new[] { new BlockPartitionVolumes @@ -2569,7 +2569,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56", + Md5 = "b4a602f67903c46eef62addb0780aa56", Partitions = new[] { new BlockPartitionVolumes @@ -2585,7 +2585,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "03c2af6a8ebf4bd6f530335de34ae5dd", + Md5 = "03c2af6a8ebf4bd6f530335de34ae5dd", Partitions = new[] { new BlockPartitionVolumes @@ -2601,7 +2601,7 @@ public class CopyQm : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1a9f2eeb3cbeeb057b9a9a5c6e9b0cc6" + Md5 = "1a9f2eeb3cbeeb057b9a9a5c6e9b0cc6" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/CopyTape.cs b/Aaru.Tests/Images/CopyTape.cs index e4d74e75c..1821ba513 100644 --- a/Aaru.Tests/Images/CopyTape.cs +++ b/Aaru.Tests/Images/CopyTape.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class CopyTape : TapeMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape"); - public override IMediaImage _plugin => new DiscImages.CopyTape(); + public override IMediaImage Plugin => new DiscImages.CopyTape(); public override TapeImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 1604, SectorSize = 10240, - MD5 = "a6334d975523b3422fea522b0cc118a9", + Md5 = "a6334d975523b3422fea522b0cc118a9", Partitions = new[] { new TapePartition @@ -75,7 +75,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 15485, SectorSize = 512, - MD5 = "17ef78d9e5c53b976f530d4ca44223fd", + Md5 = "17ef78d9e5c53b976f530d4ca44223fd", Partitions = new[] { new TapePartition @@ -102,7 +102,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 15, SectorSize = 32256, - MD5 = "76c0ae10f4ec70ef8681b212f02a71c8", + Md5 = "76c0ae10f4ec70ef8681b212f02a71c8", Partitions = new[] { new TapePartition @@ -129,7 +129,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 3298, SectorSize = 32256, - MD5 = "e331c9d0ae7c25c81c6580bc9965e2d0", + Md5 = "e331c9d0ae7c25c81c6580bc9965e2d0", Partitions = new[] { new TapePartition @@ -156,7 +156,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 3152, SectorSize = 32256, - MD5 = "018c37c40f8df91ab9b098d643c9ae6c", + Md5 = "018c37c40f8df91ab9b098d643c9ae6c", Partitions = new[] { new TapePartition @@ -183,7 +183,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 818, SectorSize = 32256, - MD5 = "eb3ce36b2c3afeeec59e5b8ed802a393", + Md5 = "eb3ce36b2c3afeeec59e5b8ed802a393", Partitions = new[] { new TapePartition @@ -210,7 +210,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 7, SectorSize = 32256, - MD5 = "b057656698a224187afb2bdbb8caf7f3", + Md5 = "b057656698a224187afb2bdbb8caf7f3", Partitions = new[] { new TapePartition @@ -237,7 +237,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 684, SectorSize = 32256, - MD5 = "8e48e388e7094f3170065718ab618b53", + Md5 = "8e48e388e7094f3170065718ab618b53", Partitions = new[] { new TapePartition @@ -264,7 +264,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 73525, SectorSize = 1024, - MD5 = "8861f8c06a2e93ca5a81d729ad3e1de1", + Md5 = "8861f8c06a2e93ca5a81d729ad3e1de1", Partitions = new[] { new TapePartition @@ -319,7 +319,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 290, SectorSize = 262144, - MD5 = "bfc402b23af0cf1ad22d9fb2ea29b58f", + Md5 = "bfc402b23af0cf1ad22d9fb2ea29b58f", Partitions = new[] { new TapePartition @@ -374,7 +374,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 37587, SectorSize = 8192, - MD5 = "e4a3e2fe26c72ca025ac0c017ec73ee9", + Md5 = "e4a3e2fe26c72ca025ac0c017ec73ee9", Partitions = new[] { new TapePartition @@ -625,7 +625,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 25046, SectorSize = 1024, - MD5 = "e625c03d7493dc22fe49f91f731446e8", + Md5 = "e625c03d7493dc22fe49f91f731446e8", Partitions = new[] { new TapePartition @@ -687,7 +687,7 @@ public class CopyTape : TapeMediaImageTest MediaType = MediaType.UnknownTape, Sectors = 102, SectorSize = 262144, - MD5 = "198464b1daf8e674debf8eda0fcbf016", + Md5 = "198464b1daf8e674debf8eda0fcbf016", Partitions = new[] { new TapePartition diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs index 54bd116fe..0eea936ac 100644 --- a/Aaru.Tests/Images/D88.cs +++ b/Aaru.Tests/Images/D88.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.D88(); public override BlockImageTestExpected[] Tests => new[] { new BlockImageTestExpected @@ -46,7 +46,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "a4103c39cd7fd9fc3de8418dfcf22364" + Md5 = "a4103c39cd7fd9fc3de8418dfcf22364" }, new BlockImageTestExpected { @@ -54,7 +54,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "b948048c03e0b3d34d77f5c9dced0b41" + Md5 = "b948048c03e0b3d34d77f5c9dced0b41" }, new BlockImageTestExpected { @@ -62,7 +62,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "f91152fab791d4dc0677a289d90478a5" + Md5 = "f91152fab791d4dc0677a289d90478a5" }, new BlockImageTestExpected { @@ -70,7 +70,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 411, SectorSize = 256, - MD5 = "39b01df04a6312b09f1b83c9f3a46b22" + Md5 = "39b01df04a6312b09f1b83c9f3a46b22" }, new BlockImageTestExpected { @@ -78,7 +78,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1440, SectorSize = 256, - MD5 = "ef775ec1f41b8b725ea83ec8c5ca04e2" + Md5 = "ef775ec1f41b8b725ea83ec8c5ca04e2" }, new BlockImageTestExpected { @@ -86,7 +86,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "5c2b22f824524cd6c539aaeb2ecb84cd" + Md5 = "5c2b22f824524cd6c539aaeb2ecb84cd" }, new BlockImageTestExpected { @@ -94,7 +94,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "6bddf3dd32877f7b552cbf9da6b89f76" + Md5 = "6bddf3dd32877f7b552cbf9da6b89f76" }, new BlockImageTestExpected { @@ -102,7 +102,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 4033, SectorSize = 128, - MD5 = "003cd0292879733b6eab7ca79ab9cfeb" + Md5 = "003cd0292879733b6eab7ca79ab9cfeb" }, new BlockImageTestExpected { @@ -110,7 +110,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1440, SectorSize = 512, - MD5 = "acb738a5a945e4e2ba1504a14a529933" + Md5 = "acb738a5a945e4e2ba1504a14a529933" }, new BlockImageTestExpected { @@ -118,7 +118,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "106068dbdf13803979c7bbb63612f43d" + Md5 = "106068dbdf13803979c7bbb63612f43d" }, new BlockImageTestExpected { @@ -126,7 +126,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1440, SectorSize = 512, - MD5 = "be916f25847b9cfc9776d88cc150ae7e", + Md5 = "be916f25847b9cfc9776d88cc150ae7e", Partitions = new[] { new BlockPartitionVolumes @@ -142,7 +142,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "ccc7f98e216db35c2b7a08634a9f3e20", + Md5 = "ccc7f98e216db35c2b7a08634a9f3e20", Partitions = new[] { new BlockPartitionVolumes @@ -158,7 +158,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1440, SectorSize = 512, - MD5 = "7a3332e82b0fe8c5673a2615f6c0b9a2" + Md5 = "7a3332e82b0fe8c5673a2615f6c0b9a2" }, new BlockImageTestExpected { @@ -166,7 +166,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "62f5be96a8b8ccab9ee4aebf557cfcf7", + Md5 = "62f5be96a8b8ccab9ee4aebf557cfcf7", Partitions = new[] { new BlockPartitionVolumes @@ -182,7 +182,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1440, SectorSize = 512, - MD5 = "07fb4c225d4b5a2e2a1046ae66fc153c" + Md5 = "07fb4c225d4b5a2e2a1046ae66fc153c" }, new BlockImageTestExpected { @@ -190,7 +190,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "1f73980e45a384bed331eaa33c9ef65b", + Md5 = "1f73980e45a384bed331eaa33c9ef65b", Partitions = new[] { new BlockPartitionVolumes @@ -206,7 +206,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1284, SectorSize = 1024, - MD5 = "9d675e5147b55cee0b2bc05476eef825" + Md5 = "9d675e5147b55cee0b2bc05476eef825" }, new BlockImageTestExpected { @@ -214,7 +214,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "bb48546ced9c61462e1c89dca4987143", + Md5 = "bb48546ced9c61462e1c89dca4987143", Partitions = new[] { new BlockPartitionVolumes @@ -230,7 +230,7 @@ public class D88 : BlockMediaImageTest MediaType = MediaType.NEC_525_SS, Sectors = 1280, SectorSize = 256, - MD5 = "c7df67f4e66dad658fe856d3c8b36c7a" + Md5 = "c7df67f4e66dad658fe856d3c8b36c7a" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs index 3bbc1f185..d65f0f4e6 100644 --- a/Aaru.Tests/Images/DART.cs +++ b/Aaru.Tests/Images/DART.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.Dart(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class Dart : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "eae3a95671d077deb702b3549a769f56" + Md5 = "eae3a95671d077deb702b3549a769f56" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class Dart : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" + Md5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class Dart : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a99744348a70b62b57bce2dec9132ced" + Md5 = "a99744348a70b62b57bce2dec9132ced" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class Dart : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "93e71b9ecdb39d3ec9245b4f451856d4" + Md5 = "93e71b9ecdb39d3ec9245b4f451856d4" } #region Unsupported LZH compression /* diff --git a/Aaru.Tests/Images/DiscJuggler.cs b/Aaru.Tests/Images/DiscJuggler.cs index a509644df..956e3aac3 100644 --- a/Aaru.Tests/Images/DiscJuggler.cs +++ b/Aaru.Tests/Images/DiscJuggler.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class DiscJuggler : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler"); - public override IMediaImage _plugin => new DiscImages.DiscJuggler(); + public override IMediaImage Plugin => new DiscImages.DiscJuggler(); public override OpticalImageTestExpected[] Tests => new[] { new OpticalImageTestExpected @@ -45,9 +45,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "jaguarcd.cdi", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "01de32dcb21ac62be269ddd3bc99ab3e", - LongMD5 = "01de32dcb21ac62be269ddd3bc99ab3e", - SubchannelMD5 = "214794f37c41d1e2727eba68efdd369d", + Md5 = "01de32dcb21ac62be269ddd3bc99ab3e", + LongMd5 = "01de32dcb21ac62be269ddd3bc99ab3e", + SubchannelMd5 = "214794f37c41d1e2727eba68efdd369d", Tracks = new[] { new TrackInfoTestExpected @@ -145,9 +145,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_audiocd.cdi", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "0c355a31a7a488ec387c4508c498d6c0", - LongMD5 = "0c355a31a7a488ec387c4508c498d6c0", - SubchannelMD5 = "ac79fa4b07a042bcdd033a3e0319a0ae", + Md5 = "0c355a31a7a488ec387c4508c498d6c0", + LongMd5 = "0c355a31a7a488ec387c4508c498d6c0", + SubchannelMd5 = "ac79fa4b07a042bcdd033a3e0319a0ae", Tracks = new[] { new TrackInfoTestExpected @@ -245,8 +245,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_data_mode1_joliet.cdi", MediaType = MediaType.CDROM, Sectors = 83063, - MD5 = "9f1251feaed14a62326ab399b73342e3", - LongMD5 = "8ae1725d36537af9395ece058992e2b3", + Md5 = "9f1251feaed14a62326ab399b73342e3", + LongMd5 = "8ae1725d36537af9395ece058992e2b3", Tracks = new[] { new TrackInfoTestExpected @@ -264,8 +264,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_data_mode2_joliet.cdi", MediaType = MediaType.CDROMXA, Sectors = 83077, - MD5 = "68d39977149d3062b41dba6c1ff475cf", - LongMD5 = "382b5d7957ee7e19b0e9dd7db866e4c4", + Md5 = "68d39977149d3062b41dba6c1ff475cf", + LongMd5 = "382b5d7957ee7e19b0e9dd7db866e4c4", Tracks = new[] { new TrackInfoTestExpected @@ -283,8 +283,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_dvd.cdi", MediaType = MediaType.DVDROM, Sectors = 84896, - MD5 = "5240b794f12174da73915e8c1f38b6a4", - LongMD5 = "5240b794f12174da73915e8c1f38b6a4", + Md5 = "5240b794f12174da73915e8c1f38b6a4", + LongMd5 = "5240b794f12174da73915e8c1f38b6a4", Tracks = new[] { new TrackInfoTestExpected @@ -301,8 +301,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_enhancedcd.cdi", MediaType = MediaType.CD, Sectors = 335666, - MD5 = "ce5de948ef5d1fccd1c1664451b1ba10", - LongMD5 = "fe4165656cc6023b999d9fbf05501b25", + Md5 = "ce5de948ef5d1fccd1c1664451b1ba10", + LongMd5 = "fe4165656cc6023b999d9fbf05501b25", Tracks = new[] { new TrackInfoTestExpected @@ -408,8 +408,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_mixed_mode.cdi", MediaType = MediaType.CDROMXA, Sectors = 360909, - MD5 = "a5eba1d1bfeae8d6eea6c8abfdf79be4", - LongMD5 = "b981912374fe50f91c91085e31028886", + Md5 = "a5eba1d1bfeae8d6eea6c8abfdf79be4", + LongMd5 = "b981912374fe50f91c91085e31028886", Tracks = new[] { new TrackInfoTestExpected @@ -515,8 +515,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_multisession_dvd.cdi", MediaType = MediaType.DVDROM, Sectors = 86560, - MD5 = "95388d443073217e7cc4cf6b0391ec7f", - LongMD5 = "95388d443073217e7cc4cf6b0391ec7f", + Md5 = "95388d443073217e7cc4cf6b0391ec7f", + LongMd5 = "95388d443073217e7cc4cf6b0391ec7f", Tracks = new[] { new TrackInfoTestExpected @@ -532,8 +532,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_pangram_mode1_joliet.cdi", MediaType = MediaType.CDROM, Sectors = 642, - MD5 = "36477c851cd6184034c86cc61cdd0e60", - LongMD5 = "1b11183918ed5a2295f89272e2fa5810", + Md5 = "36477c851cd6184034c86cc61cdd0e60", + LongMd5 = "1b11183918ed5a2295f89272e2fa5810", Tracks = new[] { new TrackInfoTestExpected @@ -551,8 +551,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "make_pangram_mode2_joliet.cdi", MediaType = MediaType.CDROMXA, Sectors = 656, - MD5 = "ea2e0354dccd3dfdca6242154f024b59", - LongMD5 = "18c580f0621cabdd9fc81be6275c41f0", + Md5 = "ea2e0354dccd3dfdca6242154f024b59", + LongMd5 = "18c580f0621cabdd9fc81be6275c41f0", Tracks = new[] { new TrackInfoTestExpected @@ -570,9 +570,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "pcengine.cdi", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "4fc2665cec77b289a68d35edbdd50730", - LongMD5 = "afabe77571db99e29cf4e6854b6f523e", - SubchannelMD5 = "c2026374c196855ee95f19de967f3ba1", + Md5 = "4fc2665cec77b289a68d35edbdd50730", + LongMd5 = "afabe77571db99e29cf4e6854b6f523e", + SubchannelMd5 = "c2026374c196855ee95f19de967f3ba1", Tracks = new[] { new TrackInfoTestExpected @@ -720,8 +720,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "pcfx.cdi", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "2e872a5cfa43959183677398ede15c08", - LongMD5 = "a8939e0fd28ee0bd876101b218af3572", + Md5 = "2e872a5cfa43959183677398ede15c08", + LongMd5 = "a8939e0fd28ee0bd876101b218af3572", Tracks = new[] { new TrackInfoTestExpected @@ -807,9 +807,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_audiocd.cdi", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "9f8abbb08746f86d7c3d0b1b22f1fcc2", - LongMD5 = "9f8abbb08746f86d7c3d0b1b22f1fcc2", - SubchannelMD5 = "1045e621183bf4c8a9d641f8a5767fec", + Md5 = "9f8abbb08746f86d7c3d0b1b22f1fcc2", + LongMd5 = "9f8abbb08746f86d7c3d0b1b22f1fcc2", + SubchannelMd5 = "1045e621183bf4c8a9d641f8a5767fec", Tracks = new[] { new TrackInfoTestExpected @@ -931,9 +931,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_cdr.cdi", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "dc02efe9c59c0d0e72bb7d26d7f01bce", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "dc02efe9c59c0d0e72bb7d26d7f01bce", Tracks = new[] { new TrackInfoTestExpected @@ -969,9 +969,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_cdrom.cdi", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "e0d121ac5c0e4e30a823ac445942feae", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "e0d121ac5c0e4e30a823ac445942feae", Tracks = new[] { new TrackInfoTestExpected @@ -1007,9 +1007,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_cdrw_2x.cdi", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "82e9a16a532717d7b733258d674073c3", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "82e9a16a532717d7b733258d674073c3", Tracks = new[] { new TrackInfoTestExpected @@ -1039,8 +1039,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvdram_v1.cdi", MediaType = MediaType.DVDROM, Sectors = 1218961, - MD5 = "b04c88635c5d493c250c289964018a7a", - LongMD5 = "b04c88635c5d493c250c289964018a7a", + Md5 = "b04c88635c5d493c250c289964018a7a", + LongMd5 = "b04c88635c5d493c250c289964018a7a", Tracks = new[] { new TrackInfoTestExpected @@ -1069,8 +1069,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvdram_v2.cdi", MediaType = MediaType.DVDROM, Sectors = 2236705, - MD5 = "c0823b070513d02c9f272986f23e74e8", - LongMD5 = "c0823b070513d02c9f272986f23e74e8", + Md5 = "c0823b070513d02c9f272986f23e74e8", + LongMd5 = "c0823b070513d02c9f272986f23e74e8", Tracks = new[] { new TrackInfoTestExpected @@ -1098,8 +1098,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvd-r.cdi", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -1128,8 +1128,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvd+r-dl.cdi", MediaType = MediaType.DVDROM, Sectors = 3455936, - MD5 = "692148a01b4204160b088141fb52bd70", - LongMD5 = "692148a01b4204160b088141fb52bd70", + Md5 = "692148a01b4204160b088141fb52bd70", + LongMd5 = "692148a01b4204160b088141fb52bd70", Tracks = new[] { new TrackInfoTestExpected @@ -1158,8 +1158,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvdrom.cdi", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -1188,8 +1188,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvd+rw.cdi", MediaType = MediaType.DVDROM, Sectors = 2295104, - MD5 = "759e9c19389aee07f88a994132b6f8d9", - LongMD5 = "759e9c19389aee07f88a994132b6f8d9", + Md5 = "759e9c19389aee07f88a994132b6f8d9", + LongMd5 = "759e9c19389aee07f88a994132b6f8d9", Tracks = new[] { new TrackInfoTestExpected @@ -1218,8 +1218,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_dvd-rw.cdi", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { new TrackInfoTestExpected @@ -1248,9 +1248,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "report_enhancedcd.cdi", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "7a76c22590401d57b84396c9fc2925e4", - LongMD5 = "63a318522c436ccd6b3ac3959bdb417f", - SubchannelMD5 = "2581844f8192c719da44ba57e8e5512b", + Md5 = "7a76c22590401d57b84396c9fc2925e4", + LongMd5 = "63a318522c436ccd6b3ac3959bdb417f", + SubchannelMd5 = "2581844f8192c719da44ba57e8e5512b", Tracks = new[] { new TrackInfoTestExpected @@ -1383,8 +1383,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.cdi", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "52d7a2793b7600dc94d007f5e7dfd942", - LongMD5 = "52d7a2793b7600dc94d007f5e7dfd942", + Md5 = "52d7a2793b7600dc94d007f5e7dfd942", + LongMd5 = "52d7a2793b7600dc94d007f5e7dfd942", Tracks = new[] { new TrackInfoTestExpected @@ -1482,8 +1482,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_enhancedcd.cdi", MediaType = MediaType.CDPLUS, Sectors = 59206, - MD5 = "31054e6b8f4d51fe502ac340490bcd46", - LongMD5 = "2fc4b8966350322ed3fd553b9e628164", + Md5 = "31054e6b8f4d51fe502ac340490bcd46", + LongMd5 = "2fc4b8966350322ed3fd553b9e628164", Tracks = new[] { new TrackInfoTestExpected @@ -1528,8 +1528,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.cdi", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "d976a8d0131bf48926542160bb41fc13", - LongMD5 = "cd55978d00f1bc127a0e652259ba2418", + Md5 = "d976a8d0131bf48926542160bb41fc13", + LongMd5 = "cd55978d00f1bc127a0e652259ba2418", Tracks = new[] { new TrackInfoTestExpected @@ -1566,9 +1566,9 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_karaoke_multi_sampler.cdi", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "a34e29e42b60023a6ae59f37d2bd4bea", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "62164333675c194acbe14eed5213e4f4", + Md5 = "a34e29e42b60023a6ae59f37d2bd4bea", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "62164333675c194acbe14eed5213e4f4", Tracks = new[] { new TrackInfoTestExpected @@ -1717,8 +1717,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_multiple_indexes.cdi", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "9315c6fc3cf5371ae3795df2b624bd5e", - LongMD5 = "9315c6fc3cf5371ae3795df2b624bd5e", + Md5 = "9315c6fc3cf5371ae3795df2b624bd5e", + LongMd5 = "9315c6fc3cf5371ae3795df2b624bd5e", Tracks = new[] { new TrackInfoTestExpected @@ -1768,8 +1768,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_multisession.cdi", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "46e43ed4712e5ae61b653b4d19f27080", - LongMD5 = "cac33e71b4693b2902f086a0a433129d", + Md5 = "46e43ed4712e5ae61b653b4d19f27080", + LongMd5 = "cac33e71b4693b2902f086a0a433129d", Tracks = new[] { new TrackInfoTestExpected @@ -1868,8 +1868,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_multisession_dvd+r.cdi", MediaType = MediaType.DVDROM, Sectors = 230624, - MD5 = "020993315e49ab0d36bc7248819162ea", - LongMD5 = "020993315e49ab0d36bc7248819162ea", + Md5 = "020993315e49ab0d36bc7248819162ea", + LongMd5 = "020993315e49ab0d36bc7248819162ea", Tracks = new[] { new TrackInfoTestExpected @@ -1897,8 +1897,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_multisession_dvd-r.cdi", MediaType = MediaType.DVDROM, Sectors = 257264, - MD5 = "dff8f2107a4ea9633a88ce38ff609b8e", - LongMD5 = "dff8f2107a4ea9633a88ce38ff609b8e", + Md5 = "dff8f2107a4ea9633a88ce38ff609b8e", + LongMd5 = "dff8f2107a4ea9633a88ce38ff609b8e", Tracks = new[] { new TrackInfoTestExpected @@ -1926,8 +1926,8 @@ public class DiscJuggler : OpticalMediaImageTest TestFile = "test_videocd.cdi", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "e5b596e73f46f646a51e1315b59e7cb9", - LongMD5 = "acd1a8de676ebe6feeb9d6964ccd63ea", + Md5 = "e5b596e73f46f646a51e1315b59e7cb9", + LongMd5 = "acd1a8de676ebe6feeb9d6964ccd63ea", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs index 9545f8fd6..8e10f8a37 100644 --- a/Aaru.Tests/Images/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy42.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class DiskCopy42 : BlockMediaImageTest { 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 IMediaImage Plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] { new BlockImageTestExpected @@ -46,7 +46,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2762f41d0379b476042fc62891baac84" + Md5 = "2762f41d0379b476042fc62891baac84" }, new BlockImageTestExpected { @@ -54,7 +54,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "eae3a95671d077deb702b3549a769f56" + Md5 = "eae3a95671d077deb702b3549a769f56" }, new BlockImageTestExpected { @@ -62,7 +62,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" + Md5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" }, new BlockImageTestExpected { @@ -70,7 +70,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a99744348a70b62b57bce2dec9132ced" + Md5 = "a99744348a70b62b57bce2dec9132ced" }, new BlockImageTestExpected { @@ -78,7 +78,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "93e71b9ecdb39d3ec9245b4f451856d4" + Md5 = "93e71b9ecdb39d3ec9245b4f451856d4" }, new BlockImageTestExpected { @@ -86,7 +86,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "b748f6df3e60e7169d42ec6fcc857ea4" + Md5 = "b748f6df3e60e7169d42ec6fcc857ea4" }, new BlockImageTestExpected { @@ -94,7 +94,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "dbd0ec8a3126236910709faf923adcf2" + Md5 = "dbd0ec8a3126236910709faf923adcf2" }, new BlockImageTestExpected { @@ -102,7 +102,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fcf747bd356b48d442ff74adb8f3516b" + Md5 = "fcf747bd356b48d442ff74adb8f3516b" }, new BlockImageTestExpected { @@ -110,7 +110,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fcf747bd356b48d442ff74adb8f3516b" + Md5 = "fcf747bd356b48d442ff74adb8f3516b" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs index 456229d2c..acb307c12 100644 --- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs @@ -38,7 +38,7 @@ public class DiskCopy42 : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +80,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -96,7 +96,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -104,7 +104,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs index 7b67b365c..c5a9dde2c 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class ROCo : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +131,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -145,7 +147,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -217,7 +219,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -225,7 +227,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -233,7 +235,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs index c1b064173..8acc880a8 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs @@ -39,7 +39,7 @@ public class RdWr : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -105,7 +105,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -113,7 +113,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs index 91d471d1c..1b9ecdbc1 100644 --- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs @@ -39,7 +39,7 @@ public class Rdxx : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -105,7 +105,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -113,7 +113,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy65/UDCO.cs b/Aaru.Tests/Images/DiskCopy65/UDCO.cs index 6fa468a94..4a3839597 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDCO.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDCO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy65; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDCO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "4306922864c6cf40a419fd5876b5879d", + Md5 = "4306922864c6cf40a419fd5876b5879d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1444, SectorSize = 512, - MD5 = "a885825f28929a5626e71201b37ed96e" + Md5 = "a885825f28929a5626e71201b37ed96e" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -83,7 +85,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "180a0db19ecfe9d55d068c6460f028be" + Md5 = "180a0db19ecfe9d55d068c6460f028be" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -101,7 +103,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "e307949819edeecd5e855b661a3bfba3" + Md5 = "e307949819edeecd5e855b661a3bfba3" }, new BlockImageTestExpected { @@ -109,7 +111,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "c5a5ad78997ddc30f1dc768112f52609" + Md5 = "c5a5ad78997ddc30f1dc768112f52609" }, new BlockImageTestExpected { @@ -117,7 +119,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "5fd35f80791be6eaa44195875aa0465a" + Md5 = "5fd35f80791be6eaa44195875aa0465a" }, new BlockImageTestExpected { @@ -125,7 +127,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "1c336199896d1f9bff9b2d5c49b48b63" + Md5 = "1c336199896d1f9bff9b2d5c49b48b63" }, new BlockImageTestExpected { @@ -133,7 +135,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "d654f84668c671e801f4aa107e0aee92" + Md5 = "d654f84668c671e801f4aa107e0aee92" }, new BlockImageTestExpected { @@ -141,7 +143,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" + Md5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs index 6f01fc556..1cb1427c6 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy65; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDCo_obsolete : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "4306922864c6cf40a419fd5876b5879d", + Md5 = "4306922864c6cf40a419fd5876b5879d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1444, SectorSize = 512, - MD5 = "a885825f28929a5626e71201b37ed96e" + Md5 = "a885825f28929a5626e71201b37ed96e" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -83,7 +85,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "180a0db19ecfe9d55d068c6460f028be" + Md5 = "180a0db19ecfe9d55d068c6460f028be" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -101,7 +103,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "e307949819edeecd5e855b661a3bfba3" + Md5 = "e307949819edeecd5e855b661a3bfba3" }, new BlockImageTestExpected { @@ -109,7 +111,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "c5a5ad78997ddc30f1dc768112f52609" + Md5 = "c5a5ad78997ddc30f1dc768112f52609" }, new BlockImageTestExpected { @@ -117,7 +119,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "5fd35f80791be6eaa44195875aa0465a" + Md5 = "5fd35f80791be6eaa44195875aa0465a" }, new BlockImageTestExpected { @@ -125,7 +127,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "1c336199896d1f9bff9b2d5c49b48b63" + Md5 = "1c336199896d1f9bff9b2d5c49b48b63" }, new BlockImageTestExpected { @@ -133,7 +135,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "d654f84668c671e801f4aa107e0aee92" + Md5 = "d654f84668c671e801f4aa107e0aee92" }, new BlockImageTestExpected { @@ -141,7 +143,7 @@ public class UDCo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" + Md5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs index aab0152ed..797994a0a 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy65; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDRAW : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "4306922864c6cf40a419fd5876b5879d", + Md5 = "4306922864c6cf40a419fd5876b5879d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1444, SectorSize = 512, - MD5 = "a885825f28929a5626e71201b37ed96e" + Md5 = "a885825f28929a5626e71201b37ed96e" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -83,7 +85,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "180a0db19ecfe9d55d068c6460f028be" + Md5 = "180a0db19ecfe9d55d068c6460f028be" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -101,7 +103,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "e307949819edeecd5e855b661a3bfba3" + Md5 = "e307949819edeecd5e855b661a3bfba3" }, new BlockImageTestExpected { @@ -109,7 +111,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "c5a5ad78997ddc30f1dc768112f52609" + Md5 = "c5a5ad78997ddc30f1dc768112f52609" }, new BlockImageTestExpected { @@ -117,7 +119,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "5fd35f80791be6eaa44195875aa0465a" + Md5 = "5fd35f80791be6eaa44195875aa0465a" }, new BlockImageTestExpected { @@ -125,7 +127,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "1c336199896d1f9bff9b2d5c49b48b63" + Md5 = "1c336199896d1f9bff9b2d5c49b48b63" }, new BlockImageTestExpected { @@ -133,7 +135,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "d654f84668c671e801f4aa107e0aee92" + Md5 = "d654f84668c671e801f4aa107e0aee92" }, new BlockImageTestExpected { @@ -141,7 +143,7 @@ public class UDRAW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" + Md5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy65/UDRO.cs b/Aaru.Tests/Images/DiskCopy65/UDRO.cs index f75a9536e..63972c264 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDRO.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDRO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy65; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDRO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "4306922864c6cf40a419fd5876b5879d", + Md5 = "4306922864c6cf40a419fd5876b5879d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1444, SectorSize = 512, - MD5 = "a885825f28929a5626e71201b37ed96e" + Md5 = "a885825f28929a5626e71201b37ed96e" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -83,7 +85,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "180a0db19ecfe9d55d068c6460f028be" + Md5 = "180a0db19ecfe9d55d068c6460f028be" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -101,7 +103,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "e307949819edeecd5e855b661a3bfba3" + Md5 = "e307949819edeecd5e855b661a3bfba3" }, new BlockImageTestExpected { @@ -109,7 +111,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "c5a5ad78997ddc30f1dc768112f52609" + Md5 = "c5a5ad78997ddc30f1dc768112f52609" }, new BlockImageTestExpected { @@ -117,7 +119,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "5fd35f80791be6eaa44195875aa0465a" + Md5 = "5fd35f80791be6eaa44195875aa0465a" }, new BlockImageTestExpected { @@ -125,7 +127,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "1c336199896d1f9bff9b2d5c49b48b63" + Md5 = "1c336199896d1f9bff9b2d5c49b48b63" }, new BlockImageTestExpected { @@ -133,7 +135,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "d654f84668c671e801f4aa107e0aee92" + Md5 = "d654f84668c671e801f4aa107e0aee92" }, new BlockImageTestExpected { @@ -141,7 +143,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" + Md5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs index 181a41835..9aa43ffc5 100644 --- a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs +++ b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskCopy65; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDRo_obsolete : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "4306922864c6cf40a419fd5876b5879d", + Md5 = "4306922864c6cf40a419fd5876b5879d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1444, SectorSize = 512, - MD5 = "a885825f28929a5626e71201b37ed96e" + Md5 = "a885825f28929a5626e71201b37ed96e" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -83,7 +85,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "180a0db19ecfe9d55d068c6460f028be" + Md5 = "180a0db19ecfe9d55d068c6460f028be" /* TODO: NullReferenceException when getting cluster of last depth folder Partitions = new[] { @@ -101,7 +103,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "e307949819edeecd5e855b661a3bfba3" + Md5 = "e307949819edeecd5e855b661a3bfba3" }, new BlockImageTestExpected { @@ -109,7 +111,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "c5a5ad78997ddc30f1dc768112f52609" + Md5 = "c5a5ad78997ddc30f1dc768112f52609" }, new BlockImageTestExpected { @@ -117,7 +119,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "5fd35f80791be6eaa44195875aa0465a" + Md5 = "5fd35f80791be6eaa44195875aa0465a" }, new BlockImageTestExpected { @@ -125,7 +127,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2884, SectorSize = 512, - MD5 = "1c336199896d1f9bff9b2d5c49b48b63" + Md5 = "1c336199896d1f9bff9b2d5c49b48b63" }, new BlockImageTestExpected { @@ -133,7 +135,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1604, SectorSize = 512, - MD5 = "d654f84668c671e801f4aa107e0aee92" + Md5 = "d654f84668c671e801f4aa107e0aee92" }, new BlockImageTestExpected { @@ -141,7 +143,7 @@ public class UDRo_obsolete : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3364, SectorSize = 512, - MD5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" + Md5 = "e7b1de07a1f402e4663c3dee4fd3d6fe" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskDupe.cs b/Aaru.Tests/Images/DiskDupe.cs index a197acd24..6ed9f8268 100644 --- a/Aaru.Tests/Images/DiskDupe.cs +++ b/Aaru.Tests/Images/DiskDupe.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class DiskDupe : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskDupe"); - public override IMediaImage _plugin => new DiscImages.DiskDupe(); + public override IMediaImage Plugin => new DiscImages.DiskDupe(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0d5735269cb9c3d0e63ec9ccfb38e4e2" + Md5 = "0d5735269cb9c3d0e63ec9ccfb38e4e2" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -66,7 +66,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "fa639b4bd96d2fb7be33a1725e9c7c4f" + Md5 = "fa639b4bd96d2fb7be33a1725e9c7c4f" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -84,7 +84,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f63e676310b2f1a9e44e9a471c7cf1f2", + Md5 = "f63e676310b2f1a9e44e9a471c7cf1f2", Partitions = new[] { new BlockPartitionVolumes @@ -100,7 +100,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0fca5f810ce3179bbc67c7967370f1c2" + Md5 = "0fca5f810ce3179bbc67c7967370f1c2" }, new BlockImageTestExpected { @@ -108,7 +108,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9fbe4254ed34991d38a4cde57e867360", + Md5 = "9fbe4254ed34991d38a4cde57e867360", Partitions = new[] { new BlockPartitionVolumes @@ -124,7 +124,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2302991363cb3681cffdc4388915b51e", + Md5 = "2302991363cb3681cffdc4388915b51e", Partitions = new[] { new BlockPartitionVolumes @@ -140,7 +140,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "015f4f812fd5b03741e3dcad534a4a8d", + Md5 = "015f4f812fd5b03741e3dcad534a4a8d", Partitions = new[] { new BlockPartitionVolumes @@ -156,7 +156,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "dc2b7b7eb6d83ce25a6f51d1e457ca24", + Md5 = "dc2b7b7eb6d83ce25a6f51d1e457ca24", Partitions = new[] { new BlockPartitionVolumes @@ -172,7 +172,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "410203d55d05581ad377fc8ffda0f4e8" + Md5 = "410203d55d05581ad377fc8ffda0f4e8" }, new BlockImageTestExpected { @@ -180,7 +180,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1cc0a19579c841ace37c36ef1cd57a05", + Md5 = "1cc0a19579c841ace37c36ef1cd57a05", Partitions = new[] { new BlockPartitionVolumes @@ -196,7 +196,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "323322148c4c7394a92fa6a73542e32a", + Md5 = "323322148c4c7394a92fa6a73542e32a", Partitions = new[] { new BlockPartitionVolumes @@ -212,7 +212,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -228,7 +228,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "28f3cda83fa1e22a420e06704abc6139", + Md5 = "28f3cda83fa1e22a420e06704abc6139", Partitions = new[] { new BlockPartitionVolumes @@ -244,7 +244,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "b057202adb98964e8f630a3299e86490", + Md5 = "b057202adb98964e8f630a3299e86490", Partitions = new[] { new BlockPartitionVolumes @@ -260,7 +260,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d987313a46843017e906ee122163ded6", + Md5 = "d987313a46843017e906ee122163ded6", Partitions = new[] { new BlockPartitionVolumes @@ -276,7 +276,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "c64ef58dc6d875b9f6e7c0a7362c6832", + Md5 = "c64ef58dc6d875b9f6e7c0a7362c6832", Partitions = new[] { new BlockPartitionVolumes @@ -292,7 +292,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -308,7 +308,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c8b03a8550ed3e70e1c78316aa445aa", + Md5 = "1c8b03a8550ed3e70e1c78316aa445aa", Partitions = new[] { new BlockPartitionVolumes @@ -324,7 +324,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -340,7 +340,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -356,7 +356,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "b81a4987f89936630b8ebc62e4bbce6e" + Md5 = "b81a4987f89936630b8ebc62e4bbce6e" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -374,7 +374,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "0e002201126260afa26b03df227175d7", + Md5 = "0e002201126260afa26b03df227175d7", Partitions = new[] { new BlockPartitionVolumes @@ -390,7 +390,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "07eefdd2a6261be61af5b29de9dd56ee", + Md5 = "07eefdd2a6261be61af5b29de9dd56ee", Partitions = new[] { new BlockPartitionVolumes @@ -406,7 +406,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "b7c377c7456071b7e886210d9b002bf3", + Md5 = "b7c377c7456071b7e886210d9b002bf3", Partitions = new[] { new BlockPartitionVolumes @@ -422,7 +422,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "fe4ce9782a5a42bf2bf6b41f7a51d744", + Md5 = "fe4ce9782a5a42bf2bf6b41f7a51d744", Partitions = new[] { new BlockPartitionVolumes @@ -438,7 +438,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "b28f4850eaca9909db3aa8d9b185d1a2", + Md5 = "b28f4850eaca9909db3aa8d9b185d1a2", Partitions = new[] { new BlockPartitionVolumes @@ -454,7 +454,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0c438ab43509da1863b1fecff8d806aa", + Md5 = "0c438ab43509da1863b1fecff8d806aa", Partitions = new[] { new BlockPartitionVolumes @@ -472,7 +472,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6715d0ed2097a762e24e64165bd6c801" + Md5 = "6715d0ed2097a762e24e64165bd6c801" }, new BlockImageTestExpected { @@ -480,7 +480,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "834cf0380eba331b4dc43ad55edd42a6", + Md5 = "834cf0380eba331b4dc43ad55edd42a6", Partitions = new[] { new BlockPartitionVolumes @@ -496,7 +496,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "3201d13f82cb3d933158d2c5208c20a1", + Md5 = "3201d13f82cb3d933158d2c5208c20a1", Partitions = new[] { new BlockPartitionVolumes @@ -512,7 +512,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b4b8eea68483ad5ba983c865e93f2ec6", + Md5 = "b4b8eea68483ad5ba983c865e93f2ec6", Partitions = new[] { new BlockPartitionVolumes @@ -528,7 +528,7 @@ public class DiskDupe : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3335dc14ff1efa58d410afc045a9b425", + Md5 = "3335dc14ff1efa58d410afc045a9b425", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs index c382d4996..fcb060865 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs @@ -38,7 +38,7 @@ public class DiskCopy42 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2"); - public override IMediaImage _plugin => new DiscImages.DiskCopy42(); + public override IMediaImage Plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +80,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -96,7 +96,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -104,7 +104,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -112,7 +112,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -120,7 +120,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -128,7 +128,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs index 79ae2c963..123375e79 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class ROCo : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo"); - public override IMediaImage _plugin => new Ndif(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10144, SectorSize = 512, - MD5 = "5841dbaceb4937df2518742c2d5cb8d5" + Md5 = "5841dbaceb4937df2518742c2d5cb8d5" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs index ceb97fa8d..fe51fdb63 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs @@ -39,7 +39,7 @@ public class RdWr : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr"); - public override IMediaImage _plugin => new Ndif(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +153,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +161,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +169,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +177,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +185,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +193,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +201,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs index 70ac38c9d..5424f8ac4 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs @@ -39,7 +39,7 @@ public class Rdxx : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx"); - public override IMediaImage _plugin => new Ndif(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10144, SectorSize = 512, - MD5 = "5841dbaceb4937df2518742c2d5cb8d5" + Md5 = "5841dbaceb4937df2518742c2d5cb8d5" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +153,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +161,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +169,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +177,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +185,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +193,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +201,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs index 8fa77f3a7..308be210a 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class IPOD : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class IPOD : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs index 02272d694..042b87407 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDBZ : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDBZ : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs index 7b74bae5c..2433ddcf0 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDCO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDCO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs index d9995cd56..6056db28a 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDRO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDRO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs index bb2fc49f3..a902220d5 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDRW : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDRW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs index 7925e70d3..ff19017ac 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDTO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDTO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10292, SectorSize = 512, - MD5 = "ad555f90bad6a75e8b6ba6cdaafc4458" + Md5 = "ad555f90bad6a75e8b6ba6cdaafc4458" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs index b3a6155e1..3593f7854 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UDZO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UDZO : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs index 19a690651..4d97f0948 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class UFBI : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +83,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "df3b4331a4a5652393ff55f001998439", + Md5 = "df3b4331a4a5652393ff55f001998439", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -121,7 +123,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "894fa8596f64e161fe7d7f81e74a8839" + Md5 = "894fa8596f64e161fe7d7f81e74a8839" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10240, SectorSize = 512, - MD5 = "506c3deb99e78579b4d77e76224d3b4e" + Md5 = "506c3deb99e78579b4d77e76224d3b4e" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -161,7 +163,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -169,7 +171,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2880, SectorSize = 512, - MD5 = "b37823c7a90d1917f719ba5927b23da8" + Md5 = "b37823c7a90d1917f719ba5927b23da8" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1440, SectorSize = 512, - MD5 = "4942032f7bf1d115237ea1764424828b" + Md5 = "4942032f7bf1d115237ea1764424828b" }, new BlockImageTestExpected { @@ -193,7 +195,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -201,7 +203,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3360, SectorSize = 512, - MD5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" + Md5 = "cdfebf3f8b8f250dc6905a90dd1bc90f" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class UFBI : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10304, SectorSize = 512, - MD5 = "b7d4ad55c7702658081b6578b588a57f" + Md5 = "b7d4ad55c7702658081b6578b588a57f" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs index 258b3634c..ca826ac81 100644 --- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs +++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs @@ -28,17 +28,19 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes.Interfaces; using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class ULMO : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO"); - public override IMediaImage _plugin => new Udif(); + public override IMediaImage Plugin => new Udif(); public override BlockImageTestExpected[] Tests => new BlockImageTestExpected[] { diff --git a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs index cc062ced6..0720e489e 100644 --- a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs +++ b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs @@ -39,7 +39,7 @@ public class ImageDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "ImageDisk"); - public override IMediaImage _plugin => new Imd(); + public override IMediaImage Plugin => new Imd(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "2626f65b49ec085253c41fa2e2a9e788" + Md5 = "2626f65b49ec085253c41fa2e2a9e788" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "9d978dff1196b456b8372d78e6b17970" + Md5 = "9d978dff1196b456b8372d78e6b17970" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1812, SectorSize = 1024, - MD5 = "7ee82cecd23b30cc9aa6f0ec59877851" + Md5 = "7ee82cecd23b30cc9aa6f0ec59877851" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/DiskUtilities/Raw.cs b/Aaru.Tests/Images/DiskUtilities/Raw.cs index 8df3738c4..6c4068b92 100644 --- a/Aaru.Tests/Images/DiskUtilities/Raw.cs +++ b/Aaru.Tests/Images/DiskUtilities/Raw.cs @@ -39,7 +39,7 @@ public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2626f65b49ec085253c41fa2e2a9e788" + Md5 = "2626f65b49ec085253c41fa2e2a9e788" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "7db6730656efb22695cdf0a49e2674c9" + Md5 = "7db6730656efb22695cdf0a49e2674c9" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "9d978dff1196b456b8372d78e6b17970" + Md5 = "9d978dff1196b456b8372d78e6b17970" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3605, SectorSize = 512, - MD5 = "7ee82cecd23b30cc9aa6f0ec59877851" + Md5 = "7ee82cecd23b30cc9aa6f0ec59877851" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3768, SectorSize = 512, - MD5 = "c96c0be31797a0e6c9f23aad8ae38555" + Md5 = "c96c0be31797a0e6c9f23aad8ae38555" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" } /* TODO: XDF reading is not implemented new BlockImageTestExpected diff --git a/Aaru.Tests/Images/DriDiskCopy.cs b/Aaru.Tests/Images/DriDiskCopy.cs index 69409e43e..ef9538cf7 100644 --- a/Aaru.Tests/Images/DriDiskCopy.cs +++ b/Aaru.Tests/Images/DriDiskCopy.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class DriDiskCopy : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DRI DISKCOPY"); - public override IMediaImage _plugin => new DiscImages.DriDiskCopy(); + public override IMediaImage Plugin => new DiscImages.DriDiskCopy(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "e8bbbd22db87181974e12ba0227ea011" + Md5 = "e8bbbd22db87181974e12ba0227ea011" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "9f5635f3df4d880a500910b0ad1ab535" + Md5 = "9f5635f3df4d880a500910b0ad1ab535" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "95ea232f59e44db374b994cfe7f1c07f", + Md5 = "95ea232f59e44db374b994cfe7f1c07f", Partitions = new[] { new BlockPartitionVolumes @@ -79,7 +79,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9e2b01f4397db2a6c76e2bc267df37b3" + Md5 = "9e2b01f4397db2a6c76e2bc267df37b3" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2302991363cb3681cffdc4388915b51e", + Md5 = "2302991363cb3681cffdc4388915b51e", Partitions = new[] { new BlockPartitionVolumes @@ -103,7 +103,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f7dd138edcab7bd328d7396d48aac395" + Md5 = "f7dd138edcab7bd328d7396d48aac395" }, new BlockImageTestExpected { @@ -111,7 +111,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "af83d011608042d35021e39aa5e10b2f", + Md5 = "af83d011608042d35021e39aa5e10b2f", Partitions = new[] { new BlockPartitionVolumes @@ -127,7 +127,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6642c1a32d2c58e93481d664974fc202", + Md5 = "6642c1a32d2c58e93481d664974fc202", Partitions = new[] { new BlockPartitionVolumes @@ -143,7 +143,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "846f01b8b60cb3c775bd66419e977926", + Md5 = "846f01b8b60cb3c775bd66419e977926", Partitions = new[] { new BlockPartitionVolumes @@ -159,7 +159,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5101f89850dc28efbcfb7622086a9ddf", + Md5 = "5101f89850dc28efbcfb7622086a9ddf", Partitions = new[] { new BlockPartitionVolumes @@ -175,7 +175,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "8e570be2ed1f00ddea82e50a2d9c446a", + Md5 = "8e570be2ed1f00ddea82e50a2d9c446a", Partitions = new[] { new BlockPartitionVolumes @@ -191,7 +191,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "abba2a1ddd60a649047a9c44d94bbeae", + Md5 = "abba2a1ddd60a649047a9c44d94bbeae", Partitions = new[] { new BlockPartitionVolumes @@ -207,7 +207,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e3bc48bec81be5b35be73d41fdffd2ab", + Md5 = "e3bc48bec81be5b35be73d41fdffd2ab", Partitions = new[] { new BlockPartitionVolumes @@ -223,7 +223,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "43b5068af9d016d1432eb2e12d2b802a", + Md5 = "43b5068af9d016d1432eb2e12d2b802a", Partitions = new[] { new BlockPartitionVolumes @@ -239,7 +239,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5bf2ad4dc300592604b6e32f8b8e2656", + Md5 = "5bf2ad4dc300592604b6e32f8b8e2656", Partitions = new[] { new BlockPartitionVolumes @@ -255,7 +255,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", + Md5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", Partitions = new[] { new BlockPartitionVolumes @@ -271,7 +271,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "56d181a6bb8713e6b2854fe8887faab6", + Md5 = "56d181a6bb8713e6b2854fe8887faab6", Partitions = new[] { new BlockPartitionVolumes @@ -287,7 +287,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "41aef7cff26aefda1add8d49c5b962c2", + Md5 = "41aef7cff26aefda1add8d49c5b962c2", Partitions = new[] { new BlockPartitionVolumes @@ -303,7 +303,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "2437c5f089f1cba3866b36360b016f16", + Md5 = "2437c5f089f1cba3866b36360b016f16", Partitions = new[] { new BlockPartitionVolumes @@ -319,7 +319,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "bdaa8f17373b265830fdf3a06b794367", + Md5 = "bdaa8f17373b265830fdf3a06b794367", Partitions = new[] { new BlockPartitionVolumes @@ -335,7 +335,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "629932c285478d0540ff7936aa008351", + Md5 = "629932c285478d0540ff7936aa008351", Partitions = new[] { new BlockPartitionVolumes @@ -351,7 +351,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "7a2abef5d4701e2e49abb05af8d4da50", + Md5 = "7a2abef5d4701e2e49abb05af8d4da50", Partitions = new[] { new BlockPartitionVolumes @@ -367,7 +367,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "e3507522c914264f44fb2c92c3170c09", + Md5 = "e3507522c914264f44fb2c92c3170c09", Partitions = new[] { new BlockPartitionVolumes @@ -383,7 +383,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "824fe65dbb1a42b6b94f05405ef984f2", + Md5 = "824fe65dbb1a42b6b94f05405ef984f2", Partitions = new[] { new BlockPartitionVolumes @@ -399,7 +399,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", + Md5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", Partitions = new[] { new BlockPartitionVolumes @@ -415,7 +415,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "936b20bb0966fe693b4d5e2353e24846", + Md5 = "936b20bb0966fe693b4d5e2353e24846", Partitions = new[] { new BlockPartitionVolumes @@ -431,7 +431,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "803b01a0b440c2837d37c21308f30cd5" + Md5 = "803b01a0b440c2837d37c21308f30cd5" }, new BlockImageTestExpected { @@ -439,7 +439,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "aa0d31f914760cc4cde75479779ebed6", + Md5 = "aa0d31f914760cc4cde75479779ebed6", Partitions = new[] { new BlockPartitionVolumes @@ -455,7 +455,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "31269ed6464302ae26d22b7c87bceb23", + Md5 = "31269ed6464302ae26d22b7c87bceb23", Partitions = new[] { new BlockPartitionVolumes @@ -471,7 +471,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "5e413433c54f48978d281c6e66d1106e", + Md5 = "5e413433c54f48978d281c6e66d1106e", Partitions = new[] { new BlockPartitionVolumes @@ -487,7 +487,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "4fc28b0128543b2eb70f6432c4c8a980", + Md5 = "4fc28b0128543b2eb70f6432c4c8a980", Partitions = new[] { new BlockPartitionVolumes @@ -503,7 +503,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "24a7459d080cea3a60d131b8fd7dc5d1", + Md5 = "24a7459d080cea3a60d131b8fd7dc5d1", Partitions = new[] { new BlockPartitionVolumes @@ -519,7 +519,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3570, SectorSize = 512, - MD5 = "2031b1e16ee2defc0d15f732f633df33", + Md5 = "2031b1e16ee2defc0d15f732f633df33", Partitions = new[] { new BlockPartitionVolumes @@ -535,7 +535,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5fc19ca552b6db957061e9a1750394d2", + Md5 = "5fc19ca552b6db957061e9a1750394d2", Partitions = new[] { new BlockPartitionVolumes @@ -551,7 +551,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "a33b46f042b78fe3d0b3c5dbb3908a93", + Md5 = "a33b46f042b78fe3d0b3c5dbb3908a93", Partitions = new[] { new BlockPartitionVolumes @@ -567,7 +567,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "565d3c001cbb532154aa5d3c65b2439c", + Md5 = "565d3c001cbb532154aa5d3c65b2439c", Partitions = new[] { new BlockPartitionVolumes @@ -583,7 +583,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e60442c3ebd72c99bdd7545fdba59613", + Md5 = "e60442c3ebd72c99bdd7545fdba59613", Partitions = new[] { new BlockPartitionVolumes @@ -599,7 +599,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "058a33a129539285c9b64010496af52f", + Md5 = "058a33a129539285c9b64010496af52f", Partitions = new[] { new BlockPartitionVolumes @@ -615,7 +615,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0726ecbc38965d30a6222c3e74cd1aa3", + Md5 = "0726ecbc38965d30a6222c3e74cd1aa3", Partitions = new[] { new BlockPartitionVolumes @@ -631,7 +631,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "c9a193837db7d8a5eb025eb41e8a76d7" + Md5 = "c9a193837db7d8a5eb025eb41e8a76d7" }, new BlockImageTestExpected { @@ -639,7 +639,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c38d69ac88520f14fcc6d6ced22b065d", + Md5 = "c38d69ac88520f14fcc6d6ced22b065d", Partitions = new[] { new BlockPartitionVolumes @@ -655,7 +655,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "91d51964e1e64ef3f6f622fa19aa833c", + Md5 = "91d51964e1e64ef3f6f622fa19aa833c", Partitions = new[] { new BlockPartitionVolumes @@ -671,7 +671,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "db36d9651c952ff679ec33223c8db2d3", + Md5 = "db36d9651c952ff679ec33223c8db2d3", Partitions = new[] { new BlockPartitionVolumes @@ -687,7 +687,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "5f1d98806309aee7f81de72e51e6d386", + Md5 = "5f1d98806309aee7f81de72e51e6d386", Partitions = new[] { new BlockPartitionVolumes @@ -703,7 +703,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1207a1cc7ff73d4f74c8984b4e7db33f", + Md5 = "1207a1cc7ff73d4f74c8984b4e7db33f", Partitions = new[] { new BlockPartitionVolumes @@ -719,7 +719,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "c97a3081fd25474b6b7945b8572d5ab8", + Md5 = "c97a3081fd25474b6b7945b8572d5ab8", Partitions = new[] { new BlockPartitionVolumes @@ -735,7 +735,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "0abf995856080e5292e63c63f7c97a45" + Md5 = "0abf995856080e5292e63c63f7c97a45" }, new BlockImageTestExpected { @@ -743,7 +743,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "8be2aaf6ecea213aee9fc82c8a85061e" + Md5 = "8be2aaf6ecea213aee9fc82c8a85061e" }, new BlockImageTestExpected { @@ -751,7 +751,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "0a432572a28d3b53a0cf2b5c211fe777", + Md5 = "0a432572a28d3b53a0cf2b5c211fe777", Partitions = new[] { new BlockPartitionVolumes @@ -767,7 +767,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1804, SectorSize = 512, - MD5 = "cd84fa2d62ac7c36783224c3ba0be664", + Md5 = "cd84fa2d62ac7c36783224c3ba0be664", Partitions = new[] { new BlockPartitionVolumes @@ -783,7 +783,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "63d29a9d867d924421c10793a0f22965", + Md5 = "63d29a9d867d924421c10793a0f22965", Partitions = new[] { new BlockPartitionVolumes @@ -799,7 +799,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3116, SectorSize = 512, - MD5 = "21778906886c0314f0f33c4b0040ba16", + Md5 = "21778906886c0314f0f33c4b0040ba16", Partitions = new[] { new BlockPartitionVolumes @@ -815,7 +815,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3608, SectorSize = 512, - MD5 = "6b8e89b1d5117ba19c3e52544ffe041e", + Md5 = "6b8e89b1d5117ba19c3e52544ffe041e", Partitions = new[] { new BlockPartitionVolumes @@ -831,7 +831,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "543fc539902eb66b5c312d7908ecf97a", + Md5 = "543fc539902eb66b5c312d7908ecf97a", Partitions = new[] { new BlockPartitionVolumes @@ -847,7 +847,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1952, SectorSize = 512, - MD5 = "b30709f798bfb8469d02a82c882f780c", + Md5 = "b30709f798bfb8469d02a82c882f780c", Partitions = new[] { new BlockPartitionVolumes @@ -863,7 +863,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "0f3e923010b50b550591a89ea2dee62b", + Md5 = "0f3e923010b50b550591a89ea2dee62b", Partitions = new[] { new BlockPartitionVolumes @@ -879,7 +879,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3944, SectorSize = 512, - MD5 = "d5b927503abcd1978496bc679bb9c2f7", + Md5 = "d5b927503abcd1978496bc679bb9c2f7", Partitions = new[] { new BlockPartitionVolumes @@ -895,7 +895,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "d40a99cb549fcfb26fcf9ef01b5dfca7" + Md5 = "d40a99cb549fcfb26fcf9ef01b5dfca7" }, new BlockImageTestExpected { @@ -903,7 +903,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 410, SectorSize = 512, - MD5 = "7b41dd9ca7eb32828960eb1417a6092a", + Md5 = "7b41dd9ca7eb32828960eb1417a6092a", Partitions = new[] { new BlockPartitionVolumes @@ -919,7 +919,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "126dfd25363c076727dfaab03955c931", + Md5 = "126dfd25363c076727dfaab03955c931", Partitions = new[] { new BlockPartitionVolumes @@ -935,7 +935,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "e6492aac144f5f6f593b84c64680cf64", + Md5 = "e6492aac144f5f6f593b84c64680cf64", Partitions = new[] { new BlockPartitionVolumes @@ -951,7 +951,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -967,7 +967,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -983,7 +983,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -999,7 +999,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1015,7 +1015,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1031,7 +1031,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1047,7 +1047,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1063,7 +1063,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6631b66fdfd89319323771c41334c7ba", + Md5 = "6631b66fdfd89319323771c41334c7ba", Partitions = new[] { new BlockPartitionVolumes @@ -1079,7 +1079,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "56471a253f4d6803b634e2bbff6c0931", + Md5 = "56471a253f4d6803b634e2bbff6c0931", Partitions = new[] { new BlockPartitionVolumes @@ -1095,7 +1095,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "7d36aee5a3071ff75b979f3acb649c40", + Md5 = "7d36aee5a3071ff75b979f3acb649c40", Partitions = new[] { new BlockPartitionVolumes @@ -1111,7 +1111,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "0ccb62039363ab544c69eca229a17fae", + Md5 = "0ccb62039363ab544c69eca229a17fae", Partitions = new[] { new BlockPartitionVolumes @@ -1127,7 +1127,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "7851d31fad9302ff45d3ded4fba25387", + Md5 = "7851d31fad9302ff45d3ded4fba25387", Partitions = new[] { new BlockPartitionVolumes @@ -1143,7 +1143,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "915b08c82591e8488320e001b7303b6d", + Md5 = "915b08c82591e8488320e001b7303b6d", Partitions = new[] { new BlockPartitionVolumes @@ -1159,7 +1159,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "5e5ea6fe9adf842221fdc60e56630405", + Md5 = "5e5ea6fe9adf842221fdc60e56630405", Partitions = new[] { new BlockPartitionVolumes @@ -1175,7 +1175,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1191,7 +1191,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ddc6c1200c60e9f7796280f50c2e5283", + Md5 = "ddc6c1200c60e9f7796280f50c2e5283", Partitions = new[] { new BlockPartitionVolumes @@ -1207,7 +1207,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -1223,7 +1223,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "32823b9009c99b6711e89336ad03ec7f", + Md5 = "32823b9009c99b6711e89336ad03ec7f", Partitions = new[] { new BlockPartitionVolumes @@ -1239,7 +1239,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c8b03a8550ed3e70e1c78316aa445aa", + Md5 = "1c8b03a8550ed3e70e1c78316aa445aa", Partitions = new[] { new BlockPartitionVolumes @@ -1255,7 +1255,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -1271,7 +1271,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -1287,7 +1287,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "028769dc0abefab1740cc309432588b6" + Md5 = "028769dc0abefab1740cc309432588b6" }, new BlockImageTestExpected { @@ -1295,7 +1295,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "152023525154b45ab26687190bac94db", + Md5 = "152023525154b45ab26687190bac94db", Partitions = new[] { new BlockPartitionVolumes @@ -1311,7 +1311,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "db38ecd93f28dd065927fed21917eed5", + Md5 = "db38ecd93f28dd065927fed21917eed5", Partitions = new[] { new BlockPartitionVolumes @@ -1327,7 +1327,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "f206c0caa4e0eda37233ab6e89ab5493", + Md5 = "f206c0caa4e0eda37233ab6e89ab5493", Partitions = new[] { new BlockPartitionVolumes @@ -1343,7 +1343,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "554492a7b41f4cd9068a3a2b70eb0e5f", + Md5 = "554492a7b41f4cd9068a3a2b70eb0e5f", Partitions = new[] { new BlockPartitionVolumes @@ -1359,7 +1359,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "36dd03967a2a3369538cad29b8b74b71", + Md5 = "36dd03967a2a3369538cad29b8b74b71", Partitions = new[] { new BlockPartitionVolumes @@ -1375,7 +1375,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "4f5c02448e75bbc086e051c728414513", + Md5 = "4f5c02448e75bbc086e051c728414513", Partitions = new[] { new BlockPartitionVolumes @@ -1391,7 +1391,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5ac0a9fc7337f761098f816359b0f6f7", + Md5 = "5ac0a9fc7337f761098f816359b0f6f7", Partitions = new[] { new BlockPartitionVolumes @@ -1407,7 +1407,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ea6ec8e663218b1372048f6e25795b5", + Md5 = "1ea6ec8e663218b1372048f6e25795b5", Partitions = new[] { new BlockPartitionVolumes @@ -1423,7 +1423,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "77a1167b1b9043496e32b8578cde0ff0", + Md5 = "77a1167b1b9043496e32b8578cde0ff0", Partitions = new[] { new BlockPartitionVolumes @@ -1439,7 +1439,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4b07d760d65f3f0f8ffa5f2b81cee907", + Md5 = "4b07d760d65f3f0f8ffa5f2b81cee907", Partitions = new[] { new BlockPartitionVolumes @@ -1455,7 +1455,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "32c044c5c2b0bd13806149a759c14935", + Md5 = "32c044c5c2b0bd13806149a759c14935", Partitions = new[] { new BlockPartitionVolumes @@ -1471,7 +1471,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8752095abc13dba3f3467669da333891", + Md5 = "8752095abc13dba3f3467669da333891", Partitions = new[] { new BlockPartitionVolumes @@ -1487,7 +1487,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "aece7cd34bbba3e75307fa70404d9d30", + Md5 = "aece7cd34bbba3e75307fa70404d9d30", Partitions = new[] { new BlockPartitionVolumes @@ -1503,7 +1503,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "5289afb16a6e4a33213e3bcca56c6230", + Md5 = "5289afb16a6e4a33213e3bcca56c6230", Partitions = new[] { new BlockPartitionVolumes @@ -1519,7 +1519,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "1aef0a0ba233476db6567878c3c2b266", + Md5 = "1aef0a0ba233476db6567878c3c2b266", Partitions = new[] { new BlockPartitionVolumes @@ -1535,7 +1535,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b96596711f4d2ee85dfda0fe3b9f26c3", + Md5 = "b96596711f4d2ee85dfda0fe3b9f26c3", Partitions = new[] { new BlockPartitionVolumes @@ -1551,7 +1551,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a4f461af7fda5e93a7ab63fcbb7e7683", + Md5 = "a4f461af7fda5e93a7ab63fcbb7e7683", Partitions = new[] { new BlockPartitionVolumes @@ -1567,7 +1567,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "8f7f7099d4475f6631fcf0a79b031d61", + Md5 = "8f7f7099d4475f6631fcf0a79b031d61", Partitions = new[] { new BlockPartitionVolumes @@ -1583,7 +1583,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", + Md5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", Partitions = new[] { new BlockPartitionVolumes @@ -1599,7 +1599,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "3c77ca681df78e4cd7baa162aa9b0859", + Md5 = "3c77ca681df78e4cd7baa162aa9b0859", Partitions = new[] { new BlockPartitionVolumes @@ -1615,7 +1615,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "51da1f86c49657ffdb367bb2ddeb7990", + Md5 = "51da1f86c49657ffdb367bb2ddeb7990", Partitions = new[] { new BlockPartitionVolumes @@ -1631,7 +1631,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "b81a4987f89936630b8ebc62e4bbce6e" + Md5 = "b81a4987f89936630b8ebc62e4bbce6e" /* TODO IndexOutOfRangeException Partitions = new[] { @@ -1649,7 +1649,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "f76f92dd326c99c5efad5ee58daf72e1", + Md5 = "f76f92dd326c99c5efad5ee58daf72e1", Partitions = new[] { new BlockPartitionVolumes @@ -1665,7 +1665,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "b6f2c10e42908e334025bc4ffd81e771", + Md5 = "b6f2c10e42908e334025bc4ffd81e771", Partitions = new[] { new BlockPartitionVolumes @@ -1681,7 +1681,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f2f409ea2a62a7866fd2777cc4fc9739", + Md5 = "f2f409ea2a62a7866fd2777cc4fc9739", Partitions = new[] { new BlockPartitionVolumes @@ -1697,7 +1697,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "3e441d69cec5c3169274e1379de4af4b", + Md5 = "3e441d69cec5c3169274e1379de4af4b", Partitions = new[] { new BlockPartitionVolumes @@ -1713,7 +1713,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "30a93f30dd4485c6fc037fe0775d3fc7", + Md5 = "30a93f30dd4485c6fc037fe0775d3fc7", Partitions = new[] { new BlockPartitionVolumes @@ -1729,7 +1729,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "e0caf02cce5597c98313bcc480366ec7", + Md5 = "e0caf02cce5597c98313bcc480366ec7", Partitions = new[] { new BlockPartitionVolumes @@ -1745,7 +1745,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4af4904d2b3c815da7bef7049209f5eb", + Md5 = "4af4904d2b3c815da7bef7049209f5eb", Partitions = new[] { new BlockPartitionVolumes @@ -1761,7 +1761,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "39bf5a98bcb2185d855ac06378febcfa", + Md5 = "39bf5a98bcb2185d855ac06378febcfa", Partitions = new[] { new BlockPartitionVolumes @@ -1777,7 +1777,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "dc20055b6e6fd6f8e1114d4be2effeed", + Md5 = "dc20055b6e6fd6f8e1114d4be2effeed", Partitions = new[] { new BlockPartitionVolumes @@ -1793,7 +1793,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "56af9256cf71d5aac5fd5d363674bc49", + Md5 = "56af9256cf71d5aac5fd5d363674bc49", Partitions = new[] { new BlockPartitionVolumes @@ -1809,7 +1809,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "bbba1e2d1418e05c3a4e7b4d585d160b", + Md5 = "bbba1e2d1418e05c3a4e7b4d585d160b", Partitions = new[] { new BlockPartitionVolumes @@ -1825,7 +1825,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "bca3a045e81617f7f5ebb5a8818eac47", + Md5 = "bca3a045e81617f7f5ebb5a8818eac47", Partitions = new[] { new BlockPartitionVolumes @@ -1841,7 +1841,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a296663cb8e75e94603221352f29cfff", + Md5 = "a296663cb8e75e94603221352f29cfff", Partitions = new[] { new BlockPartitionVolumes @@ -1857,7 +1857,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ecda36ebf0e1100233cb0ec722c18583", + Md5 = "ecda36ebf0e1100233cb0ec722c18583", Partitions = new[] { new BlockPartitionVolumes @@ -1873,7 +1873,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "bbe58e26b8f8f822cd3edfd37a4e4924", + Md5 = "bbe58e26b8f8f822cd3edfd37a4e4924", Partitions = new[] { new BlockPartitionVolumes @@ -1889,7 +1889,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "b9b6ebdf711364c979de7cf70c3a438a", + Md5 = "b9b6ebdf711364c979de7cf70c3a438a", Partitions = new[] { new BlockPartitionVolumes @@ -1905,7 +1905,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d37424f367f545acbb397f2bed766843", + Md5 = "d37424f367f545acbb397f2bed766843", Partitions = new[] { new BlockPartitionVolumes @@ -1921,7 +1921,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9963dd6f19ce6bd56eabeccdfbbd821a", + Md5 = "9963dd6f19ce6bd56eabeccdfbbd821a", Partitions = new[] { new BlockPartitionVolumes @@ -1937,7 +1937,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "acf6604559ae8217f7869823e2429024", + Md5 = "acf6604559ae8217f7869823e2429024", Partitions = new[] { new BlockPartitionVolumes @@ -1953,7 +1953,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "23bf2139cdfdc4c16db058fd31ea6481", + Md5 = "23bf2139cdfdc4c16db058fd31ea6481", Partitions = new[] { new BlockPartitionVolumes @@ -1969,7 +1969,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "fa26adda0415f02057b113ad29c80c8d", + Md5 = "fa26adda0415f02057b113ad29c80c8d", Partitions = new[] { new BlockPartitionVolumes @@ -1985,7 +1985,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", + Md5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", Partitions = new[] { new BlockPartitionVolumes @@ -2001,7 +2001,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1386, SectorSize = 512, - MD5 = "e794a3ffa4069ea999fdf7146710fa9e", + Md5 = "e794a3ffa4069ea999fdf7146710fa9e", Partitions = new[] { new BlockPartitionVolumes @@ -2017,7 +2017,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "d81f5cb64fd0b99f138eab34110bbc3c", + Md5 = "d81f5cb64fd0b99f138eab34110bbc3c", Partitions = new[] { new BlockPartitionVolumes @@ -2033,7 +2033,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "a89006a75d13bee9202d1d6e52721ccb", + Md5 = "a89006a75d13bee9202d1d6e52721ccb", Partitions = new[] { new BlockPartitionVolumes @@ -2049,7 +2049,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "319fa8bef964c2a63e34bdb48e77cc4e", + Md5 = "319fa8bef964c2a63e34bdb48e77cc4e", Partitions = new[] { new BlockPartitionVolumes @@ -2065,7 +2065,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1804, SectorSize = 512, - MD5 = "306a61469b4c3c83f3e5f9ae409d83cd", + Md5 = "306a61469b4c3c83f3e5f9ae409d83cd", Partitions = new[] { new BlockPartitionVolumes @@ -2081,7 +2081,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "beef1cdb004dc69391d6b3d508988b95", + Md5 = "beef1cdb004dc69391d6b3d508988b95", Partitions = new[] { new BlockPartitionVolumes @@ -2097,7 +2097,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "29054ef703394ee3b35e849468a412ba" + Md5 = "29054ef703394ee3b35e849468a412ba" }, new BlockImageTestExpected { @@ -2105,7 +2105,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6213897b7dbf263f12abf76901d43862" + Md5 = "6213897b7dbf263f12abf76901d43862" }, new BlockImageTestExpected { @@ -2113,7 +2113,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "c91e852828c2aeee2fc94a6adbeed0ae", + Md5 = "c91e852828c2aeee2fc94a6adbeed0ae", Partitions = new[] { new BlockPartitionVolumes @@ -2129,7 +2129,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "efb6cfe53a6770f0ae388cb2c7f46264", + Md5 = "efb6cfe53a6770f0ae388cb2c7f46264", Partitions = new[] { new BlockPartitionVolumes @@ -2145,7 +2145,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "6116f7c1397cadd55ba8d79c2aadc9dd", + Md5 = "6116f7c1397cadd55ba8d79c2aadc9dd", Partitions = new[] { new BlockPartitionVolumes @@ -2161,7 +2161,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "93100f8d86e5d0d0e6340f59c52a5e0d", + Md5 = "93100f8d86e5d0d0e6340f59c52a5e0d", Partitions = new[] { new BlockPartitionVolumes @@ -2177,7 +2177,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "cf7b7d43aa70863bedcc4a8432a5af67", + Md5 = "cf7b7d43aa70863bedcc4a8432a5af67", Partitions = new[] { new BlockPartitionVolumes @@ -2193,7 +2193,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "215198cf2a336e718208fc207bb62c6d", + Md5 = "215198cf2a336e718208fc207bb62c6d", Partitions = new[] { new BlockPartitionVolumes @@ -2209,7 +2209,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3116, SectorSize = 512, - MD5 = "2c96964b5d91444302e21721c25ea120", + Md5 = "2c96964b5d91444302e21721c25ea120", Partitions = new[] { new BlockPartitionVolumes @@ -2225,7 +2225,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "02259cd5fbcc20f8484aa6bece7a37c6", + Md5 = "02259cd5fbcc20f8484aa6bece7a37c6", Partitions = new[] { new BlockPartitionVolumes @@ -2241,7 +2241,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "09ca721aa883d5bbaa422c7943b0782c", + Md5 = "09ca721aa883d5bbaa422c7943b0782c", Partitions = new[] { new BlockPartitionVolumes @@ -2257,7 +2257,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 2464, SectorSize = 1024, - MD5 = "84812b791fd2113b4aa00894f6894339" + Md5 = "84812b791fd2113b4aa00894f6894339" }, new BlockImageTestExpected { @@ -2265,7 +2265,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "d78dc81491edeec99aa202d02f3daf00" + Md5 = "d78dc81491edeec99aa202d02f3daf00" }, new BlockImageTestExpected { @@ -2273,7 +2273,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1968, SectorSize = 512, - MD5 = "9a8670fbaf6307b8d5f32aa10e1be435", + Md5 = "9a8670fbaf6307b8d5f32aa10e1be435", Partitions = new[] { new BlockPartitionVolumes @@ -2289,7 +2289,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1968, SectorSize = 512, - MD5 = "05d29642cdcddafa0dcaff91682f8fe0", + Md5 = "05d29642cdcddafa0dcaff91682f8fe0", Partitions = new[] { new BlockPartitionVolumes @@ -2305,7 +2305,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 9408, SectorSize = 128, - MD5 = "beb782f6bc970e32ceef79cd112e2e48" + Md5 = "beb782f6bc970e32ceef79cd112e2e48" }, new BlockImageTestExpected { @@ -2313,7 +2313,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2132, SectorSize = 512, - MD5 = "a99603cd3219aab1299e66b2999f0e57", + Md5 = "a99603cd3219aab1299e66b2999f0e57", Partitions = new[] { new BlockPartitionVolumes @@ -2329,7 +2329,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2132, SectorSize = 512, - MD5 = "3da419125f45e1fe3b46f6fad3acc1c2", + Md5 = "3da419125f45e1fe3b46f6fad3acc1c2", Partitions = new[] { new BlockPartitionVolumes @@ -2345,7 +2345,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -2361,7 +2361,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -2377,7 +2377,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "81d3bfec7b201f6a4503eb24c4394d4a", + Md5 = "81d3bfec7b201f6a4503eb24c4394d4a", Partitions = new[] { new BlockPartitionVolumes @@ -2393,7 +2393,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d07f7ffaee89742c6477aaaf94eb5715", + Md5 = "d07f7ffaee89742c6477aaaf94eb5715", Partitions = new[] { new BlockPartitionVolumes @@ -2409,7 +2409,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ff7649b679ba22ff20d39ff717dbec8", + Md5 = "1ff7649b679ba22ff20d39ff717dbec8", Partitions = new[] { new BlockPartitionVolumes @@ -2425,7 +2425,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9827ba1b3e9cac41263caabd862e78f9", + Md5 = "9827ba1b3e9cac41263caabd862e78f9", Partitions = new[] { new BlockPartitionVolumes @@ -2441,7 +2441,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "56af87802a9852e6e01e08d544740816", + Md5 = "56af87802a9852e6e01e08d544740816", Partitions = new[] { new BlockPartitionVolumes @@ -2457,7 +2457,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "fd7fb1ba11cdfe11db54af0322abf59d", + Md5 = "fd7fb1ba11cdfe11db54af0322abf59d", Partitions = new[] { new BlockPartitionVolumes @@ -2473,7 +2473,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d9db52d992a76bf3bbc626ff844215a5", + Md5 = "d9db52d992a76bf3bbc626ff844215a5", Partitions = new[] { new BlockPartitionVolumes @@ -2489,7 +2489,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "5949d0be57ce8bffcda7c4be4d1348ee", + Md5 = "5949d0be57ce8bffcda7c4be4d1348ee", Partitions = new[] { new BlockPartitionVolumes @@ -2505,7 +2505,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "4aeafaf2a088d6a7406856dce8118567", + Md5 = "4aeafaf2a088d6a7406856dce8118567", Partitions = new[] { new BlockPartitionVolumes @@ -2521,7 +2521,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3608, SectorSize = 512, - MD5 = "2f6964d410b275c8e9f60fe2f24b361a" + Md5 = "2f6964d410b275c8e9f60fe2f24b361a" }, new BlockImageTestExpected { @@ -2529,7 +2529,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3608, SectorSize = 512, - MD5 = "967726aede85c68f66887672078f8856", + Md5 = "967726aede85c68f66887672078f8856", Partitions = new[] { new BlockPartitionVolumes @@ -2545,7 +2545,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 15776, SectorSize = 128, - MD5 = "0037b5497d5cb0c7721085f61e223b6a" + Md5 = "0037b5497d5cb0c7721085f61e223b6a" }, new BlockImageTestExpected { @@ -2553,7 +2553,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "3fa4f87d7058ba940b88e0d80f0d7ded", + Md5 = "3fa4f87d7058ba940b88e0d80f0d7ded", Partitions = new[] { new BlockPartitionVolumes @@ -2569,7 +2569,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "5a6d961ed5f089364f2816692bcbe685", + Md5 = "5a6d961ed5f089364f2816692bcbe685", Partitions = new[] { new BlockPartitionVolumes @@ -2585,7 +2585,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b042310181410227d0072fef1e98a989", + Md5 = "b042310181410227d0072fef1e98a989", Partitions = new[] { new BlockPartitionVolumes @@ -2601,7 +2601,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56", + Md5 = "b4a602f67903c46eef62addb0780aa56", Partitions = new[] { new BlockPartitionVolumes @@ -2617,7 +2617,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1e06f21a1c11ea3347212da115bca08f", + Md5 = "1e06f21a1c11ea3347212da115bca08f", Partitions = new[] { new BlockPartitionVolumes @@ -2633,7 +2633,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "3fc3a03d049416d81f81cc3b9ea8e5de", + Md5 = "3fc3a03d049416d81f81cc3b9ea8e5de", Partitions = new[] { new BlockPartitionVolumes @@ -2649,7 +2649,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2bfd2e0a81bad704f8fc7758358cfcca", + Md5 = "2bfd2e0a81bad704f8fc7758358cfcca", Partitions = new[] { new BlockPartitionVolumes @@ -2665,7 +2665,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "a79ec33c623697b4562dacaed31523b8", + Md5 = "a79ec33c623697b4562dacaed31523b8", Partitions = new[] { new BlockPartitionVolumes @@ -2681,7 +2681,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "00e61c06bf29f0c04a7eabe2dbd7efb6", + Md5 = "00e61c06bf29f0c04a7eabe2dbd7efb6", Partitions = new[] { new BlockPartitionVolumes @@ -2697,7 +2697,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "3c4becd695ed25866d39966a9a93c2d9", + Md5 = "3c4becd695ed25866d39966a9a93c2d9", Partitions = new[] { new BlockPartitionVolumes @@ -2713,7 +2713,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 2464, SectorSize = 1024, - MD5 = "626ec389d4f8968170401b3775181a2b" + Md5 = "626ec389d4f8968170401b3775181a2b" }, new BlockImageTestExpected { @@ -2721,7 +2721,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "72282e11f7d91bf9c090b550fabfe80d", + Md5 = "72282e11f7d91bf9c090b550fabfe80d", Partitions = new[] { new BlockPartitionVolumes @@ -2737,7 +2737,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2720, SectorSize = 512, - MD5 = "457c1126dc7f36bbbabe9e17e90372e3", + Md5 = "457c1126dc7f36bbbabe9e17e90372e3", Partitions = new[] { new BlockPartitionVolumes @@ -2753,7 +2753,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "852181d5913c6f290872c66bbe992314", + Md5 = "852181d5913c6f290872c66bbe992314", Partitions = new[] { new BlockPartitionVolumes @@ -2769,7 +2769,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2980cc32504c945598dc50f1db576994", + Md5 = "2980cc32504c945598dc50f1db576994", Partitions = new[] { new BlockPartitionVolumes @@ -2785,7 +2785,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "c1c58d74fffb3656dd7f60f74ae8a629", + Md5 = "c1c58d74fffb3656dd7f60f74ae8a629", Partitions = new[] { new BlockPartitionVolumes @@ -2801,7 +2801,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "097bb2fd34cee5ebde7b5641975ffd60", + Md5 = "097bb2fd34cee5ebde7b5641975ffd60", Partitions = new[] { new BlockPartitionVolumes @@ -2817,7 +2817,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "e45d41a61fbe48f328c995fcc10a5548", + Md5 = "e45d41a61fbe48f328c995fcc10a5548", Partitions = new[] { new BlockPartitionVolumes @@ -2833,7 +2833,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "c25f2a57c71db1cd4fea2263598f544a", + Md5 = "c25f2a57c71db1cd4fea2263598f544a", Partitions = new[] { new BlockPartitionVolumes @@ -2849,7 +2849,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "15f71b92bd72aba5d80bf70eca4d5b1e", + Md5 = "15f71b92bd72aba5d80bf70eca4d5b1e", Partitions = new[] { new BlockPartitionVolumes @@ -2865,7 +2865,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "d88c8d818e238c9e52b8588b5fd52efe", + Md5 = "d88c8d818e238c9e52b8588b5fd52efe", Partitions = new[] { new BlockPartitionVolumes @@ -2881,7 +2881,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "3d5fcdaf627257ae9f50a06bdba26965", + Md5 = "3d5fcdaf627257ae9f50a06bdba26965", Partitions = new[] { new BlockPartitionVolumes @@ -2897,7 +2897,7 @@ public class DriDiskCopy : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "4cb9398cf02ed9e08d0972c1ccba804b" + Md5 = "4cb9398cf02ed9e08d0972c1ccba804b" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/GameJack6.cs b/Aaru.Tests/Images/GameJack6.cs index b82aa60fb..3f47915a6 100644 --- a/Aaru.Tests/Images/GameJack6.cs +++ b/Aaru.Tests/Images/GameJack6.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class GameJack6 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "GameJack 6"); - public override IMediaImage _plugin => new DiscImages.Alcohol120(); + public override IMediaImage Plugin => new DiscImages.Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] { @@ -46,9 +46,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdrom_cooked_nodpm.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "1994c303674718c74b35f9a4ea1d3515", Tracks = new[] { new TrackInfoTestExpected @@ -84,9 +84,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdrom_cooked.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "1994c303674718c74b35f9a4ea1d3515", Tracks = new[] { new TrackInfoTestExpected @@ -122,9 +122,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdrom_nodpm.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "66518892168f9bd5003e14979573861c", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "66518892168f9bd5003e14979573861c", Tracks = new[] { new TrackInfoTestExpected @@ -160,9 +160,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdrom.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "8f0313d7a5f85e23be0d254f3c091004", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "8f0313d7a5f85e23be0d254f3c091004", Tracks = new[] { new TrackInfoTestExpected @@ -198,9 +198,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdrw.xmd", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "124df553ac9337d1b36c611aa1a3e16f", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "124df553ac9337d1b36c611aa1a3e16f", Tracks = new[] { new TrackInfoTestExpected @@ -230,9 +230,9 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_cdr.xmd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "248dd7375479f40267b6d4f9fd889d5b", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "248dd7375479f40267b6d4f9fd889d5b", Tracks = new[] { new TrackInfoTestExpected @@ -268,8 +268,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvdram_v1.xmd", MediaType = MediaType.DVDRAM, Sectors = 471091, - MD5 = "b6fe37716c05c1d52ef19c28946f3b76", - LongMD5 = "b6fe37716c05c1d52ef19c28946f3b76", + Md5 = "b6fe37716c05c1d52ef19c28946f3b76", + LongMd5 = "b6fe37716c05c1d52ef19c28946f3b76", Tracks = new[] { @@ -299,8 +299,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvdram_v2.xmd", MediaType = MediaType.DVDRAM, Sectors = 471091, - MD5 = "b6fe37716c05c1d52ef19c28946f3b76", - LongMD5 = "b6fe37716c05c1d52ef19c28946f3b76", + Md5 = "b6fe37716c05c1d52ef19c28946f3b76", + LongMd5 = "b6fe37716c05c1d52ef19c28946f3b76", Tracks = new[] { @@ -330,8 +330,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvdrom.xmd", MediaType = MediaType.DVDROM, Sectors = 2146358, - MD5 = "ae08c024d6942e62884abe137f66a80f", - LongMD5 = "ae08c024d6942e62884abe137f66a80f", + Md5 = "ae08c024d6942e62884abe137f66a80f", + LongMd5 = "ae08c024d6942e62884abe137f66a80f", Tracks = new[] { new TrackInfoTestExpected @@ -360,8 +360,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvd+rw.xmd", MediaType = MediaType.DVDPRW, Sectors = 2146358, - MD5 = "cea717c199230bef889ce268a473d2e6", - LongMD5 = "cea717c199230bef889ce268a473d2e6", + Md5 = "cea717c199230bef889ce268a473d2e6", + LongMd5 = "cea717c199230bef889ce268a473d2e6", Tracks = new[] { new TrackInfoTestExpected @@ -390,8 +390,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvd-rw.xmd", MediaType = MediaType.DVDRW, Sectors = 2146369, - MD5 = "a60ea0383c5b39e14e09f47e749a3f46", - LongMD5 = "a60ea0383c5b39e14e09f47e749a3f46", + Md5 = "a60ea0383c5b39e14e09f47e749a3f46", + LongMd5 = "a60ea0383c5b39e14e09f47e749a3f46", Tracks = new[] { new TrackInfoTestExpected @@ -420,8 +420,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvd+r.xmd", MediaType = MediaType.DVDPR, Sectors = 2146358, - MD5 = "cea717c199230bef889ce268a473d2e6", - LongMD5 = "cea717c199230bef889ce268a473d2e6", + Md5 = "cea717c199230bef889ce268a473d2e6", + LongMd5 = "cea717c199230bef889ce268a473d2e6", Tracks = new[] { new TrackInfoTestExpected @@ -450,8 +450,8 @@ public class GameJack6 : OpticalMediaImageTest TestFile = "report_dvd-r.xmd", MediaType = MediaType.DVDR, Sectors = 2146358, - MD5 = "6ba700d9b40b7ef1a9e4f78e317f124d", - LongMD5 = "6ba700d9b40b7ef1a9e4f78e317f124d", + Md5 = "6ba700d9b40b7ef1a9e4f78e317f124d", + LongMd5 = "6ba700d9b40b7ef1a9e4f78e317f124d", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/HDCopy.cs b/Aaru.Tests/Images/HDCopy.cs index 00860f6bf..59d5a3437 100644 --- a/Aaru.Tests/Images/HDCopy.cs +++ b/Aaru.Tests/Images/HDCopy.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class HDCopy : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY"); - public override IMediaImage _plugin => new HdCopy(); + public override IMediaImage Plugin => new HdCopy(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +50,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0fca5f810ce3179bbc67c7967370f1c2" + Md5 = "0fca5f810ce3179bbc67c7967370f1c2" }, new BlockImageTestExpected { @@ -56,7 +58,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7abbee308589a097e434c52099b1905c" + Md5 = "7abbee308589a097e434c52099b1905c" }, new BlockImageTestExpected { @@ -64,7 +66,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9fbe4254ed34991d38a4cde57e867360", + Md5 = "9fbe4254ed34991d38a4cde57e867360", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +82,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f42a1f0d64378f5fca289d60f65cac91" + Md5 = "f42a1f0d64378f5fca289d60f65cac91" }, new BlockImageTestExpected { @@ -88,7 +90,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "72abac3d635b24555b3b8fe4d71c6c50", + Md5 = "72abac3d635b24555b3b8fe4d71c6c50", Partitions = new[] { new BlockPartitionVolumes @@ -104,7 +106,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "758a18f67c5b609ff18a49910df3ac8e" + Md5 = "758a18f67c5b609ff18a49910df3ac8e" }, new BlockImageTestExpected { @@ -112,7 +114,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "dacbe6b6677a76004bc0f8fbeb6c3a83", + Md5 = "dacbe6b6677a76004bc0f8fbeb6c3a83", Partitions = new[] { new BlockPartitionVolumes @@ -128,7 +130,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "1a642606e79b5fb8e41536c320ba81ea", + Md5 = "1a642606e79b5fb8e41536c320ba81ea", Partitions = new[] { new BlockPartitionVolumes @@ -144,7 +146,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "66a8bec544008abcd735e51fd19ed00b", + Md5 = "66a8bec544008abcd735e51fd19ed00b", Partitions = new[] { new BlockPartitionVolumes @@ -160,7 +162,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "2840b7b7fb457cbabe3cc8b2f50411d9", + Md5 = "2840b7b7fb457cbabe3cc8b2f50411d9", Partitions = new[] { new BlockPartitionVolumes @@ -176,7 +178,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "28c7d3ee80055b4fd19cd154ac610a3c", + Md5 = "28c7d3ee80055b4fd19cd154ac610a3c", Partitions = new[] { new BlockPartitionVolumes @@ -192,7 +194,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "19c6430529da8f390bf2cbfc0eaf21e3", + Md5 = "19c6430529da8f390bf2cbfc0eaf21e3", Partitions = new[] { new BlockPartitionVolumes @@ -208,7 +210,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "0c7ba41e67b07f0f203165b10c0a4e89", + Md5 = "0c7ba41e67b07f0f203165b10c0a4e89", Partitions = new[] { new BlockPartitionVolumes @@ -224,7 +226,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "63267008556ad5704b2cf91049e5e255", + Md5 = "63267008556ad5704b2cf91049e5e255", Partitions = new[] { new BlockPartitionVolumes @@ -240,7 +242,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "015f4f812fd5b03741e3dcad534a4a8d", + Md5 = "015f4f812fd5b03741e3dcad534a4a8d", Partitions = new[] { new BlockPartitionVolumes @@ -256,7 +258,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "60ebe39494bccd4d74daaa47003395e4", + Md5 = "60ebe39494bccd4d74daaa47003395e4", Partitions = new[] { new BlockPartitionVolumes @@ -272,7 +274,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "00260b1a20f19fa618d2acdee59dc471", + Md5 = "00260b1a20f19fa618d2acdee59dc471", Partitions = new[] { new BlockPartitionVolumes @@ -288,7 +290,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "dfb67a1f3c1fe596db30eeac92887583", + Md5 = "dfb67a1f3c1fe596db30eeac92887583", Partitions = new[] { new BlockPartitionVolumes @@ -304,7 +306,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "fa5a213b8827cf7341b946e3fd1866cd", + Md5 = "fa5a213b8827cf7341b946e3fd1866cd", Partitions = new[] { new BlockPartitionVolumes @@ -320,7 +322,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "f59f095594fc408cb2de1a977538afad", + Md5 = "f59f095594fc408cb2de1a977538afad", Partitions = new[] { new BlockPartitionVolumes @@ -336,7 +338,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "1826a1a29d65411a2d21ed28998d7c43", + Md5 = "1826a1a29d65411a2d21ed28998d7c43", Partitions = new[] { new BlockPartitionVolumes @@ -352,7 +354,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "16a5d02a2e73be36fec6abb8a671c13e", + Md5 = "16a5d02a2e73be36fec6abb8a671c13e", Partitions = new[] { new BlockPartitionVolumes @@ -377,7 +379,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4c45b8baeef58e9ed76eb6782dd8535b", + Md5 = "4c45b8baeef58e9ed76eb6782dd8535b", Partitions = new[] { new BlockPartitionVolumes @@ -393,7 +395,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "3c1e16778895a28f15d119c426ed4332", + Md5 = "3c1e16778895a28f15d119c426ed4332", Partitions = new[] { new BlockPartitionVolumes @@ -409,7 +411,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "dc2b7b7eb6d83ce25a6f51d1e457ca24", + Md5 = "dc2b7b7eb6d83ce25a6f51d1e457ca24", Partitions = new[] { new BlockPartitionVolumes @@ -425,7 +427,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "e800a80461a46369564e3bcdb8e54dbc" + Md5 = "e800a80461a46369564e3bcdb8e54dbc" }, new BlockImageTestExpected { @@ -433,7 +435,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4e502fab83012d988d9c915cfea00901", + Md5 = "4e502fab83012d988d9c915cfea00901", Partitions = new[] { new BlockPartitionVolumes @@ -449,7 +451,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "323322148c4c7394a92fa6a73542e32a", + Md5 = "323322148c4c7394a92fa6a73542e32a", Partitions = new[] { new BlockPartitionVolumes @@ -465,7 +467,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "38d8177e53175fb2cd60362339a548c1", + Md5 = "38d8177e53175fb2cd60362339a548c1", Partitions = new[] { new BlockPartitionVolumes @@ -481,7 +483,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "126dfd25363c076727dfaab03955c931", + Md5 = "126dfd25363c076727dfaab03955c931", Partitions = new[] { new BlockPartitionVolumes @@ -497,7 +499,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "e6492aac144f5f6f593b84c64680cf64", + Md5 = "e6492aac144f5f6f593b84c64680cf64", Partitions = new[] { new BlockPartitionVolumes @@ -513,7 +515,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -529,7 +531,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -545,7 +547,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -561,7 +563,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -577,7 +579,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -593,7 +595,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6631b66fdfd89319323771c41334c7ba", + Md5 = "6631b66fdfd89319323771c41334c7ba", Partitions = new[] { new BlockPartitionVolumes @@ -609,7 +611,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "56471a253f4d6803b634e2bbff6c0931", + Md5 = "56471a253f4d6803b634e2bbff6c0931", Partitions = new[] { new BlockPartitionVolumes @@ -625,7 +627,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "9f91d2cfe918c6701d6b267294b092bc", + Md5 = "9f91d2cfe918c6701d6b267294b092bc", Partitions = new[] { new BlockPartitionVolumes @@ -641,7 +643,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "28f3cda83fa1e22a420e06704abc6139", + Md5 = "28f3cda83fa1e22a420e06704abc6139", Partitions = new[] { new BlockPartitionVolumes @@ -657,7 +659,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "b057202adb98964e8f630a3299e86490", + Md5 = "b057202adb98964e8f630a3299e86490", Partitions = new[] { new BlockPartitionVolumes @@ -673,7 +675,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "387f7d0468559b619e929db4451b3074", + Md5 = "387f7d0468559b619e929db4451b3074", Partitions = new[] { new BlockPartitionVolumes @@ -689,7 +691,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "c64ef58dc6d875b9f6e7c0a7362c6832", + Md5 = "c64ef58dc6d875b9f6e7c0a7362c6832", Partitions = new[] { new BlockPartitionVolumes @@ -705,7 +707,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -721,7 +723,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "32823b9009c99b6711e89336ad03ec7f", + Md5 = "32823b9009c99b6711e89336ad03ec7f", Partitions = new[] { new BlockPartitionVolumes @@ -737,7 +739,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -753,7 +755,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -769,7 +771,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "589ae671a19e78ffcba5032092c4c0d5", + Md5 = "589ae671a19e78ffcba5032092c4c0d5", Partitions = new[] { new BlockPartitionVolumes @@ -785,7 +787,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "cf0c71b65b56cb6b617d29525bd719dd", + Md5 = "cf0c71b65b56cb6b617d29525bd719dd", Partitions = new[] { new BlockPartitionVolumes @@ -801,7 +803,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "152023525154b45ab26687190bac94db", + Md5 = "152023525154b45ab26687190bac94db", Partitions = new[] { new BlockPartitionVolumes @@ -817,7 +819,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "db38ecd93f28dd065927fed21917eed5", + Md5 = "db38ecd93f28dd065927fed21917eed5", Partitions = new[] { new BlockPartitionVolumes @@ -833,7 +835,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "716262401bc69f2f440a9c156c21c9e9", + Md5 = "716262401bc69f2f440a9c156c21c9e9", Partitions = new[] { new BlockPartitionVolumes @@ -849,7 +851,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "83213865ca6a40c289b22324a32a2608", + Md5 = "83213865ca6a40c289b22324a32a2608", Partitions = new[] { new BlockPartitionVolumes @@ -865,7 +867,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "f206c0caa4e0eda37233ab6e89ab5493", + Md5 = "f206c0caa4e0eda37233ab6e89ab5493", Partitions = new[] { new BlockPartitionVolumes @@ -881,7 +883,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "554492a7b41f4cd9068a3a2b70eb0e5f", + Md5 = "554492a7b41f4cd9068a3a2b70eb0e5f", Partitions = new[] { new BlockPartitionVolumes @@ -897,7 +899,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "36dd03967a2a3369538cad29b8b74b71", + Md5 = "36dd03967a2a3369538cad29b8b74b71", Partitions = new[] { new BlockPartitionVolumes @@ -913,7 +915,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "4f5c02448e75bbc086e051c728414513", + Md5 = "4f5c02448e75bbc086e051c728414513", Partitions = new[] { new BlockPartitionVolumes @@ -929,7 +931,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f8f951518283d395b6dd662a303e088d", + Md5 = "f8f951518283d395b6dd662a303e088d", Partitions = new[] { new BlockPartitionVolumes @@ -945,7 +947,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "e6a87175b9dbac1916a735eb2418abd0", + Md5 = "e6a87175b9dbac1916a735eb2418abd0", Partitions = new[] { new BlockPartitionVolumes @@ -961,7 +963,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "2f576fb4c408d16fa49ef3093a2a3969", + Md5 = "2f576fb4c408d16fa49ef3093a2a3969", Partitions = new[] { new BlockPartitionVolumes @@ -977,7 +979,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "dab393b265b3b8d82b0eb920bc316299", + Md5 = "dab393b265b3b8d82b0eb920bc316299", Partitions = new[] { new BlockPartitionVolumes @@ -993,7 +995,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7c13a4f0c223d30916ba218186a42fad", + Md5 = "7c13a4f0c223d30916ba218186a42fad", Partitions = new[] { new BlockPartitionVolumes @@ -1009,7 +1011,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "e3797cf190f00a7205c0cc68e3977e04", + Md5 = "e3797cf190f00a7205c0cc68e3977e04", Partitions = new[] { new BlockPartitionVolumes @@ -1025,7 +1027,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "e9de4f065fd056b90b16c3464d501daa", + Md5 = "e9de4f065fd056b90b16c3464d501daa", Partitions = new[] { new BlockPartitionVolumes @@ -1041,7 +1043,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "cb7cedbe89c2859779f921c44ff0807a", + Md5 = "cb7cedbe89c2859779f921c44ff0807a", Partitions = new[] { new BlockPartitionVolumes @@ -1057,7 +1059,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "db5f924b17bd7f1bf29784ede7b45dbb", + Md5 = "db5f924b17bd7f1bf29784ede7b45dbb", Partitions = new[] { new BlockPartitionVolumes @@ -1073,7 +1075,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2df2eaef283e5be894c0be29ba2feae1", + Md5 = "2df2eaef283e5be894c0be29ba2feae1", Partitions = new[] { new BlockPartitionVolumes @@ -1089,7 +1091,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "57af8042541c13d673ebb04bcdbca81b", + Md5 = "57af8042541c13d673ebb04bcdbca81b", Partitions = new[] { new BlockPartitionVolumes @@ -1105,7 +1107,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "afcf6b2f8d762295ea8450aadf8b4319", + Md5 = "afcf6b2f8d762295ea8450aadf8b4319", Partitions = new[] { new BlockPartitionVolumes @@ -1121,7 +1123,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "ecfc55db0d383c1a2c5e639014954f85", + Md5 = "ecfc55db0d383c1a2c5e639014954f85", Partitions = new[] { new BlockPartitionVolumes @@ -1137,7 +1139,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "0f11deec629979e6ea351ac18479c805" + Md5 = "0f11deec629979e6ea351ac18479c805" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -1155,7 +1157,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "0f11deec629979e6ea351ac18479c805" + Md5 = "0f11deec629979e6ea351ac18479c805" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -1173,7 +1175,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "976b335e4fe2356d16f45c123330249c", + Md5 = "976b335e4fe2356d16f45c123330249c", Partitions = new[] { new BlockPartitionVolumes @@ -1189,7 +1191,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "9812da7e10dc3ff388907c135360b8bc", + Md5 = "9812da7e10dc3ff388907c135360b8bc", Partitions = new[] { new BlockPartitionVolumes @@ -1205,7 +1207,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "07eefdd2a6261be61af5b29de9dd56ee", + Md5 = "07eefdd2a6261be61af5b29de9dd56ee", Partitions = new[] { new BlockPartitionVolumes @@ -1221,7 +1223,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "6539a5d8ed493940e6a97e39eae0ca3e", + Md5 = "6539a5d8ed493940e6a97e39eae0ca3e", Partitions = new[] { new BlockPartitionVolumes @@ -1237,7 +1239,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "01f01805a6b22cad7e82a9cf614b8040", + Md5 = "01f01805a6b22cad7e82a9cf614b8040", Partitions = new[] { new BlockPartitionVolumes @@ -1253,7 +1255,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "fe4ce9782a5a42bf2bf6b41f7a51d744", + Md5 = "fe4ce9782a5a42bf2bf6b41f7a51d744", Partitions = new[] { new BlockPartitionVolumes @@ -1269,7 +1271,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "f8514aa0d100ad7eb14ef0f472416b67", + Md5 = "f8514aa0d100ad7eb14ef0f472416b67", Partitions = new[] { new BlockPartitionVolumes @@ -1285,7 +1287,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5487ed4ca8e165d10ac0f04d8b96bbce", + Md5 = "5487ed4ca8e165d10ac0f04d8b96bbce", Partitions = new[] { new BlockPartitionVolumes @@ -1301,7 +1303,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0c438ab43509da1863b1fecff8d806aa", + Md5 = "0c438ab43509da1863b1fecff8d806aa", Partitions = new[] { new BlockPartitionVolumes @@ -1317,7 +1319,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "cd0a831f1668b6ccd99d284513b86461", + Md5 = "cd0a831f1668b6ccd99d284513b86461", Partitions = new[] { new BlockPartitionVolumes @@ -1333,7 +1335,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "2a09063703e21f2440d2a9128c29147f", + Md5 = "2a09063703e21f2440d2a9128c29147f", Partitions = new[] { new BlockPartitionVolumes @@ -1349,7 +1351,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "ca24bcbfe70de3c1fd4955a6c12b9a0f", + Md5 = "ca24bcbfe70de3c1fd4955a6c12b9a0f", Partitions = new[] { new BlockPartitionVolumes @@ -1365,7 +1367,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "ca24bcbfe70de3c1fd4955a6c12b9a0f", + Md5 = "ca24bcbfe70de3c1fd4955a6c12b9a0f", Partitions = new[] { new BlockPartitionVolumes @@ -1381,7 +1383,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1397,7 +1399,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1413,7 +1415,7 @@ public class HDCopy : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "387f7d0468559b619e929db4451b3074", + Md5 = "387f7d0468559b619e929db4451b3074", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs index d1d16effd..5c9918a41 100644 --- a/Aaru.Tests/Images/HxC/ImageDisk.cs +++ b/Aaru.Tests/Images/HxC/ImageDisk.cs @@ -39,7 +39,7 @@ public class ImageDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "ImageDisk"); - public override IMediaImage _plugin => new Imd(); + public override IMediaImage Plugin => new Imd(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "8308e749af855a3ded48d474eb7c305e" + Md5 = "8308e749af855a3ded48d474eb7c305e" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "b7b8a69b10ee4ec921aa8eea232fdd75" + Md5 = "b7b8a69b10ee4ec921aa8eea232fdd75" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f4a77a2d2a1868dc18e8b92032d02fd2" + Md5 = "f4a77a2d2a1868dc18e8b92032d02fd2" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "099d95ac42d1a8010f914ac64ede7a70" + Md5 = "099d95ac42d1a8010f914ac64ede7a70" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "3df7cd10044af75d77e8936af0dbf9ff" + Md5 = "3df7cd10044af75d77e8936af0dbf9ff" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -105,7 +105,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "d75d3e79d9c5051922d4c2226fa4a6ff" + Md5 = "d75d3e79d9c5051922d4c2226fa4a6ff" }, new BlockImageTestExpected { @@ -113,7 +113,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ATARI_35_SS_DD_11, Sectors = 880, SectorSize = 512, - MD5 = "e16ed33a1a466826562c681d8bdf3e27" + Md5 = "e16ed33a1a466826562c681d8bdf3e27" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "fd48b2c12097cbc646b4a93ef4f92259" + Md5 = "fd48b2c12097cbc646b4a93ef4f92259" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "512f7175e753e2e2ad620d448c42545d" + Md5 = "512f7175e753e2e2ad620d448c42545d" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 1024, - MD5 = "2626f65b49ec085253c41fa2e2a9e788" + Md5 = "2626f65b49ec085253c41fa2e2a9e788" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -161,7 +161,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "9d978dff1196b456b8372d78e6b17970" + Md5 = "9d978dff1196b456b8372d78e6b17970" }, new BlockImageTestExpected { @@ -169,7 +169,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -185,7 +185,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -201,7 +201,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "854d0d49a522b64af698e319a24cd68e" + Md5 = "854d0d49a522b64af698e319a24cd68e" }, new BlockImageTestExpected { @@ -209,7 +209,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1812, SectorSize = 1024, - MD5 = "7ee82cecd23b30cc9aa6f0ec59877851" + Md5 = "7ee82cecd23b30cc9aa6f0ec59877851" }, new BlockImageTestExpected { @@ -217,7 +217,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1160, SectorSize = 2048, - MD5 = "90a3c86eb9f8bdf6e4c15c445dff121e" + Md5 = "90a3c86eb9f8bdf6e4c15c445dff121e" }, new BlockImageTestExpected { @@ -225,7 +225,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3372, SectorSize = 512, - MD5 = "7f9164dc43bffc895db751ba1d9b55a9", + Md5 = "7f9164dc43bffc895db751ba1d9b55a9", Partitions = new[] { new BlockPartitionVolumes @@ -241,7 +241,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" }, new BlockImageTestExpected { @@ -249,7 +249,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -265,7 +265,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2882, SectorSize = 2048, - MD5 = "f5fff7704fb677ebf23d27cd937c9403" + Md5 = "f5fff7704fb677ebf23d27cd937c9403" /* TODO: Division by zero because bytes per cluster is 0 Partitions = new[] { @@ -283,7 +283,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2002, SectorSize = 128, - MD5 = "5b4e36d92b180c3845387391cb5a1c64" + Md5 = "5b4e36d92b180c3845387391cb5a1c64" }, new BlockImageTestExpected { @@ -291,7 +291,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs index fd0968a7f..f19bce174 100644 --- a/Aaru.Tests/Images/HxC/Raw.cs +++ b/Aaru.Tests/Images/HxC/Raw.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "8308e749af855a3ded48d474eb7c305e" + Md5 = "8308e749af855a3ded48d474eb7c305e" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "b7b8a69b10ee4ec921aa8eea232fdd75" + Md5 = "b7b8a69b10ee4ec921aa8eea232fdd75" }, new BlockImageTestExpected { @@ -64,7 +64,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f4a77a2d2a1868dc18e8b92032d02fd2" + Md5 = "f4a77a2d2a1868dc18e8b92032d02fd2" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "099d95ac42d1a8010f914ac64ede7a70" + Md5 = "099d95ac42d1a8010f914ac64ede7a70" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "3df7cd10044af75d77e8936af0dbf9ff" + Md5 = "3df7cd10044af75d77e8936af0dbf9ff" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -104,7 +104,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "d75d3e79d9c5051922d4c2226fa4a6ff" + Md5 = "d75d3e79d9c5051922d4c2226fa4a6ff" }, new BlockImageTestExpected { @@ -112,7 +112,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ATARI_35_SS_DD_11, Sectors = 880, SectorSize = 512, - MD5 = "e16ed33a1a466826562c681d8bdf3e27" + Md5 = "e16ed33a1a466826562c681d8bdf3e27" }, new BlockImageTestExpected { @@ -120,7 +120,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fd48b2c12097cbc646b4a93ef4f92259" + Md5 = "fd48b2c12097cbc646b4a93ef4f92259" }, new BlockImageTestExpected { @@ -128,7 +128,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "512f7175e753e2e2ad620d448c42545d" + Md5 = "512f7175e753e2e2ad620d448c42545d" }, new BlockImageTestExpected { @@ -136,7 +136,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2626f65b49ec085253c41fa2e2a9e788" + Md5 = "2626f65b49ec085253c41fa2e2a9e788" }, new BlockImageTestExpected { @@ -144,7 +144,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "7db6730656efb22695cdf0a49e2674c9" + Md5 = "7db6730656efb22695cdf0a49e2674c9" }, new BlockImageTestExpected { @@ -152,7 +152,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -168,7 +168,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "9d978dff1196b456b8372d78e6b17970" + Md5 = "9d978dff1196b456b8372d78e6b17970" }, new BlockImageTestExpected { @@ -176,7 +176,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -192,7 +192,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -208,7 +208,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "854d0d49a522b64af698e319a24cd68e" + Md5 = "854d0d49a522b64af698e319a24cd68e" }, new BlockImageTestExpected { @@ -216,7 +216,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3605, SectorSize = 512, - MD5 = "7ee82cecd23b30cc9aa6f0ec59877851" + Md5 = "7ee82cecd23b30cc9aa6f0ec59877851" }, new BlockImageTestExpected { @@ -224,7 +224,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3768, SectorSize = 512, - MD5 = "c96c0be31797a0e6c9f23aad8ae38555" + Md5 = "c96c0be31797a0e6c9f23aad8ae38555" }, new BlockImageTestExpected { @@ -232,7 +232,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3372, SectorSize = 512, - MD5 = "7f9164dc43bffc895db751ba1d9b55a9", + Md5 = "7f9164dc43bffc895db751ba1d9b55a9", Partitions = new[] { new BlockPartitionVolumes @@ -248,7 +248,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" }, new BlockImageTestExpected { @@ -256,7 +256,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -272,7 +272,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2888, SectorSize = 512, - MD5 = "f5fff7704fb677ebf23d27cd937c9403", + Md5 = "f5fff7704fb677ebf23d27cd937c9403", Partitions = new[] { new BlockPartitionVolumes @@ -288,7 +288,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ECMA_54, Sectors = 2002, SectorSize = 128, - MD5 = "5b4e36d92b180c3845387391cb5a1c64" + Md5 = "5b4e36d92b180c3845387391cb5a1c64" }, new BlockImageTestExpected { @@ -296,7 +296,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/HyperV.cs b/Aaru.Tests/Images/HyperV.cs index 1f130460a..ce212bc37 100644 --- a/Aaru.Tests/Images/HyperV.cs +++ b/Aaru.Tests/Images/HyperV.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class HyperV : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V"); - public override IMediaImage _plugin => new Vhdx(); + public override IMediaImage Plugin => new Vhdx(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "b3b3e6b89763ef45f6863d7fd1195778" + Md5 = "b3b3e6b89763ef45f6863d7fd1195778" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "f2a720176adb4cf70c04c56b58339024", + Md5 = "f2a720176adb4cf70c04c56b58339024", Partitions = new[] { new BlockPartitionVolumes @@ -77,7 +77,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "bc6be23bbb139bd6fcd928f212205ce1" + Md5 = "bc6be23bbb139bd6fcd928f212205ce1" }, new BlockImageTestExpected { @@ -85,7 +85,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "cfc501f3bcc12a00aa08db30e80c25ae" + Md5 = "cfc501f3bcc12a00aa08db30e80c25ae" }, new BlockImageTestExpected { @@ -93,7 +93,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "06e97867ff89301fef7e9451ad7aa4ed" + Md5 = "06e97867ff89301fef7e9451ad7aa4ed" }, new BlockImageTestExpected { @@ -101,7 +101,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "d544a96ac1bd4431b884e244717d3dca" + Md5 = "d544a96ac1bd4431b884e244717d3dca" }, new BlockImageTestExpected { @@ -109,7 +109,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "b10ed3ac22d882f7080b6f9859d1e646" + Md5 = "b10ed3ac22d882f7080b6f9859d1e646" }, new BlockImageTestExpected { @@ -117,7 +117,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 409600, SectorSize = 512, - MD5 = "338ba2043d7f9cb2693c35e3194e6c9c" + Md5 = "338ba2043d7f9cb2693c35e3194e6c9c" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ImageDisk.cs b/Aaru.Tests/Images/ImageDisk.cs index e895284cd..eec05ad73 100644 --- a/Aaru.Tests/Images/ImageDisk.cs +++ b/Aaru.Tests/Images/ImageDisk.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class ImageDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk"); - public override IMediaImage _plugin => new Imd(); + public override IMediaImage Plugin => new Imd(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "b5ab1915fc3d7fceecfcd7fda82f6b0d", + Md5 = "b5ab1915fc3d7fceecfcd7fda82f6b0d", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "e8bbbd22db87181974e12ba0227ea011" + Md5 = "e8bbbd22db87181974e12ba0227ea011" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "9f5635f3df4d880a500910b0ad1ab535" + Md5 = "9f5635f3df4d880a500910b0ad1ab535" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "3bad4b4db8f5e2f991637fccf7a25740" + Md5 = "3bad4b4db8f5e2f991637fccf7a25740" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -96,7 +96,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "a481bd5a8281dad089edbef390c136ed" + Md5 = "a481bd5a8281dad089edbef390c136ed" }, new BlockImageTestExpected { @@ -104,7 +104,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "46fce47baf08c6f093f2c355a603543d" + Md5 = "46fce47baf08c6f093f2c355a603543d" }, new BlockImageTestExpected { @@ -112,7 +112,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "95ea232f59e44db374b994cfe7f1c07f", + Md5 = "95ea232f59e44db374b994cfe7f1c07f", Partitions = new[] { new BlockPartitionVolumes @@ -128,7 +128,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9e2b01f4397db2a6c76e2bc267df37b3" + Md5 = "9e2b01f4397db2a6c76e2bc267df37b3" }, new BlockImageTestExpected { @@ -136,7 +136,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "dbbf55398d930e14c2b0a035dd1277b9" + Md5 = "dbbf55398d930e14c2b0a035dd1277b9" }, new BlockImageTestExpected { @@ -144,7 +144,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "656002e6e620cb3b73c27f4c21d32edb" + Md5 = "656002e6e620cb3b73c27f4c21d32edb" }, new BlockImageTestExpected { @@ -152,7 +152,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1244cc2c101c66e6bb4ad5183b356b19" + Md5 = "1244cc2c101c66e6bb4ad5183b356b19" }, new BlockImageTestExpected { @@ -160,7 +160,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "a817a56036f591a5cff11857b7d466be" + Md5 = "a817a56036f591a5cff11857b7d466be" }, new BlockImageTestExpected { @@ -168,7 +168,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "439b2b76e154f3ce7e86bf1377282d5f" + Md5 = "439b2b76e154f3ce7e86bf1377282d5f" }, new BlockImageTestExpected { @@ -176,7 +176,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 90, SectorSize = 512, - MD5 = "3c21d11e2b4ca108de3ec8ffface814d" + Md5 = "3c21d11e2b4ca108de3ec8ffface814d" }, new BlockImageTestExpected { @@ -184,7 +184,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c2e64e8a388b4401719f06d6a868dd1b" + Md5 = "c2e64e8a388b4401719f06d6a868dd1b" }, new BlockImageTestExpected { @@ -192,7 +192,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6fc7f2233f094af7ae0d454668976858" + Md5 = "6fc7f2233f094af7ae0d454668976858" }, new BlockImageTestExpected { @@ -200,7 +200,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "ad6c3e6910457a53572695401efda4ab" + Md5 = "ad6c3e6910457a53572695401efda4ab" }, new BlockImageTestExpected { @@ -208,7 +208,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "5e41fe3201ab32f25873faf8d3f79a02" + Md5 = "5e41fe3201ab32f25873faf8d3f79a02" }, new BlockImageTestExpected { @@ -216,7 +216,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2302991363cb3681cffdc4388915b51e", + Md5 = "2302991363cb3681cffdc4388915b51e", Partitions = new[] { new BlockPartitionVolumes @@ -232,7 +232,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4e4cafed1cc22ea72201169427e5e1b6" + Md5 = "4e4cafed1cc22ea72201169427e5e1b6" }, new BlockImageTestExpected { @@ -240,7 +240,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "a579b349a5a24218d59a44e36bdb1333" + Md5 = "a579b349a5a24218d59a44e36bdb1333" }, new BlockImageTestExpected { @@ -248,7 +248,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 960, SectorSize = 1024, - MD5 = "669b2155d5e4d7849d662729717a68d8" + Md5 = "669b2155d5e4d7849d662729717a68d8" }, new BlockImageTestExpected { @@ -256,7 +256,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1a4c7487382c98b7bc74623ddfb488e6" + Md5 = "1a4c7487382c98b7bc74623ddfb488e6" }, new BlockImageTestExpected { @@ -264,7 +264,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 960, SectorSize = 1024, - MD5 = "23f5700ea3bfe076c88dd399a8026a1e" + Md5 = "23f5700ea3bfe076c88dd399a8026a1e" }, new BlockImageTestExpected { @@ -272,7 +272,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "af83d011608042d35021e39aa5e10b2f", + Md5 = "af83d011608042d35021e39aa5e10b2f", Partitions = new[] { new BlockPartitionVolumes @@ -288,7 +288,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "e640835966327f3f662e1db8e0575510" + Md5 = "e640835966327f3f662e1db8e0575510" }, new BlockImageTestExpected { @@ -296,7 +296,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "ff3534234d1d2dd88bf6e83be23d9227" + Md5 = "ff3534234d1d2dd88bf6e83be23d9227" }, new BlockImageTestExpected { @@ -304,7 +304,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "dfaff34a6556b515642f1e54f839b02e" + Md5 = "dfaff34a6556b515642f1e54f839b02e" }, new BlockImageTestExpected { @@ -312,7 +312,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "ca8f5c7f9ed161b03ccb166eb9d62146" + Md5 = "ca8f5c7f9ed161b03ccb166eb9d62146" }, new BlockImageTestExpected { @@ -320,7 +320,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6642c1a32d2c58e93481d664974fc202", + Md5 = "6642c1a32d2c58e93481d664974fc202", Partitions = new[] { new BlockPartitionVolumes @@ -336,7 +336,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6642c1a32d2c58e93481d664974fc202", + Md5 = "6642c1a32d2c58e93481d664974fc202", Partitions = new[] { new BlockPartitionVolumes @@ -352,7 +352,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5101f89850dc28efbcfb7622086a9ddf", + Md5 = "5101f89850dc28efbcfb7622086a9ddf", Partitions = new[] { new BlockPartitionVolumes @@ -368,7 +368,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "8e570be2ed1f00ddea82e50a2d9c446a", + Md5 = "8e570be2ed1f00ddea82e50a2d9c446a", Partitions = new[] { new BlockPartitionVolumes @@ -384,7 +384,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "abba2a1ddd60a649047a9c44d94bbeae", + Md5 = "abba2a1ddd60a649047a9c44d94bbeae", Partitions = new[] { new BlockPartitionVolumes @@ -400,7 +400,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e3bc48bec81be5b35be73d41fdffd2ab", + Md5 = "e3bc48bec81be5b35be73d41fdffd2ab", Partitions = new[] { new BlockPartitionVolumes @@ -416,7 +416,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "43b5068af9d016d1432eb2e12d2b802a", + Md5 = "43b5068af9d016d1432eb2e12d2b802a", Partitions = new[] { new BlockPartitionVolumes @@ -432,7 +432,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5bf2ad4dc300592604b6e32f8b8e2656", + Md5 = "5bf2ad4dc300592604b6e32f8b8e2656", Partitions = new[] { new BlockPartitionVolumes @@ -448,7 +448,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", + Md5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", Partitions = new[] { new BlockPartitionVolumes @@ -464,7 +464,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "56d181a6bb8713e6b2854fe8887faab6", + Md5 = "56d181a6bb8713e6b2854fe8887faab6", Partitions = new[] { new BlockPartitionVolumes @@ -480,7 +480,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "41aef7cff26aefda1add8d49c5b962c2", + Md5 = "41aef7cff26aefda1add8d49c5b962c2", Partitions = new[] { new BlockPartitionVolumes @@ -496,7 +496,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "2437c5f089f1cba3866b36360b016f16", + Md5 = "2437c5f089f1cba3866b36360b016f16", Partitions = new[] { new BlockPartitionVolumes @@ -512,7 +512,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "bdaa8f17373b265830fdf3a06b794367", + Md5 = "bdaa8f17373b265830fdf3a06b794367", Partitions = new[] { new BlockPartitionVolumes @@ -528,7 +528,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "629932c285478d0540ff7936aa008351", + Md5 = "629932c285478d0540ff7936aa008351", Partitions = new[] { new BlockPartitionVolumes @@ -544,7 +544,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "7a2abef5d4701e2e49abb05af8d4da50", + Md5 = "7a2abef5d4701e2e49abb05af8d4da50", Partitions = new[] { new BlockPartitionVolumes @@ -560,7 +560,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "e3507522c914264f44fb2c92c3170c09", + Md5 = "e3507522c914264f44fb2c92c3170c09", Partitions = new[] { new BlockPartitionVolumes @@ -576,7 +576,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "824fe65dbb1a42b6b94f05405ef984f2", + Md5 = "824fe65dbb1a42b6b94f05405ef984f2", Partitions = new[] { new BlockPartitionVolumes @@ -592,7 +592,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", + Md5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", Partitions = new[] { new BlockPartitionVolumes @@ -608,7 +608,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "936b20bb0966fe693b4d5e2353e24846", + Md5 = "936b20bb0966fe693b4d5e2353e24846", Partitions = new[] { new BlockPartitionVolumes @@ -624,7 +624,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "803b01a0b440c2837d37c21308f30cd5", + Md5 = "803b01a0b440c2837d37c21308f30cd5", Partitions = new[] { new BlockPartitionVolumes @@ -640,7 +640,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "aa0d31f914760cc4cde75479779ebed6", + Md5 = "aa0d31f914760cc4cde75479779ebed6", Partitions = new[] { new BlockPartitionVolumes @@ -656,7 +656,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "5e413433c54f48978d281c6e66d1106e", + Md5 = "5e413433c54f48978d281c6e66d1106e", Partitions = new[] { new BlockPartitionVolumes @@ -672,7 +672,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "4fc28b0128543b2eb70f6432c4c8a980", + Md5 = "4fc28b0128543b2eb70f6432c4c8a980", Partitions = new[] { new BlockPartitionVolumes @@ -688,7 +688,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "24a7459d080cea3a60d131b8fd7dc5d1", + Md5 = "24a7459d080cea3a60d131b8fd7dc5d1", Partitions = new[] { new BlockPartitionVolumes @@ -704,7 +704,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3570, SectorSize = 512, - MD5 = "2031b1e16ee2defc0d15f732f633df33", + Md5 = "2031b1e16ee2defc0d15f732f633df33", Partitions = new[] { new BlockPartitionVolumes @@ -720,7 +720,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5100, SectorSize = 512, - MD5 = "79e5f1fbd63b87c087d85904d45964e6", + Md5 = "79e5f1fbd63b87c087d85904d45964e6", Partitions = new[] { new BlockPartitionVolumes @@ -736,7 +736,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 6604, SectorSize = 512, - MD5 = "1b2495a8f2274852b6fae80ae6fbff2f", + Md5 = "1b2495a8f2274852b6fae80ae6fbff2f", Partitions = new[] { new BlockPartitionVolumes @@ -752,7 +752,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 9180, SectorSize = 512, - MD5 = "3a70851950ad06c20e3063ad6f128eef", + Md5 = "3a70851950ad06c20e3063ad6f128eef", Partitions = new[] { new BlockPartitionVolumes @@ -768,7 +768,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 10710, SectorSize = 512, - MD5 = "98a91bbdbe8454cf64e20d0ec5c35017", + Md5 = "98a91bbdbe8454cf64e20d0ec5c35017", Partitions = new[] { new BlockPartitionVolumes @@ -784,7 +784,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 10710, SectorSize = 512, - MD5 = "666706f299a1362cb30f34a3a7f555be", + Md5 = "666706f299a1362cb30f34a3a7f555be", Partitions = new[] { new BlockPartitionVolumes @@ -800,7 +800,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 13770, SectorSize = 512, - MD5 = "2fa1eedb57fac492d6f6b71e2c0a079c", + Md5 = "2fa1eedb57fac492d6f6b71e2c0a079c", Partitions = new[] { new BlockPartitionVolumes @@ -816,7 +816,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "3152c8e3544bbfaceff14b7522faf5af", + Md5 = "3152c8e3544bbfaceff14b7522faf5af", Partitions = new[] { new BlockPartitionVolumes @@ -832,7 +832,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5fc19ca552b6db957061e9a1750394d2", + Md5 = "5fc19ca552b6db957061e9a1750394d2", Partitions = new[] { new BlockPartitionVolumes @@ -848,7 +848,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "d1e978b679c63a218c3f77a7ca2c7206" + Md5 = "d1e978b679c63a218c3f77a7ca2c7206" }, new BlockImageTestExpected { @@ -856,7 +856,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "a33b46f042b78fe3d0b3c5dbb3908a93", + Md5 = "a33b46f042b78fe3d0b3c5dbb3908a93", Partitions = new[] { new BlockPartitionVolumes @@ -872,7 +872,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "565d3c001cbb532154aa5d3c65b2439c", + Md5 = "565d3c001cbb532154aa5d3c65b2439c", Partitions = new[] { new BlockPartitionVolumes @@ -888,7 +888,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e60442c3ebd72c99bdd7545fdba59613", + Md5 = "e60442c3ebd72c99bdd7545fdba59613", Partitions = new[] { new BlockPartitionVolumes @@ -904,7 +904,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "058a33a129539285c9b64010496af52f", + Md5 = "058a33a129539285c9b64010496af52f", Partitions = new[] { new BlockPartitionVolumes @@ -920,7 +920,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0726ecbc38965d30a6222c3e74cd1aa3", + Md5 = "0726ecbc38965d30a6222c3e74cd1aa3", Partitions = new[] { new BlockPartitionVolumes @@ -936,7 +936,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "c9a193837db7d8a5eb025eb41e8a76d7" + Md5 = "c9a193837db7d8a5eb025eb41e8a76d7" }, new BlockImageTestExpected { @@ -944,7 +944,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c38d69ac88520f14fcc6d6ced22b065d", + Md5 = "c38d69ac88520f14fcc6d6ced22b065d", Partitions = new[] { new BlockPartitionVolumes @@ -960,7 +960,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "91d51964e1e64ef3f6f622fa19aa833c", + Md5 = "91d51964e1e64ef3f6f622fa19aa833c", Partitions = new[] { new BlockPartitionVolumes @@ -976,7 +976,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "db36d9651c952ff679ec33223c8db2d3", + Md5 = "db36d9651c952ff679ec33223c8db2d3", Partitions = new[] { new BlockPartitionVolumes @@ -992,7 +992,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "5f1d98806309aee7f81de72e51e6d386", + Md5 = "5f1d98806309aee7f81de72e51e6d386", Partitions = new[] { new BlockPartitionVolumes @@ -1008,7 +1008,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1207a1cc7ff73d4f74c8984b4e7db33f", + Md5 = "1207a1cc7ff73d4f74c8984b4e7db33f", Partitions = new[] { new BlockPartitionVolumes @@ -1024,7 +1024,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "c97a3081fd25474b6b7945b8572d5ab8", + Md5 = "c97a3081fd25474b6b7945b8572d5ab8", Partitions = new[] { new BlockPartitionVolumes @@ -1040,7 +1040,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "31269ed6464302ae26d22b7c87bceb23", + Md5 = "31269ed6464302ae26d22b7c87bceb23", Partitions = new[] { new BlockPartitionVolumes @@ -1056,7 +1056,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 664, SectorSize = 512, - MD5 = "8b31e5865611dbe01cc25b5ba2fbdf25" + Md5 = "8b31e5865611dbe01cc25b5ba2fbdf25" }, new BlockImageTestExpected { @@ -1064,7 +1064,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 670, SectorSize = 2048, - MD5 = "be278c00c3ec906756e7c8d544d8833d" + Md5 = "be278c00c3ec906756e7c8d544d8833d" }, new BlockImageTestExpected { @@ -1072,7 +1072,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 824, SectorSize = 1024, - MD5 = "8e7fb60151e0002e8bae2fb2abe13a69" + Md5 = "8e7fb60151e0002e8bae2fb2abe13a69" }, new BlockImageTestExpected { @@ -1080,7 +1080,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 824, SectorSize = 2048, - MD5 = "45e0b2a2925a95bbdcb43a914d70f91b" + Md5 = "45e0b2a2925a95bbdcb43a914d70f91b" }, new BlockImageTestExpected { @@ -1088,7 +1088,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1483, SectorSize = 1024, - MD5 = "082d7eda62eead1e20fd5a060997ff0f" + Md5 = "082d7eda62eead1e20fd5a060997ff0f" }, new BlockImageTestExpected { @@ -1096,7 +1096,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 995, SectorSize = 2048, - MD5 = "9b75a2fb671d1e7fa27434038b375e5e" + Md5 = "9b75a2fb671d1e7fa27434038b375e5e" }, new BlockImageTestExpected { @@ -1104,7 +1104,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1812, SectorSize = 1024, - MD5 = "97c4f895d64ba196f19a3179e68ef693" + Md5 = "97c4f895d64ba196f19a3179e68ef693" }, new BlockImageTestExpected { @@ -1112,7 +1112,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1160, SectorSize = 2048, - MD5 = "c838233a380973de386e66ee0e0cbcc2" + Md5 = "c838233a380973de386e66ee0e0cbcc2" }, new BlockImageTestExpected { @@ -1120,7 +1120,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 164, SectorSize = 16384, - MD5 = "dea88f91ca0f6d90626b4029286cb01f" + Md5 = "dea88f91ca0f6d90626b4029286cb01f" }, new BlockImageTestExpected { @@ -1128,7 +1128,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 164, SectorSize = 16384, - MD5 = "db82b15389e2ffa9a20f7251cc5cce5b" + Md5 = "db82b15389e2ffa9a20f7251cc5cce5b" }, new BlockImageTestExpected { @@ -1136,7 +1136,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 164, SectorSize = 16384, - MD5 = "638b56d7061a8156ee87166c78f06111" + Md5 = "638b56d7061a8156ee87166c78f06111" }, new BlockImageTestExpected { @@ -1144,7 +1144,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", + Md5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", Partitions = new[] { new BlockPartitionVolumes @@ -1160,7 +1160,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 410, SectorSize = 512, - MD5 = "7b41dd9ca7eb32828960eb1417a6092a", + Md5 = "7b41dd9ca7eb32828960eb1417a6092a", Partitions = new[] { new BlockPartitionVolumes @@ -1176,7 +1176,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "126dfd25363c076727dfaab03955c931", + Md5 = "126dfd25363c076727dfaab03955c931", Partitions = new[] { new BlockPartitionVolumes @@ -1192,7 +1192,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "e6492aac144f5f6f593b84c64680cf64", + Md5 = "e6492aac144f5f6f593b84c64680cf64", Partitions = new[] { new BlockPartitionVolumes @@ -1208,7 +1208,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1224,7 +1224,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1240,7 +1240,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -1256,7 +1256,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1272,7 +1272,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1288,7 +1288,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1304,7 +1304,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1320,7 +1320,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6631b66fdfd89319323771c41334c7ba", + Md5 = "6631b66fdfd89319323771c41334c7ba", Partitions = new[] { new BlockPartitionVolumes @@ -1336,7 +1336,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3240, SectorSize = 512, - MD5 = "4b5e2c9599bb7861b3b52bec00d81278" + Md5 = "4b5e2c9599bb7861b3b52bec00d81278" }, new BlockImageTestExpected { @@ -1344,7 +1344,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "7d36aee5a3071ff75b979f3acb649c40", + Md5 = "7d36aee5a3071ff75b979f3acb649c40", Partitions = new[] { new BlockPartitionVolumes @@ -1360,7 +1360,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "0ccb62039363ab544c69eca229a17fae" + Md5 = "0ccb62039363ab544c69eca229a17fae" }, new BlockImageTestExpected { @@ -1368,7 +1368,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "7851d31fad9302ff45d3ded4fba25387", + Md5 = "7851d31fad9302ff45d3ded4fba25387", Partitions = new[] { new BlockPartitionVolumes @@ -1384,7 +1384,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "915b08c82591e8488320e001b7303b6d", + Md5 = "915b08c82591e8488320e001b7303b6d", Partitions = new[] { new BlockPartitionVolumes @@ -1400,7 +1400,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "5e5ea6fe9adf842221fdc60e56630405", + Md5 = "5e5ea6fe9adf842221fdc60e56630405", Partitions = new[] { new BlockPartitionVolumes @@ -1416,7 +1416,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1432,7 +1432,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ddc6c1200c60e9f7796280f50c2e5283", + Md5 = "ddc6c1200c60e9f7796280f50c2e5283", Partitions = new[] { new BlockPartitionVolumes @@ -1448,7 +1448,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6efa72a33021d5051546c3e0dd4c3c09" + Md5 = "6efa72a33021d5051546c3e0dd4c3c09" }, new BlockImageTestExpected { @@ -1456,7 +1456,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1464,7 +1464,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 200, SectorSize = 1024, - MD5 = "cf42d08469548a31caf2649a1d08a85f" + Md5 = "cf42d08469548a31caf2649a1d08a85f" }, new BlockImageTestExpected { @@ -1472,7 +1472,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 1024, - MD5 = "62745e10683cf2ec1dac177535459891" + Md5 = "62745e10683cf2ec1dac177535459891" }, new BlockImageTestExpected { @@ -1480,7 +1480,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "cf42d08469548a31caf2649a1d08a85f" + Md5 = "cf42d08469548a31caf2649a1d08a85f" }, new BlockImageTestExpected { @@ -1488,7 +1488,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "298c377de52947c472a85d281b6d3d4d" + Md5 = "298c377de52947c472a85d281b6d3d4d" }, new BlockImageTestExpected { @@ -1496,7 +1496,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "387373301cf6c15d61eec9bab18d9b6a" + Md5 = "387373301cf6c15d61eec9bab18d9b6a" }, new BlockImageTestExpected { @@ -1504,7 +1504,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 848, SectorSize = 512, - MD5 = "83b66a88d92cbf2715343016e4108211" + Md5 = "83b66a88d92cbf2715343016e4108211" }, new BlockImageTestExpected { @@ -1512,7 +1512,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "20e047061b6ca4059288deed8c9dd247" + Md5 = "20e047061b6ca4059288deed8c9dd247" }, new BlockImageTestExpected { @@ -1520,7 +1520,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1528,7 +1528,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "6efa72a33021d5051546c3e0dd4c3c09" + Md5 = "6efa72a33021d5051546c3e0dd4c3c09" }, new BlockImageTestExpected { @@ -1536,7 +1536,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1544,7 +1544,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "e63014a4299f52f22e6e2c9609f51979" + Md5 = "e63014a4299f52f22e6e2c9609f51979" }, new BlockImageTestExpected { @@ -1552,7 +1552,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -1568,7 +1568,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "32823b9009c99b6711e89336ad03ec7f", + Md5 = "32823b9009c99b6711e89336ad03ec7f", Partitions = new[] { new BlockPartitionVolumes @@ -1584,7 +1584,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c8b03a8550ed3e70e1c78316aa445aa", + Md5 = "1c8b03a8550ed3e70e1c78316aa445aa", Partitions = new[] { new BlockPartitionVolumes @@ -1600,7 +1600,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 960, SectorSize = 1024, - MD5 = "efbc62e2ecddc15241aa0779e078d478" + Md5 = "efbc62e2ecddc15241aa0779e078d478" }, new BlockImageTestExpected { @@ -1608,7 +1608,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -1624,7 +1624,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -1640,7 +1640,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "589ae671a19e78ffcba5032092c4c0d5", + Md5 = "589ae671a19e78ffcba5032092c4c0d5", Partitions = new[] { new BlockPartitionVolumes @@ -1656,7 +1656,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "cf0c71b65b56cb6b617d29525bd719dd", + Md5 = "cf0c71b65b56cb6b617d29525bd719dd", Partitions = new[] { new BlockPartitionVolumes @@ -1672,7 +1672,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "028769dc0abefab1740cc309432588b6", + Md5 = "028769dc0abefab1740cc309432588b6", Partitions = new[] { new BlockPartitionVolumes @@ -1688,7 +1688,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "152023525154b45ab26687190bac94db", + Md5 = "152023525154b45ab26687190bac94db", Partitions = new[] { new BlockPartitionVolumes @@ -1704,7 +1704,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "db38ecd93f28dd065927fed21917eed5", + Md5 = "db38ecd93f28dd065927fed21917eed5", Partitions = new[] { new BlockPartitionVolumes @@ -1720,7 +1720,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "716262401bc69f2f440a9c156c21c9e9", + Md5 = "716262401bc69f2f440a9c156c21c9e9", Partitions = new[] { new BlockPartitionVolumes @@ -1736,7 +1736,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "83213865ca6a40c289b22324a32a2608", + Md5 = "83213865ca6a40c289b22324a32a2608", Partitions = new[] { new BlockPartitionVolumes @@ -1752,7 +1752,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "f206c0caa4e0eda37233ab6e89ab5493", + Md5 = "f206c0caa4e0eda37233ab6e89ab5493", Partitions = new[] { new BlockPartitionVolumes @@ -1768,7 +1768,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "554492a7b41f4cd9068a3a2b70eb0e5f", + Md5 = "554492a7b41f4cd9068a3a2b70eb0e5f", Partitions = new[] { new BlockPartitionVolumes @@ -1784,7 +1784,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3402, SectorSize = 512, - MD5 = "865ad9072cb6c7458f7d86d7e9368622" + Md5 = "865ad9072cb6c7458f7d86d7e9368622" }, new BlockImageTestExpected { @@ -1792,7 +1792,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "2461e458438f0033bc5811fd6958ad02" + Md5 = "2461e458438f0033bc5811fd6958ad02" }, new BlockImageTestExpected { @@ -1800,7 +1800,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1760, SectorSize = 1024, - MD5 = "be75996696aa70ee9338297137556d83" + Md5 = "be75996696aa70ee9338297137556d83" }, new BlockImageTestExpected { @@ -1808,7 +1808,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1120, SectorSize = 2048, - MD5 = "5a0f2bad567464288ec7ce935672870a" + Md5 = "5a0f2bad567464288ec7ce935672870a" }, new BlockImageTestExpected { @@ -1816,7 +1816,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 320, SectorSize = 4096, - MD5 = "69f9f0b5c1fc00a8f398151df9d93ab5" + Md5 = "69f9f0b5c1fc00a8f398151df9d93ab5" }, new BlockImageTestExpected { @@ -1824,7 +1824,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 626, SectorSize = 1024, - MD5 = "fb144f79239f6f5f113b417700c2d278" + Md5 = "fb144f79239f6f5f113b417700c2d278" }, new BlockImageTestExpected { @@ -1832,7 +1832,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 670, SectorSize = 2048, - MD5 = "6a936d2ecb771e37b856bdad16822c32" + Md5 = "6a936d2ecb771e37b856bdad16822c32" }, new BlockImageTestExpected { @@ -1840,7 +1840,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 356, SectorSize = 4096, - MD5 = "e283af9d280efaf059c816b6a2c9206b" + Md5 = "e283af9d280efaf059c816b6a2c9206b" }, new BlockImageTestExpected { @@ -1848,7 +1848,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 960, SectorSize = 1024, - MD5 = "e4625838148a4b7c6580c697cd47362c" + Md5 = "e4625838148a4b7c6580c697cd47362c" }, new BlockImageTestExpected { @@ -1856,7 +1856,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_40, Sectors = 640, SectorSize = 256, - MD5 = "74f71ef3978fefce64689e8be18359ba" + Md5 = "74f71ef3978fefce64689e8be18359ba" }, new BlockImageTestExpected { @@ -1864,7 +1864,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "5c4e555b29a264f2a81f8a2b58bfc442" + Md5 = "5c4e555b29a264f2a81f8a2b58bfc442" }, new BlockImageTestExpected { @@ -1872,7 +1872,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "64ae73ac812bbf473a5d443de4d5dfbf" + Md5 = "64ae73ac812bbf473a5d443de4d5dfbf" }, new BlockImageTestExpected { @@ -1880,7 +1880,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "a481bd5a8281dad089edbef390c136ed" + Md5 = "a481bd5a8281dad089edbef390c136ed" }, new BlockImageTestExpected { @@ -1888,7 +1888,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1896,7 +1896,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "a481bd5a8281dad089edbef390c136ed" + Md5 = "a481bd5a8281dad089edbef390c136ed" }, new BlockImageTestExpected { @@ -1904,7 +1904,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 1024, - MD5 = "8a16a3008739516fc3ba4c878868d056" + Md5 = "8a16a3008739516fc3ba4c878868d056" }, new BlockImageTestExpected { @@ -1912,7 +1912,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "46fce47baf08c6f093f2c355a603543d" + Md5 = "46fce47baf08c6f093f2c355a603543d" }, new BlockImageTestExpected { @@ -1920,7 +1920,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "ee73a5d5c8dfac236baf7b99811696f9" + Md5 = "ee73a5d5c8dfac236baf7b99811696f9" }, new BlockImageTestExpected { @@ -1928,7 +1928,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "b3bdbc62fb96e3893dac3bccbde59ab0" + Md5 = "b3bdbc62fb96e3893dac3bccbde59ab0" }, new BlockImageTestExpected { @@ -1936,7 +1936,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "02942b9dc9d3b1bc9335b73c99e6da2e" + Md5 = "02942b9dc9d3b1bc9335b73c99e6da2e" }, new BlockImageTestExpected { @@ -1944,7 +1944,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 480, SectorSize = 1024, - MD5 = "dfc9e8c7bd3d50f404d6f0b6ada20b0c" + Md5 = "dfc9e8c7bd3d50f404d6f0b6ada20b0c" }, new BlockImageTestExpected { @@ -1952,7 +1952,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1960,7 +1960,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1968,7 +1968,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "647f14749f59be471aac04a71a079a64" + Md5 = "647f14749f59be471aac04a71a079a64" }, new BlockImageTestExpected { @@ -1976,7 +1976,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "517cdd5e42a4673f733d1aedfb46770f" + Md5 = "517cdd5e42a4673f733d1aedfb46770f" }, new BlockImageTestExpected { @@ -1984,7 +1984,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "6ad92e9522e4ba902c01beecb5943bb1" + Md5 = "6ad92e9522e4ba902c01beecb5943bb1" }, new BlockImageTestExpected { @@ -1992,7 +1992,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "9a1a7d8f53fcfad7603fe585c6c7214c" + Md5 = "9a1a7d8f53fcfad7603fe585c6c7214c" }, new BlockImageTestExpected { @@ -2000,7 +2000,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_HD, Sectors = 1600, SectorSize = 1024, - MD5 = "2a7a9b48551fd4d8b166bcfcbe1ca132" + Md5 = "2a7a9b48551fd4d8b166bcfcbe1ca132" }, new BlockImageTestExpected { @@ -2008,7 +2008,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "40199611e6e75bbc37ad6c52a5b77eae" + Md5 = "40199611e6e75bbc37ad6c52a5b77eae" }, new BlockImageTestExpected { @@ -2016,7 +2016,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5100, SectorSize = 512, - MD5 = "8fa0ffd7481a94b9e7c4006599329250" + Md5 = "8fa0ffd7481a94b9e7c4006599329250" }, new BlockImageTestExpected { @@ -2024,7 +2024,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 9180, SectorSize = 512, - MD5 = "3fa51592c5a65b7e4915a8e22d523ced" + Md5 = "3fa51592c5a65b7e4915a8e22d523ced" }, new BlockImageTestExpected { @@ -2032,7 +2032,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 13770, SectorSize = 512, - MD5 = "2153339750c119627bab75bd0bf7a193" + Md5 = "2153339750c119627bab75bd0bf7a193" }, new BlockImageTestExpected { @@ -2040,7 +2040,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5120, SectorSize = 256, - MD5 = "f92b2e52259531d50bfb403dc1274ab1" + Md5 = "f92b2e52259531d50bfb403dc1274ab1" }, new BlockImageTestExpected { @@ -2048,7 +2048,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -2056,7 +2056,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1600, SectorSize = 256, - MD5 = "a5dc382d75ec46434b313e289c281d8c" + Md5 = "a5dc382d75ec46434b313e289c281d8c" }, new BlockImageTestExpected { @@ -2064,7 +2064,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1152, SectorSize = 256, - MD5 = "8335b175c352352e19f9008ad67d1375" + Md5 = "8335b175c352352e19f9008ad67d1375" }, new BlockImageTestExpected { @@ -2072,7 +2072,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1056, SectorSize = 256, - MD5 = "447efa963c19474508c503d037a3b429" + Md5 = "447efa963c19474508c503d037a3b429" }, new BlockImageTestExpected { @@ -2080,7 +2080,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "b7669fa76ecf5634313675b001bb7fa2" + Md5 = "b7669fa76ecf5634313675b001bb7fa2" }, new BlockImageTestExpected { @@ -2088,7 +2088,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5120, SectorSize = 256, - MD5 = "676f1bc7764899912ab6ad8257c63a16" + Md5 = "676f1bc7764899912ab6ad8257c63a16" }, new BlockImageTestExpected { @@ -2096,7 +2096,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1120, SectorSize = 256, - MD5 = "d72e86324d4d518996f6671751614800" + Md5 = "d72e86324d4d518996f6671751614800" }, new BlockImageTestExpected { @@ -2104,7 +2104,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 621, SectorSize = 512, - MD5 = "b76bd117ce24d933cdefe09b1de2164a" + Md5 = "b76bd117ce24d933cdefe09b1de2164a" }, new BlockImageTestExpected { @@ -2112,7 +2112,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ATARI_525_SD, Sectors = 720, SectorSize = 128, - MD5 = "a769b7642a222d97a56c46f53833fafa" + Md5 = "a769b7642a222d97a56c46f53833fafa" }, new BlockImageTestExpected { @@ -2120,7 +2120,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "dfa733d034bb1f83d694dfa217910081" + Md5 = "dfa733d034bb1f83d694dfa217910081" }, new BlockImageTestExpected { @@ -2128,7 +2128,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1600, SectorSize = 256, - MD5 = "8260ee01a245aec2de162ee0d85f4b7f" + Md5 = "8260ee01a245aec2de162ee0d85f4b7f" }, new BlockImageTestExpected { @@ -2136,7 +2136,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_SD_80, Sectors = 800, SectorSize = 256, - MD5 = "261c7a5a4298e9f050928dd770097c77" + Md5 = "261c7a5a4298e9f050928dd770097c77" }, new BlockImageTestExpected { @@ -2144,7 +2144,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "a47068ff73dfbea58c25daa5b9132a9e" + Md5 = "a47068ff73dfbea58c25daa5b9132a9e" }, new BlockImageTestExpected { @@ -2152,7 +2152,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ATARI_525_DD, Sectors = 720, SectorSize = 256, - MD5 = "d1ab955f0961ab94e6cf69f78134a84b" + Md5 = "d1ab955f0961ab94e6cf69f78134a84b" }, new BlockImageTestExpected { @@ -2160,7 +2160,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 714, SectorSize = 256, - MD5 = "8b62738f15bcc916a668eaa67eec86e7" + Md5 = "8b62738f15bcc916a668eaa67eec86e7" }, new BlockImageTestExpected { @@ -2168,7 +2168,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "87a432496cb23b5c2299545500df3553", + Md5 = "87a432496cb23b5c2299545500df3553", Partitions = new[] { new BlockPartitionVolumes @@ -2184,7 +2184,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "9866ab8e58fa4be25010184aec4ad3aa" + Md5 = "9866ab8e58fa4be25010184aec4ad3aa" }, new BlockImageTestExpected { @@ -2192,7 +2192,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1280, SectorSize = 256, - MD5 = "9dab329ae098b29889ab08278de38f95" + Md5 = "9dab329ae098b29889ab08278de38f95" }, new BlockImageTestExpected { @@ -2200,7 +2200,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "0d71b4952dadbfb1061acc1f4640c787" + Md5 = "0d71b4952dadbfb1061acc1f4640c787" }, new BlockImageTestExpected { @@ -2208,7 +2208,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" + Md5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" }, new BlockImageTestExpected { @@ -2216,7 +2216,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "f8f81f945aaad6fbfe7e2db1905302c1" + Md5 = "f8f81f945aaad6fbfe7e2db1905302c1" }, new BlockImageTestExpected { @@ -2224,7 +2224,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "f6f81c75b5ba45d91c1886c6dda9caee" + Md5 = "f6f81c75b5ba45d91c1886c6dda9caee" }, new BlockImageTestExpected { @@ -2232,7 +2232,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "d4809467b321991a9c772ad87fc8aa19" + Md5 = "d4809467b321991a9c772ad87fc8aa19" }, new BlockImageTestExpected { @@ -2240,7 +2240,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2560, SectorSize = 256, - MD5 = "d075e50705f4ddca7ba4dbc981ec1176" + Md5 = "d075e50705f4ddca7ba4dbc981ec1176" }, new BlockImageTestExpected { @@ -2248,7 +2248,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_SS_DD_80, Sectors = 1280, SectorSize = 256, - MD5 = "9f86480c86bae33a5b444e4a7ed55048" + Md5 = "9f86480c86bae33a5b444e4a7ed55048" }, new BlockImageTestExpected { @@ -2256,7 +2256,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_35_DS_DD, Sectors = 800, SectorSize = 1024, - MD5 = "629971775d902d1cc2658fc76f57e072" + Md5 = "629971775d902d1cc2658fc76f57e072" }, new BlockImageTestExpected { @@ -2264,7 +2264,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5dc0d482a773043d8683a84c8220df95", + Md5 = "5dc0d482a773043d8683a84c8220df95", Partitions = new[] { new BlockPartitionVolumes @@ -2280,7 +2280,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ACORN_525_DS_DD, Sectors = 2544, SectorSize = 256, - MD5 = "1718d8acd18fce3c5c1a7a074ed8ac29" + Md5 = "1718d8acd18fce3c5c1a7a074ed8ac29" }, new BlockImageTestExpected { @@ -2288,7 +2288,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "855943f9caecdcce9b06f0098d773c6b", + Md5 = "855943f9caecdcce9b06f0098d773c6b", Partitions = new[] { new BlockPartitionVolumes @@ -2304,7 +2304,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5ac0a9fc7337f761098f816359b0f6f7", + Md5 = "5ac0a9fc7337f761098f816359b0f6f7", Partitions = new[] { new BlockPartitionVolumes @@ -2320,7 +2320,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ea6ec8e663218b1372048f6e25795b5", + Md5 = "1ea6ec8e663218b1372048f6e25795b5", Partitions = new[] { new BlockPartitionVolumes @@ -2336,7 +2336,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "77a1167b1b9043496e32b8578cde0ff0" + Md5 = "77a1167b1b9043496e32b8578cde0ff0" }, new BlockImageTestExpected { @@ -2344,7 +2344,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4b07d760d65f3f0f8ffa5f2b81cee907", + Md5 = "4b07d760d65f3f0f8ffa5f2b81cee907", Partitions = new[] { new BlockPartitionVolumes @@ -2360,7 +2360,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "32c044c5c2b0bd13806149a759c14935", + Md5 = "32c044c5c2b0bd13806149a759c14935", Partitions = new[] { new BlockPartitionVolumes @@ -2376,7 +2376,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8752095abc13dba3f3467669da333891", + Md5 = "8752095abc13dba3f3467669da333891", Partitions = new[] { new BlockPartitionVolumes @@ -2392,7 +2392,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "aece7cd34bbba3e75307fa70404d9d30", + Md5 = "aece7cd34bbba3e75307fa70404d9d30", Partitions = new[] { new BlockPartitionVolumes @@ -2408,7 +2408,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "5289afb16a6e4a33213e3bcca56c6230", + Md5 = "5289afb16a6e4a33213e3bcca56c6230", Partitions = new[] { new BlockPartitionVolumes @@ -2424,7 +2424,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "1aef0a0ba233476db6567878c3c2b266" + Md5 = "1aef0a0ba233476db6567878c3c2b266" }, new BlockImageTestExpected { @@ -2432,7 +2432,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b96596711f4d2ee85dfda0fe3b9f26c3", + Md5 = "b96596711f4d2ee85dfda0fe3b9f26c3", Partitions = new[] { new BlockPartitionVolumes @@ -2448,7 +2448,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a4f461af7fda5e93a7ab63fcbb7e7683" + Md5 = "a4f461af7fda5e93a7ab63fcbb7e7683" }, new BlockImageTestExpected { @@ -2456,7 +2456,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "8f7f7099d4475f6631fcf0a79b031d61", + Md5 = "8f7f7099d4475f6631fcf0a79b031d61", Partitions = new[] { new BlockPartitionVolumes @@ -2472,7 +2472,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", + Md5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", Partitions = new[] { new BlockPartitionVolumes @@ -2488,7 +2488,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "3c77ca681df78e4cd7baa162aa9b0859", + Md5 = "3c77ca681df78e4cd7baa162aa9b0859", Partitions = new[] { new BlockPartitionVolumes @@ -2504,7 +2504,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "51da1f86c49657ffdb367bb2ddeb7990", + Md5 = "51da1f86c49657ffdb367bb2ddeb7990", Partitions = new[] { new BlockPartitionVolumes @@ -2520,7 +2520,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "b81a4987f89936630b8ebc62e4bbce6e" + Md5 = "b81a4987f89936630b8ebc62e4bbce6e" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -2538,7 +2538,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "f76f92dd326c99c5efad5ee58daf72e1", + Md5 = "f76f92dd326c99c5efad5ee58daf72e1", Partitions = new[] { new BlockPartitionVolumes @@ -2554,7 +2554,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "b6f2c10e42908e334025bc4ffd81e771", + Md5 = "b6f2c10e42908e334025bc4ffd81e771", Partitions = new[] { new BlockPartitionVolumes @@ -2570,7 +2570,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f2f409ea2a62a7866fd2777cc4fc9739", + Md5 = "f2f409ea2a62a7866fd2777cc4fc9739", Partitions = new[] { new BlockPartitionVolumes @@ -2586,7 +2586,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "3e441d69cec5c3169274e1379de4af4b", + Md5 = "3e441d69cec5c3169274e1379de4af4b", Partitions = new[] { new BlockPartitionVolumes @@ -2602,7 +2602,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "30a93f30dd4485c6fc037fe0775d3fc7", + Md5 = "30a93f30dd4485c6fc037fe0775d3fc7", Partitions = new[] { new BlockPartitionVolumes @@ -2618,7 +2618,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "e0caf02cce5597c98313bcc480366ec7", + Md5 = "e0caf02cce5597c98313bcc480366ec7", Partitions = new[] { new BlockPartitionVolumes @@ -2634,7 +2634,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "4af4904d2b3c815da7bef7049209f5eb", + Md5 = "4af4904d2b3c815da7bef7049209f5eb", Partitions = new[] { new BlockPartitionVolumes @@ -2650,7 +2650,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "39bf5a98bcb2185d855ac06378febcfa", + Md5 = "39bf5a98bcb2185d855ac06378febcfa", Partitions = new[] { new BlockPartitionVolumes @@ -2666,7 +2666,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "dc20055b6e6fd6f8e1114d4be2effeed", + Md5 = "dc20055b6e6fd6f8e1114d4be2effeed", Partitions = new[] { new BlockPartitionVolumes @@ -2682,7 +2682,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "56af9256cf71d5aac5fd5d363674bc49" + Md5 = "56af9256cf71d5aac5fd5d363674bc49" }, new BlockImageTestExpected { @@ -2690,7 +2690,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "bbba1e2d1418e05c3a4e7b4d585d160b", + Md5 = "bbba1e2d1418e05c3a4e7b4d585d160b", Partitions = new[] { new BlockPartitionVolumes @@ -2706,7 +2706,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "bca3a045e81617f7f5ebb5a8818eac47", + Md5 = "bca3a045e81617f7f5ebb5a8818eac47", Partitions = new[] { new BlockPartitionVolumes @@ -2722,7 +2722,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a296663cb8e75e94603221352f29cfff", + Md5 = "a296663cb8e75e94603221352f29cfff", Partitions = new[] { new BlockPartitionVolumes @@ -2738,7 +2738,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ecda36ebf0e1100233cb0ec722c18583", + Md5 = "ecda36ebf0e1100233cb0ec722c18583", Partitions = new[] { new BlockPartitionVolumes @@ -2754,7 +2754,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "cef2f4fe9b1a32d5c0544f814e634264", + Md5 = "cef2f4fe9b1a32d5c0544f814e634264", Partitions = new[] { new BlockPartitionVolumes @@ -2770,7 +2770,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "bbe58e26b8f8f822cd3edfd37a4e4924" + Md5 = "bbe58e26b8f8f822cd3edfd37a4e4924" }, new BlockImageTestExpected { @@ -2778,7 +2778,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "b9b6ebdf711364c979de7cf70c3a438a" + Md5 = "b9b6ebdf711364c979de7cf70c3a438a" }, new BlockImageTestExpected { @@ -2786,7 +2786,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d37424f367f545acbb397f2bed766843" + Md5 = "d37424f367f545acbb397f2bed766843" }, new BlockImageTestExpected { @@ -2794,7 +2794,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9963dd6f19ce6bd56eabeccdfbbd821a", + Md5 = "9963dd6f19ce6bd56eabeccdfbbd821a", Partitions = new[] { new BlockPartitionVolumes @@ -2810,7 +2810,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "acf6604559ae8217f7869823e2429024", + Md5 = "acf6604559ae8217f7869823e2429024", Partitions = new[] { new BlockPartitionVolumes @@ -2826,7 +2826,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "23bf2139cdfdc4c16db058fd31ea6481", + Md5 = "23bf2139cdfdc4c16db058fd31ea6481", Partitions = new[] { new BlockPartitionVolumes @@ -2842,7 +2842,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "fa26adda0415f02057b113ad29c80c8d", + Md5 = "fa26adda0415f02057b113ad29c80c8d", Partitions = new[] { new BlockPartitionVolumes @@ -2858,7 +2858,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", + Md5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", Partitions = new[] { new BlockPartitionVolumes @@ -2874,7 +2874,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1386, SectorSize = 512, - MD5 = "e794a3ffa4069ea999fdf7146710fa9e", + Md5 = "e794a3ffa4069ea999fdf7146710fa9e", Partitions = new[] { new BlockPartitionVolumes @@ -2890,7 +2890,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX01, Sectors = 2002, SectorSize = 128, - MD5 = "5b4e36d92b180c3845387391cb5a1c64" + Md5 = "5b4e36d92b180c3845387391cb5a1c64" }, new BlockImageTestExpected { @@ -2898,7 +2898,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes @@ -2914,7 +2914,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -2930,7 +2930,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 164, SectorSize = 16384, - MD5 = "623b224f63d65ae3b6c3ddadadf3b836" + Md5 = "623b224f63d65ae3b6c3ddadadf3b836" }, new BlockImageTestExpected { @@ -2938,7 +2938,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 987, SectorSize = 1024, - MD5 = "08b530d8c25d785b20c93a1a7a6468a0" + Md5 = "08b530d8c25d785b20c93a1a7a6468a0" }, new BlockImageTestExpected { @@ -2946,7 +2946,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -2962,7 +2962,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "db9cfb6eea18820b7a7e0b5b45594471", + Md5 = "db9cfb6eea18820b7a7e0b5b45594471", Partitions = new[] { new BlockPartitionVolumes @@ -2978,7 +2978,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ff7649b679ba22ff20d39ff717dbec8", + Md5 = "1ff7649b679ba22ff20d39ff717dbec8", Partitions = new[] { new BlockPartitionVolumes @@ -2994,7 +2994,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -3010,7 +3010,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 164, SectorSize = 16384, - MD5 = "adafed1fac3d1a181380bdb590249385" + Md5 = "adafed1fac3d1a181380bdb590249385" }, new BlockImageTestExpected { @@ -3018,7 +3018,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1812, SectorSize = 1024, - MD5 = "c741c78eecd673f8fc49e77459871940" + Md5 = "c741c78eecd673f8fc49e77459871940" }, new BlockImageTestExpected { @@ -3026,7 +3026,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "03c2af6a8ebf4bd6f530335de34ae5dd", + Md5 = "03c2af6a8ebf4bd6f530335de34ae5dd", Partitions = new[] { new BlockPartitionVolumes @@ -3042,7 +3042,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" }, new BlockImageTestExpected { @@ -3050,7 +3050,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -3066,7 +3066,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56", + Md5 = "b4a602f67903c46eef62addb0780aa56", Partitions = new[] { new BlockPartitionVolumes @@ -3082,7 +3082,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 670, SectorSize = 2048, - MD5 = "71194f8dba31d29780bd0a6ecee5ab2b" + Md5 = "71194f8dba31d29780bd0a6ecee5ab2b" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs index ccd9f2762..53f43d742 100644 --- a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs +++ b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs @@ -39,7 +39,7 @@ public class Cuesheet : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "IsoBuster", "Cuesheet"); - public override IMediaImage _plugin => new CdrWin(); + public override IMediaImage Plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "gigarec.cue", MediaType = MediaType.CDROM, Sectors = 469652, - MD5 = "b7659466b925296a36390c58c480e4bb", - LongMD5 = "51bf2c54fee363520906709cc42a710a", + Md5 = "b7659466b925296a36390c58c480e4bb", + LongMd5 = "51bf2c54fee363520906709cc42a710a", Tracks = new[] { new TrackInfoTestExpected @@ -78,8 +78,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "jaguarcd.cue", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "e20824bc6258d8434096c84548f1c4cf", - LongMD5 = "e20824bc6258d8434096c84548f1c4cf", + Md5 = "e20824bc6258d8434096c84548f1c4cf", + LongMd5 = "e20824bc6258d8434096c84548f1c4cf", Tracks = new[] { new TrackInfoTestExpected @@ -177,8 +177,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "pcengine.cue", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "989122b6c1f0fc135ee6d481bc347295", - LongMD5 = "2f58bc40012040bd3c9e4ae56fbbfad3", + Md5 = "989122b6c1f0fc135ee6d481bc347295", + LongMd5 = "2f58bc40012040bd3c9e4ae56fbbfad3", Tracks = new[] { new TrackInfoTestExpected @@ -326,8 +326,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "pcfx.cue", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "0034c2e54afd76387797c7221c4a054b", - LongMD5 = "77a9dcd8f5a69d939e076e45602923e0", + Md5 = "0034c2e54afd76387797c7221c4a054b", + LongMd5 = "77a9dcd8f5a69d939e076e45602923e0", Tracks = new[] { new TrackInfoTestExpected @@ -413,8 +413,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdr.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "aacfe792d28a17f641c7218ccd35f5ff", - LongMD5 = "73e38276225ec2d26c0ace10d42513e1", + Md5 = "aacfe792d28a17f641c7218ccd35f5ff", + LongMd5 = "73e38276225ec2d26c0ace10d42513e1", Tracks = new[] { new TrackInfoTestExpected @@ -450,8 +450,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrom.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -487,8 +487,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrw.cue", MediaType = MediaType.CDRW, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -518,8 +518,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.cue", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "b236def899758bd04b8a3105b47126db", - LongMD5 = "b236def899758bd04b8a3105b47126db", + Md5 = "b236def899758bd04b8a3105b47126db", + LongMd5 = "b236def899758bd04b8a3105b47126db", Tracks = new[] { new TrackInfoTestExpected @@ -617,8 +617,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_enhancedcd.cue", MediaType = MediaType.CDPLUS, Sectors = 59206, - MD5 = "04b7bcd252635eaa8e6b21c1597d44ba", - LongMD5 = "b480c86b959c246294a2cc4ad3180cbf", + Md5 = "04b7bcd252635eaa8e6b21c1597d44ba", + LongMd5 = "b480c86b959c246294a2cc4ad3180cbf", Tracks = new[] { new TrackInfoTestExpected @@ -663,8 +663,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.cue", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "7b3e4a952c369cd4837cee40f1a567f2", - LongMD5 = "d6555969dd70fb2772cd5b979c6fa284", + Md5 = "7b3e4a952c369cd4837cee40f1a567f2", + LongMd5 = "d6555969dd70fb2772cd5b979c6fa284", Tracks = new[] { new TrackInfoTestExpected @@ -701,8 +701,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "546f85b167c61c2e80dec709f4a4bfb5", - LongMD5 = "82e40f2e2e36a1ec2eeb89ea154aa7f3", + Md5 = "546f85b167c61c2e80dec709f4a4bfb5", + LongMd5 = "82e40f2e2e36a1ec2eeb89ea154aa7f3", Tracks = new[] { new TrackInfoTestExpected @@ -851,8 +851,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multiple_indexes.cue", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "4bc4eb89184a69d902ecc1f2745ecf32", - LongMD5 = "4bc4eb89184a69d902ecc1f2745ecf32", + Md5 = "4bc4eb89184a69d902ecc1f2745ecf32", + LongMd5 = "4bc4eb89184a69d902ecc1f2745ecf32", Tracks = new[] { new TrackInfoTestExpected @@ -902,8 +902,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multisession.cue", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "671f5b747692780a979b3c4b59b39597", - LongMD5 = "4171f86df9f3b8c277958324a48c54d8", + Md5 = "671f5b747692780a979b3c4b59b39597", + LongMd5 = "4171f86df9f3b8c277958324a48c54d8", Tracks = new[] { new TrackInfoTestExpected @@ -1021,8 +1021,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multisession_dvd+r.cue", MediaType = MediaType.DVDPRDL, Sectors = 230624, - MD5 = "020993315e49ab0d36bc7248819162ea", - LongMD5 = "020993315e49ab0d36bc7248819162ea", + Md5 = "020993315e49ab0d36bc7248819162ea", + LongMd5 = "020993315e49ab0d36bc7248819162ea", Tracks = new[] { new TrackInfoTestExpected @@ -1067,8 +1067,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multisession_dvd-r.cue", MediaType = MediaType.DVDR, Sectors = 257264, - MD5 = "dff8f2107a4ea9633a88ce38ff609b8e", - LongMD5 = "dff8f2107a4ea9633a88ce38ff609b8e", + Md5 = "dff8f2107a4ea9633a88ce38ff609b8e", + LongMd5 = "dff8f2107a4ea9633a88ce38ff609b8e", Tracks = new[] { new TrackInfoTestExpected @@ -1113,8 +1113,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_videocd.cue", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "22d646f182b79efcf8915fd01f484391", - LongMD5 = "72243676a71ff7a3161dce368d3ddc71", + Md5 = "22d646f182b79efcf8915fd01f484391", + LongMd5 = "72243676a71ff7a3161dce368d3ddc71", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/KryoFlux/Raw.cs b/Aaru.Tests/Images/KryoFlux/Raw.cs index fc0d2795b..6e0c2f1d0 100644 --- a/Aaru.Tests/Images/KryoFlux/Raw.cs +++ b/Aaru.Tests/Images/KryoFlux/Raw.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "KryoFlux", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "c1b868482a064686d2a592f3246c2958" + Md5 = "c1b868482a064686d2a592f3246c2958" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "2626f65b49ec085253c41fa2e2a9e788" + Md5 = "2626f65b49ec085253c41fa2e2a9e788" }, new BlockImageTestExpected { @@ -64,7 +64,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "7db6730656efb22695cdf0a49e2674c9" + Md5 = "7db6730656efb22695cdf0a49e2674c9" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "9d978dff1196b456b8372d78e6b17970" + Md5 = "9d978dff1196b456b8372d78e6b17970" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "ee038347920d088c14f79e6c5fc241c9" + Md5 = "ee038347920d088c14f79e6c5fc241c9" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/Lisa/Raw.cs b/Aaru.Tests/Images/Lisa/Raw.cs index 8e6929473..6679768eb 100644 --- a/Aaru.Tests/Images/Lisa/Raw.cs +++ b/Aaru.Tests/Images/Lisa/Raw.cs @@ -39,7 +39,7 @@ public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Lisa emulators", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10108, SectorSize = 512, - MD5 = "24001116ee48e6545e4514b3ea18b4e2" + Md5 = "24001116ee48e6545e4514b3ea18b4e2" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10108, SectorSize = 512, - MD5 = "2e328345fda18a97721c4a35cb2bb5bb" + Md5 = "2e328345fda18a97721c4a35cb2bb5bb" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10108, SectorSize = 512, - MD5 = "78cdf7207060bf05c272cb8b22fc6449" + Md5 = "78cdf7207060bf05c272cb8b22fc6449" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 20216, SectorSize = 512, - MD5 = "fc729677df4ba92da98137058aa1c298" + Md5 = "fc729677df4ba92da98137058aa1c298" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 20216, SectorSize = 512, - MD5 = "e98bf459bd20cfb466d92a91086cdaa7" + Md5 = "e98bf459bd20cfb466d92a91086cdaa7" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 10108, SectorSize = 512, - MD5 = "dd146bc14be87d5ad98b961dd462f469" + Md5 = "dd146bc14be87d5ad98b961dd462f469" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/MAME/v1.cs b/Aaru.Tests/Images/MAME/v1.cs index 15b04eb97..42ae29e5c 100644 --- a/Aaru.Tests/Images/MAME/v1.cs +++ b/Aaru.Tests/Images/MAME/v1.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class V1 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1"); - public override IMediaImage _plugin => new Chd(); + public override IMediaImage Plugin => new Chd(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class V1 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "43476343f53a177dd57b68dd769917aa" + Md5 = "43476343f53a177dd57b68dd769917aa" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/MAME/v3.cs b/Aaru.Tests/Images/MAME/v3.cs index 21fa39ede..d081e6473 100644 --- a/Aaru.Tests/Images/MAME/v3.cs +++ b/Aaru.Tests/Images/MAME/v3.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class V3 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3"); - public override IMediaImage _plugin => new Chd(); + public override IMediaImage Plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,9 +48,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 469652, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -69,7 +69,7 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "43476343f53a177dd57b68dd769917aa" + Md5 = "43476343f53a177dd57b68dd769917aa" }, new OpticalImageTestExpected { @@ -77,9 +77,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 160506, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -218,9 +218,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 246380, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -295,9 +295,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 247073, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -420,9 +420,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -441,9 +441,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -462,9 +462,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -483,9 +483,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 28953, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -512,9 +512,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -653,9 +653,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 8133, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -674,9 +674,9 @@ public class V3 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 48794, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MAME/v4.cs b/Aaru.Tests/Images/MAME/v4.cs index 1a48fa42c..96846e1ee 100644 --- a/Aaru.Tests/Images/MAME/v4.cs +++ b/Aaru.Tests/Images/MAME/v4.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class V4 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4"); - public override IMediaImage _plugin => new Chd(); + public override IMediaImage Plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,9 +48,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 469652, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -69,7 +69,7 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "43476343f53a177dd57b68dd769917aa" + Md5 = "43476343f53a177dd57b68dd769917aa" }, new OpticalImageTestExpected { @@ -77,9 +77,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 243587, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -178,9 +178,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 160506, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -319,9 +319,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 246380, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -396,9 +396,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 247073, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -521,9 +521,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -542,9 +542,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -563,9 +563,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -584,9 +584,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 277696, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -685,9 +685,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 59206, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -722,9 +722,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 350134, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -743,9 +743,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329158, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -884,9 +884,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 65536, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -937,9 +937,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 51168, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -982,9 +982,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 230624, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1011,9 +1011,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 257264, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1040,9 +1040,9 @@ public class V4 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 48794, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MAME/v5/compressed.cs b/Aaru.Tests/Images/MAME/v5/compressed.cs index a2e5d22c4..960736ae2 100644 --- a/Aaru.Tests/Images/MAME/v5/compressed.cs +++ b/Aaru.Tests/Images/MAME/v5/compressed.cs @@ -39,7 +39,7 @@ public class Compressed : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "compressed"); - public override IMediaImage _plugin => new Chd(); + public override IMediaImage Plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +49,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 469652, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -70,7 +70,7 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "43476343f53a177dd57b68dd769917aa" + Md5 = "43476343f53a177dd57b68dd769917aa" }, new OpticalImageTestExpected { @@ -78,9 +78,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 243587, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -179,9 +179,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 160506, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -320,9 +320,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 246380, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -397,9 +397,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 247073, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -522,9 +522,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -543,9 +543,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -564,9 +564,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -585,9 +585,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 277696, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -686,9 +686,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 59206, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -723,9 +723,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 350134, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -744,9 +744,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329158, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -885,9 +885,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 65536, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -938,9 +938,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 51168, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -983,9 +983,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 230624, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1012,9 +1012,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 257264, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1041,9 +1041,9 @@ public class Compressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 48794, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MAME/v5/uncompressed.cs b/Aaru.Tests/Images/MAME/v5/uncompressed.cs index 870731c6f..e19f588b9 100644 --- a/Aaru.Tests/Images/MAME/v5/uncompressed.cs +++ b/Aaru.Tests/Images/MAME/v5/uncompressed.cs @@ -39,7 +39,7 @@ public class Uncompressed : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "uncompressed"); - public override IMediaImage _plugin => new Chd(); + public override IMediaImage Plugin => new Chd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +49,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 469652, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -70,7 +70,7 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "43476343f53a177dd57b68dd769917aa" + Md5 = "43476343f53a177dd57b68dd769917aa" }, new OpticalImageTestExpected { @@ -78,9 +78,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 243587, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -179,9 +179,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 160506, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -320,9 +320,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 246380, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -397,9 +397,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 247073, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -522,9 +522,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -543,9 +543,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -564,9 +564,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -585,9 +585,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 277696, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -686,9 +686,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 59206, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -723,9 +723,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 350134, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -744,9 +744,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329158, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -885,9 +885,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 65536, SectorSize = 2352, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -938,9 +938,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 51168, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -983,9 +983,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 230624, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1012,9 +1012,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 257264, SectorSize = 2048, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -1041,9 +1041,9 @@ public class Uncompressed : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 48794, SectorSize = 2336, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs index 0eba70146..5f1309fa7 100644 --- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs +++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs @@ -39,7 +39,7 @@ public class Cuesheet : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Cuesheet"); - public override IMediaImage _plugin => new CdrWin(); + public override IMediaImage Plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.cue", MediaType = MediaType.CDDA, Sectors = 279299, - MD5 = "ab350df419f96d967f51d0161ebeba63", - LongMD5 = "ab350df419f96d967f51d0161ebeba63", + Md5 = "ab350df419f96d967f51d0161ebeba63", + LongMd5 = "ab350df419f96d967f51d0161ebeba63", Tracks = new[] { new TrackInfoTestExpected @@ -235,8 +235,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_audiocd.cue", MediaType = MediaType.CDDA, Sectors = 247072, - MD5 = "277e98295297f618cc63687e98288d7e", - LongMD5 = "277e98295297f618cc63687e98288d7e", + Md5 = "277e98295297f618cc63687e98288d7e", + LongMd5 = "277e98295297f618cc63687e98288d7e", Tracks = new[] { new TrackInfoTestExpected @@ -358,8 +358,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrom.cue", MediaType = MediaType.CDROM, Sectors = 254264, - MD5 = "2de6dd5eaa71c1a97625bab68382da60", - LongMD5 = "222edd2c920b63aefe2087ed6278abe6", + Md5 = "2de6dd5eaa71c1a97625bab68382da60", + LongMd5 = "222edd2c920b63aefe2087ed6278abe6", Tracks = new[] { new TrackInfoTestExpected @@ -395,8 +395,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrw.cue", MediaType = MediaType.CDROM, Sectors = 308223, - MD5 = "f1510c82ea4ff535415833242adddac6", - LongMD5 = "22bd168e59e075229821448b60d1820b", + Md5 = "f1510c82ea4ff535415833242adddac6", + LongMd5 = "22bd168e59e075229821448b60d1820b", Tracks = new[] { new TrackInfoTestExpected @@ -426,8 +426,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvdram_v1.cue", MediaType = MediaType.DVDROM, Sectors = 1218959, - MD5 = "fa58d5645e091cc3f0c87998c819955e", - LongMD5 = "fa58d5645e091cc3f0c87998c819955e", + Md5 = "fa58d5645e091cc3f0c87998c819955e", + LongMd5 = "fa58d5645e091cc3f0c87998c819955e", Tracks = new[] { new TrackInfoTestExpected @@ -455,8 +455,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvdram_v2.cue", MediaType = MediaType.DVDROM, Sectors = 2236703, - MD5 = "c02a2cf88af17ed8333af2e7d4560e40", - LongMD5 = "c02a2cf88af17ed8333af2e7d4560e40", + Md5 = "c02a2cf88af17ed8333af2e7d4560e40", + LongMd5 = "c02a2cf88af17ed8333af2e7d4560e40", Tracks = new[] { new TrackInfoTestExpected @@ -484,8 +484,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvd+r-dl.cue", MediaType = MediaType.DVDROM, Sectors = 3455935, - MD5 = "e71164a331f656e30025c39956e35372", - LongMD5 = "e71164a331f656e30025c39956e35372", + Md5 = "e71164a331f656e30025c39956e35372", + LongMd5 = "e71164a331f656e30025c39956e35372", Tracks = new[] { new TrackInfoTestExpected @@ -501,8 +501,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvd-rom.cue", MediaType = MediaType.DVDROM, Sectors = 2146367, - MD5 = "fa1beeef4c4f1493f306a13f4fd113b2", - LongMD5 = "fa1beeef4c4f1493f306a13f4fd113b2", + Md5 = "fa1beeef4c4f1493f306a13f4fd113b2", + LongMd5 = "fa1beeef4c4f1493f306a13f4fd113b2", Tracks = new[] { new TrackInfoTestExpected @@ -530,8 +530,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvd+rw.cue", MediaType = MediaType.DVDROM, Sectors = 2295103, - MD5 = "767692b526a7ea7020e7144d6d7cadab", - LongMD5 = "767692b526a7ea7020e7144d6d7cadab", + Md5 = "767692b526a7ea7020e7144d6d7cadab", + LongMd5 = "767692b526a7ea7020e7144d6d7cadab", Tracks = new[] { new TrackInfoTestExpected @@ -683,8 +683,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329157, - MD5 = "cc6354d06b009b0446012842c7f94be7", - LongMD5 = "bb3ebf139ebb76fff1b229a379d289e4", + Md5 = "cc6354d06b009b0446012842c7f94be7", + LongMd5 = "bb3ebf139ebb76fff1b229a379d289e4", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs index 6f61f9943..c4154f575 100644 --- a/Aaru.Tests/Images/MagicISO/Nero.cs +++ b/Aaru.Tests/Images/MagicISO/Nero.cs @@ -38,7 +38,7 @@ public class Nero : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Nero"); - public override IMediaImage _plugin => new DiscImages.Nero(); + public override IMediaImage Plugin => new DiscImages.Nero(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,8 +47,8 @@ public class Nero : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.nrg", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "7557c72d4cf6df8bc1896388b863727a", - LongMD5 = "7557c72d4cf6df8bc1896388b863727a", + Md5 = "7557c72d4cf6df8bc1896388b863727a", + LongMd5 = "7557c72d4cf6df8bc1896388b863727a", Tracks = new[] { new TrackInfoTestExpected @@ -234,8 +234,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_audiocd.nrg", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", Tracks = new[] { new TrackInfoTestExpected @@ -357,8 +357,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_cdrom.nrg", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -394,8 +394,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_cdrw.nrg", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -425,8 +425,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvdram_v1.nrg", MediaType = MediaType.DVDROM, Sectors = 1218811, - MD5 = "e2d40f64b4ae274c3ef55252fbda99cf", - LongMD5 = "e2d40f64b4ae274c3ef55252fbda99cf", + Md5 = "e2d40f64b4ae274c3ef55252fbda99cf", + LongMd5 = "e2d40f64b4ae274c3ef55252fbda99cf", Tracks = new[] { new TrackInfoTestExpected @@ -455,8 +455,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvdram_v2.nrg", MediaType = MediaType.DVDROM, Sectors = 2236555, - MD5 = "d46730ef92b0115505d9035f78d90ca3", - LongMD5 = "d46730ef92b0115505d9035f78d90ca3", + Md5 = "d46730ef92b0115505d9035f78d90ca3", + LongMd5 = "d46730ef92b0115505d9035f78d90ca3", Tracks = new[] { new TrackInfoTestExpected @@ -485,8 +485,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd+r-dl.nrg", MediaType = MediaType.DVDROM, Sectors = 13099755, - MD5 = "3b36362c20c5a75cb4726d64a7e2729c", - LongMD5 = "3b36362c20c5a75cb4726d64a7e2729c", + Md5 = "3b36362c20c5a75cb4726d64a7e2729c", + LongMd5 = "3b36362c20c5a75cb4726d64a7e2729c", Tracks = new[] { new TrackInfoTestExpected @@ -515,8 +515,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd-rom.nrg", MediaType = MediaType.DVDROM, Sectors = 2146219, - MD5 = "117c7207751e4d94d6b396f77d3ef367", - LongMD5 = "117c7207751e4d94d6b396f77d3ef367", + Md5 = "117c7207751e4d94d6b396f77d3ef367", + LongMd5 = "117c7207751e4d94d6b396f77d3ef367", Tracks = new[] { new TrackInfoTestExpected @@ -545,8 +545,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd+rw.nrg", MediaType = MediaType.DVDROM, Sectors = 2294955, - MD5 = "3313752e2493fce618ced27aecffc79b", - LongMD5 = "3313752e2493fce618ced27aecffc79b", + Md5 = "3313752e2493fce618ced27aecffc79b", + LongMd5 = "3313752e2493fce618ced27aecffc79b", Tracks = new[] { new TrackInfoTestExpected @@ -575,8 +575,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_enhancedcd.nrg", MediaType = MediaType.CDROMXA, Sectors = 303316, - MD5 = "ca5698b203534de70dd82916d33aae99", - LongMD5 = "bf1cd9a3b5dca86ac03ffe51c962840e", + Md5 = "ca5698b203534de70dd82916d33aae99", + LongMd5 = "bf1cd9a3b5dca86ac03ffe51c962840e", Tracks = new[] { new TrackInfoTestExpected @@ -709,8 +709,8 @@ public class Nero : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.nrg", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "d22fde4f71e3faa8f048770ae9d7635e", - LongMD5 = "bced53ad182fe1b13ecd05caf1fe73a7", + Md5 = "d22fde4f71e3faa8f048770ae9d7635e", + LongMd5 = "bced53ad182fe1b13ecd05caf1fe73a7", Tracks = new[] { new TrackInfoTestExpected @@ -859,8 +859,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd-r.nrg", MediaType = MediaType.DVDROM, Sectors = 2146219, - MD5 = "117c7207751e4d94d6b396f77d3ef367", - LongMD5 = "117c7207751e4d94d6b396f77d3ef367", + Md5 = "117c7207751e4d94d6b396f77d3ef367", + LongMd5 = "117c7207751e4d94d6b396f77d3ef367", Tracks = new[] { new TrackInfoTestExpected @@ -889,8 +889,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd-rw.nrg", MediaType = MediaType.DVDROM, Sectors = 2146219, - MD5 = "117c7207751e4d94d6b396f77d3ef367", - LongMD5 = "117c7207751e4d94d6b396f77d3ef367", + Md5 = "117c7207751e4d94d6b396f77d3ef367", + LongMd5 = "117c7207751e4d94d6b396f77d3ef367", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs index bd8a940a3..b5373889d 100644 --- a/Aaru.Tests/Images/MaxiDisk.cs +++ b/Aaru.Tests/Images/MaxiDisk.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class MaxiDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk"); - public override IMediaImage _plugin => new DiscImages.MaxiDisk(); + public override IMediaImage Plugin => new DiscImages.MaxiDisk(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "26532a62985b51a2c3b877a57f6d257b", + Md5 = "26532a62985b51a2c3b877a57f6d257b", Partitions = new[] { new BlockPartitionVolumes @@ -63,7 +63,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9827ba1b3e9cac41263caabd862e78f9", + Md5 = "9827ba1b3e9cac41263caabd862e78f9", Partitions = new[] { new BlockPartitionVolumes @@ -79,7 +79,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "4aeafaf2a088d6a7406856dce8118567", + Md5 = "4aeafaf2a088d6a7406856dce8118567", Partitions = new[] { new BlockPartitionVolumes @@ -95,7 +95,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2bfd2e0a81bad704f8fc7758358cfcca", + Md5 = "2bfd2e0a81bad704f8fc7758358cfcca", Partitions = new[] { new BlockPartitionVolumes @@ -111,7 +111,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7e3bf04f3660dd1052a335dc99441e44", + Md5 = "7e3bf04f3660dd1052a335dc99441e44", Partitions = new[] { new BlockPartitionVolumes @@ -127,7 +127,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "8eb8cb310feaf03c69fffd4f6e729847", + Md5 = "8eb8cb310feaf03c69fffd4f6e729847", Partitions = new[] { new BlockPartitionVolumes @@ -143,7 +143,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a58fd062f024b95714f1223a8bc2232f", + Md5 = "a58fd062f024b95714f1223a8bc2232f", Partitions = new[] { new BlockPartitionVolumes @@ -159,7 +159,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "00e61c06bf29f0c04a7eabe2dbd7efb6", + Md5 = "00e61c06bf29f0c04a7eabe2dbd7efb6", Partitions = new[] { new BlockPartitionVolumes @@ -175,7 +175,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "d81f5cb64fd0b99f138eab34110bbc3c", + Md5 = "d81f5cb64fd0b99f138eab34110bbc3c", Partitions = new[] { new BlockPartitionVolumes @@ -191,7 +191,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "a89006a75d13bee9202d1d6e52721ccb", + Md5 = "a89006a75d13bee9202d1d6e52721ccb", Partitions = new[] { new BlockPartitionVolumes @@ -207,7 +207,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "beef1cdb004dc69391d6b3d508988b95", + Md5 = "beef1cdb004dc69391d6b3d508988b95", Partitions = new[] { new BlockPartitionVolumes @@ -223,7 +223,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6213897b7dbf263f12abf76901d43862" + Md5 = "6213897b7dbf263f12abf76901d43862" }, new BlockImageTestExpected { @@ -231,7 +231,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "073a172879a71339ef4b00ebb47b67fc", + Md5 = "073a172879a71339ef4b00ebb47b67fc", Partitions = new[] { new BlockPartitionVolumes @@ -247,7 +247,7 @@ public class MaxiDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "02259cd5fbcc20f8484aa6bece7a37c6", + Md5 = "02259cd5fbcc20f8484aa6bece7a37c6", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/NHDr0.cs b/Aaru.Tests/Images/NHDr0.cs index ad0c2a7a3..7dae7a2ed 100644 --- a/Aaru.Tests/Images/NHDr0.cs +++ b/Aaru.Tests/Images/NHDr0.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class NHDr0 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next"); - public override IMediaImage _plugin => new Nhdr0(); + public override IMediaImage Plugin => new Nhdr0(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +50,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 261120, SectorSize = 512, - MD5 = "af7c3cfa315b6661300017f865bf26d6" + Md5 = "af7c3cfa315b6661300017f865bf26d6" }, new BlockImageTestExpected { @@ -56,7 +58,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 40800, SectorSize = 512, - MD5 = "bcb390d0b4d12feac29dbadc1a623c99" + Md5 = "bcb390d0b4d12feac29dbadc1a623c99" }, new BlockImageTestExpected { @@ -64,7 +66,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 522240, SectorSize = 512, - MD5 = "e50e78b3742f5f89dd1a5573ba3141c4" + Md5 = "e50e78b3742f5f89dd1a5573ba3141c4" }, new BlockImageTestExpected { @@ -72,7 +74,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 83640, SectorSize = 512, - MD5 = "007acca6fb53f90728d78f7c40c2b094" + Md5 = "007acca6fb53f90728d78f7c40c2b094" }, new BlockImageTestExpected { @@ -80,7 +82,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1044480, SectorSize = 512, - MD5 = "42d1cb6fc2a9df39ecd53002edd978d6" + Md5 = "42d1cb6fc2a9df39ecd53002edd978d6" }, new BlockImageTestExpected { @@ -88,7 +90,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 132600, SectorSize = 512, - MD5 = "b53f5b406234663de6c2bdffac88322d" + Md5 = "b53f5b406234663de6c2bdffac88322d" }, new BlockImageTestExpected { @@ -96,7 +98,7 @@ public class NHDr0 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 163200, SectorSize = 512, - MD5 = "fe9ecc6f0b5beb9635a1595155941925" + Md5 = "fe9ecc6f0b5beb9635a1595155941925" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/Nero/V1.cs b/Aaru.Tests/Images/Nero/V1.cs index e1529f729..d0d50bfe8 100644 --- a/Aaru.Tests/Images/Nero/V1.cs +++ b/Aaru.Tests/Images/Nero/V1.cs @@ -39,7 +39,7 @@ public class V1 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V1"); - public override IMediaImage _plugin => new Nero(); + public override IMediaImage Plugin => new Nero(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class V1 : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.nrg", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "7557c72d4cf6df8bc1896388b863727a", - LongMD5 = "7557c72d4cf6df8bc1896388b863727a", + Md5 = "7557c72d4cf6df8bc1896388b863727a", + LongMd5 = "7557c72d4cf6df8bc1896388b863727a", Tracks = new[] { new TrackInfoTestExpected @@ -235,9 +235,9 @@ public class V1 : OpticalMediaImageTest TestFile = "jaguarcd.nrg", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "79ade978aad90667f272a693012c11ca", - LongMD5 = "79ade978aad90667f272a693012c11ca", - SubchannelMD5 = "83ec1010fc44694d69dc48bacec5481a", + Md5 = "79ade978aad90667f272a693012c11ca", + LongMd5 = "79ade978aad90667f272a693012c11ca", + SubchannelMd5 = "83ec1010fc44694d69dc48bacec5481a", Tracks = new[] { new TrackInfoTestExpected @@ -335,9 +335,9 @@ public class V1 : OpticalMediaImageTest TestFile = "pcengine.nrg", MediaType = MediaType.CD, Sectors = 160956, - MD5 = "8218b4aeea658111957fa3815a139e74", - LongMD5 = "58b875ac8cb3b6b1f426bc734c3400e4", - SubchannelMD5 = "9e9a6b51bc2e5ec67400cb33ad0ca33f", + Md5 = "8218b4aeea658111957fa3815a139e74", + LongMd5 = "58b875ac8cb3b6b1f426bc734c3400e4", + SubchannelMd5 = "9e9a6b51bc2e5ec67400cb33ad0ca33f", Tracks = new[] { new TrackInfoTestExpected @@ -485,9 +485,9 @@ public class V1 : OpticalMediaImageTest TestFile = "pcfx.nrg", MediaType = MediaType.CD, Sectors = 246680, - MD5 = "24ff2f3451489a71ee502475137cccc3", - LongMD5 = "891ebf5e6bd2eda7445f02958cc4fbd5", - SubchannelMD5 = "e3a0d78b6c32f5795b1b513bd13a6bda", + Md5 = "24ff2f3451489a71ee502475137cccc3", + LongMd5 = "891ebf5e6bd2eda7445f02958cc4fbd5", + SubchannelMd5 = "e3a0d78b6c32f5795b1b513bd13a6bda", Tracks = new[] { new TrackInfoTestExpected @@ -573,9 +573,9 @@ public class V1 : OpticalMediaImageTest TestFile = "report_audiocd.nrg", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "9da6ad8f6f0cadd92509c10809da7296", Tracks = new[] { new TrackInfoTestExpected @@ -697,9 +697,9 @@ public class V1 : OpticalMediaImageTest TestFile = "report_cdrom.nrg", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "1994c303674718c74b35f9a4ea1d3515", Tracks = new[] { new TrackInfoTestExpected @@ -735,9 +735,9 @@ public class V1 : OpticalMediaImageTest TestFile = "report_cdrw.nrg", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "6fe81a972e750c68e08f6935e4d91e34", Tracks = new[] { new TrackInfoTestExpected @@ -767,9 +767,9 @@ public class V1 : OpticalMediaImageTest TestFile = "report_enhancedcd.nrg", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "97e5bf1caf3998e818d40cd845c6ecc9", - LongMD5 = "07b4d88c8f38cc0168a2f5725b31c52e", - SubchannelMD5 = "e6f7319532f46c3fa4fd3569c65546e1", + Md5 = "97e5bf1caf3998e818d40cd845c6ecc9", + LongMd5 = "07b4d88c8f38cc0168a2f5725b31c52e", + SubchannelMd5 = "e6f7319532f46c3fa4fd3569c65546e1", Tracks = new[] { new TrackInfoTestExpected @@ -902,9 +902,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.nrg", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", + SubchannelMd5 = "ca781a7afc4eb77c51f7c551ed45c03c", Tracks = new[] { new TrackInfoTestExpected @@ -1002,9 +1002,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.nrg", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "684122981d4d762daf7b9e559584bccf", - LongMD5 = "f3c26446201534c3635f4d2633310e45", - SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5", + Md5 = "684122981d4d762daf7b9e559584bccf", + LongMd5 = "f3c26446201534c3635f4d2633310e45", + SubchannelMd5 = "65f938f7f9ac34fabd3ab94c14eb76b5", Tracks = new[] { new TrackInfoTestExpected @@ -1041,9 +1041,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.nrg", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "a34e29e42b60023a6ae59f37d2bd4bea", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "f8c96f120cac18c52178b99ef4c4e2a9", + Md5 = "a34e29e42b60023a6ae59f37d2bd4bea", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "f8c96f120cac18c52178b99ef4c4e2a9", Tracks = new[] { new TrackInfoTestExpected @@ -1192,9 +1192,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_multiple_indexes.nrg", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", + SubchannelMd5 = "25bae9e30657e2f64a45e5f690e3ae9e", Tracks = new[] { new TrackInfoTestExpected @@ -1244,9 +1244,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_multisession.nrg", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "5c35db53f7d4d9acce660de76eb81654", - LongMD5 = "e8737ac5b670175abfa6dc927098abab", - SubchannelMD5 = "48656afdbc40b6df06486a04a4d62401", + Md5 = "5c35db53f7d4d9acce660de76eb81654", + LongMd5 = "e8737ac5b670175abfa6dc927098abab", + SubchannelMd5 = "48656afdbc40b6df06486a04a4d62401", Tracks = new[] { new TrackInfoTestExpected @@ -1364,9 +1364,9 @@ public class V1 : OpticalMediaImageTest TestFile = "test_videocd.nrg", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "5412af85d30455e1466644ea97d1adae", - LongMD5 = "610f972fa2e1c5988e4bd0f912b0f12f", - SubchannelMD5 = "935a91f5850352818d92b71f1c87c393", + Md5 = "5412af85d30455e1466644ea97d1adae", + LongMd5 = "610f972fa2e1c5988e4bd0f912b0f12f", + SubchannelMd5 = "935a91f5850352818d92b71f1c87c393", Tracks = new[] { new TrackInfoTestExpected @@ -1403,8 +1403,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_audiocd_dao.nrg", MediaType = MediaType.CDDA, Sectors = 279196, - MD5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", - LongMD5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", + Md5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", + LongMd5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", Tracks = new[] { new TrackInfoTestExpected @@ -1502,8 +1502,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_audiocd_tao.nrg", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "0c355a31a7a488ec387c4508c498d6c0", - LongMD5 = "0c355a31a7a488ec387c4508c498d6c0", + Md5 = "0c355a31a7a488ec387c4508c498d6c0", + LongMd5 = "0c355a31a7a488ec387c4508c498d6c0", Tracks = new[] { new TrackInfoTestExpected @@ -1601,8 +1601,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_dao.nrg", MediaType = MediaType.CDROM, Sectors = 83078, - MD5 = "6cdbcf18acc4c5edd7cc8d6e744dfda7", - LongMD5 = "25fee97101ad661bb719ee008a1404c0", + Md5 = "6cdbcf18acc4c5edd7cc8d6e744dfda7", + LongMd5 = "25fee97101ad661bb719ee008a1404c0", Tracks = new[] { new TrackInfoTestExpected @@ -1620,8 +1620,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_level2_dao.nrg", MediaType = MediaType.CDROM, Sectors = 83084, - MD5 = "25f3dca4291f9c79bfa5592a3e050e8f", - LongMD5 = "3acc918a3633f16c4242a39b76af3b35", + Md5 = "25f3dca4291f9c79bfa5592a3e050e8f", + LongMd5 = "3acc918a3633f16c4242a39b76af3b35", Tracks = new[] { new TrackInfoTestExpected @@ -1639,8 +1639,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_level2_tao.nrg", MediaType = MediaType.CDROM, Sectors = 83084, - MD5 = "25f3dca4291f9c79bfa5592a3e050e8f", - LongMD5 = "3acc918a3633f16c4242a39b76af3b35", + Md5 = "25f3dca4291f9c79bfa5592a3e050e8f", + LongMd5 = "3acc918a3633f16c4242a39b76af3b35", Tracks = new[] { new TrackInfoTestExpected @@ -1658,8 +1658,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_tao.nrg", MediaType = MediaType.CDROM, Sectors = 83078, - MD5 = "6cdbcf18acc4c5edd7cc8d6e744dfda7", - LongMD5 = "25fee97101ad661bb719ee008a1404c0", + Md5 = "6cdbcf18acc4c5edd7cc8d6e744dfda7", + LongMd5 = "25fee97101ad661bb719ee008a1404c0", Tracks = new[] { new TrackInfoTestExpected @@ -1677,8 +1677,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_udf_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85733, - MD5 = "d4088d90592000fbe3f8da5d6822aab1", - LongMD5 = "761122bad9da6699773436a9f6ce753b", + Md5 = "d4088d90592000fbe3f8da5d6822aab1", + LongMd5 = "761122bad9da6699773436a9f6ce753b", Tracks = new[] { new TrackInfoTestExpected @@ -1696,8 +1696,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode1_udf_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85733, - MD5 = "1ec9d3cb33dd32b82d338ebf5c4da09c", - LongMD5 = "f85fd68d3d159dbe417ccd39b221827a", + Md5 = "1ec9d3cb33dd32b82d338ebf5c4da09c", + LongMd5 = "f85fd68d3d159dbe417ccd39b221827a", Tracks = new[] { new TrackInfoTestExpected @@ -1715,8 +1715,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83092, - MD5 = "d9627277c18e16ab83da11e0c86afb8f", - LongMD5 = "1ccd0e946b422fea751bddfde2ef245c", + Md5 = "d9627277c18e16ab83da11e0c86afb8f", + LongMd5 = "1ccd0e946b422fea751bddfde2ef245c", Tracks = new[] { new TrackInfoTestExpected @@ -1734,8 +1734,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_level2_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83092, - MD5 = "50e24226e31ad48de312135a5d3410bb", - LongMD5 = "99f99437dadf65e1acac27fa68495525", + Md5 = "50e24226e31ad48de312135a5d3410bb", + LongMd5 = "99f99437dadf65e1acac27fa68495525", Tracks = new[] { new TrackInfoTestExpected @@ -1753,8 +1753,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_level2_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83092, - MD5 = "50e24226e31ad48de312135a5d3410bb", - LongMD5 = "99f99437dadf65e1acac27fa68495525", + Md5 = "50e24226e31ad48de312135a5d3410bb", + LongMd5 = "99f99437dadf65e1acac27fa68495525", Tracks = new[] { new TrackInfoTestExpected @@ -1772,8 +1772,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83092, - MD5 = "d9627277c18e16ab83da11e0c86afb8f", - LongMD5 = "1ccd0e946b422fea751bddfde2ef245c", + Md5 = "d9627277c18e16ab83da11e0c86afb8f", + LongMd5 = "1ccd0e946b422fea751bddfde2ef245c", Tracks = new[] { new TrackInfoTestExpected @@ -1791,8 +1791,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_udf_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85747, - MD5 = "9eef8934d6354be6fe6d03630d19de9e", - LongMD5 = "c7ac66550c45dae54bc456070f408ff7", + Md5 = "9eef8934d6354be6fe6d03630d19de9e", + LongMd5 = "c7ac66550c45dae54bc456070f408ff7", Tracks = new[] { new TrackInfoTestExpected @@ -1810,8 +1810,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_data_mode2_udf_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85747, - MD5 = "046d55938e6d075f40e738d0f3f1161a", - LongMD5 = "86c65c7e9fcf61eb6fe28d3bfc749da8", + Md5 = "046d55938e6d075f40e738d0f3f1161a", + LongMd5 = "86c65c7e9fcf61eb6fe28d3bfc749da8", Tracks = new[] { new TrackInfoTestExpected @@ -1829,8 +1829,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_mixed_mode_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 325928, - MD5 = "666cf279a98e99a28af0347cac190118", - LongMD5 = "d7dc3fe279da7643882818751b9e0ac0", + Md5 = "666cf279a98e99a28af0347cac190118", + LongMd5 = "d7dc3fe279da7643882818751b9e0ac0", Tracks = new[] { new TrackInfoTestExpected @@ -1936,8 +1936,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_mixed_mode_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 324278, - MD5 = "7a82a04d2e6b283337e42b93a52f5083", - LongMD5 = "c17ccaaf93dc07444cd9f03dc27a3b9f", + Md5 = "7a82a04d2e6b283337e42b93a52f5083", + LongMd5 = "c17ccaaf93dc07444cd9f03dc27a3b9f", Tracks = new[] { new TrackInfoTestExpected @@ -2043,8 +2043,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_udf_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84985, - MD5 = "34ef81d7871dcb2911cd4c682c8413fe", - LongMD5 = "22f62fe5f6b6fe696e582ab879d44508", + Md5 = "34ef81d7871dcb2911cd4c682c8413fe", + LongMd5 = "22f62fe5f6b6fe696e582ab879d44508", Tracks = new[] { new TrackInfoTestExpected @@ -2062,8 +2062,8 @@ public class V1 : OpticalMediaImageTest TestFile = "make_udf_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84985, - MD5 = "549c2a6729fbecf222b85a0fc71a8ce5", - LongMD5 = "a1236fa2aa68dc2fea157930ec0d0b62", + Md5 = "549c2a6729fbecf222b85a0fc71a8ce5", + LongMd5 = "a1236fa2aa68dc2fea157930ec0d0b62", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/Nero/V2.cs b/Aaru.Tests/Images/Nero/V2.cs index 1a404264d..7d681752a 100644 --- a/Aaru.Tests/Images/Nero/V2.cs +++ b/Aaru.Tests/Images/Nero/V2.cs @@ -39,7 +39,7 @@ public class V2 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V2"); - public override IMediaImage _plugin => new Nero(); + public override IMediaImage Plugin => new Nero(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,9 +48,9 @@ public class V2 : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.nrg", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "7557c72d4cf6df8bc1896388b863727a", - LongMD5 = "7557c72d4cf6df8bc1896388b863727a", - SubchannelMD5 = "08cda0c6092a6d831712f56e676c021a", + Md5 = "7557c72d4cf6df8bc1896388b863727a", + LongMd5 = "7557c72d4cf6df8bc1896388b863727a", + SubchannelMd5 = "08cda0c6092a6d831712f56e676c021a", Tracks = new[] { new TrackInfoTestExpected @@ -236,9 +236,9 @@ public class V2 : OpticalMediaImageTest TestFile = "jaguarcd.nrg", MediaType = MediaType.CDDA, Sectors = 243587, - MD5 = "49dbfa68a7b3873d376fabec174be493", - LongMD5 = "49dbfa68a7b3873d376fabec174be493", - SubchannelMD5 = "aaa144eb86936ebd352193c836e62d48", + Md5 = "49dbfa68a7b3873d376fabec174be493", + LongMd5 = "49dbfa68a7b3873d376fabec174be493", + SubchannelMd5 = "aaa144eb86936ebd352193c836e62d48", Tracks = new[] { new TrackInfoTestExpected @@ -336,9 +336,9 @@ public class V2 : OpticalMediaImageTest TestFile = "securdisc.nrg", MediaType = MediaType.CDROM, Sectors = 169536, - MD5 = "95fa1df73ec2dbe008cb691495af6344", - LongMD5 = "6649f47b6829715c1d1ca74e17ac7c0b", - SubchannelMD5 = "8527822753d8123e9a01507a9acc8956", + Md5 = "95fa1df73ec2dbe008cb691495af6344", + LongMd5 = "6649f47b6829715c1d1ca74e17ac7c0b", + SubchannelMd5 = "8527822753d8123e9a01507a9acc8956", Tracks = new[] { new TrackInfoTestExpected @@ -356,9 +356,9 @@ public class V2 : OpticalMediaImageTest TestFile = "report_audiocd.nrg", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "9da6ad8f6f0cadd92509c10809da7296", Tracks = new[] { new TrackInfoTestExpected @@ -480,9 +480,9 @@ public class V2 : OpticalMediaImageTest TestFile = "report_cdrom.nrg", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "1994c303674718c74b35f9a4ea1d3515", Tracks = new[] { new TrackInfoTestExpected @@ -518,9 +518,9 @@ public class V2 : OpticalMediaImageTest TestFile = "report_cdrw.nrg", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "6fe81a972e750c68e08f6935e4d91e34", Tracks = new[] { new TrackInfoTestExpected @@ -550,8 +550,8 @@ public class V2 : OpticalMediaImageTest TestFile = "report_dvd+r-dl.nrg", MediaType = MediaType.DVDROM, Sectors = 3455936, - MD5 = "692148a01b4204160b088141fb52bd70", - LongMD5 = "692148a01b4204160b088141fb52bd70", + Md5 = "692148a01b4204160b088141fb52bd70", + LongMd5 = "692148a01b4204160b088141fb52bd70", Tracks = new[] { @@ -581,8 +581,8 @@ public class V2 : OpticalMediaImageTest TestFile = "report_dvd+rw.nrg", MediaType = MediaType.DVDROM, Sectors = 2295104, - MD5 = "759e9c19389aee07f88a994132b6f8d9", - LongMD5 = "759e9c19389aee07f88a994132b6f8d9", + Md5 = "759e9c19389aee07f88a994132b6f8d9", + LongMd5 = "759e9c19389aee07f88a994132b6f8d9", Tracks = new[] { @@ -612,8 +612,8 @@ public class V2 : OpticalMediaImageTest TestFile = "report_dvdram_v1.nrg", MediaType = MediaType.DVDROM, Sectors = 1218960, - MD5 = "c22b7796791cd4299d74863ed04496c6", - LongMD5 = "c22b7796791cd4299d74863ed04496c6", + Md5 = "c22b7796791cd4299d74863ed04496c6", + LongMd5 = "c22b7796791cd4299d74863ed04496c6", Tracks = new[] { @@ -643,8 +643,8 @@ public class V2 : OpticalMediaImageTest TestFile = "report_dvdram_v2.nrg", MediaType = MediaType.DVDROM, Sectors = 2236704, - MD5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", - LongMD5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", + Md5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", + LongMd5 = "00b1d7c5e9855959a4d2f6b796aeaf4c", Tracks = new[] { @@ -674,8 +674,8 @@ public class V2 : OpticalMediaImageTest TestFile = "report_dvdrom.nrg", MediaType = MediaType.DVDROM, Sectors = 2146368, - MD5 = "106f141400355476b499213f36a363f9", - LongMD5 = "106f141400355476b499213f36a363f9", + Md5 = "106f141400355476b499213f36a363f9", + LongMd5 = "106f141400355476b499213f36a363f9", Tracks = new[] { @@ -705,9 +705,9 @@ public class V2 : OpticalMediaImageTest TestFile = "report_enhancedcd.nrg", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "7174351b366e423082846c7e396905ff", - LongMD5 = "0988146c02c49fe563894d0e24435bbc", - SubchannelMD5 = "758e4933c5703b9d90db0766dcb47b79", + Md5 = "7174351b366e423082846c7e396905ff", + LongMd5 = "0988146c02c49fe563894d0e24435bbc", + SubchannelMd5 = "758e4933c5703b9d90db0766dcb47b79", Tracks = new[] { new TrackInfoTestExpected @@ -840,9 +840,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_audiocd_cdtext.nrg", MediaType = MediaType.CDDA, Sectors = 277696, - MD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - LongMD5 = "7c8fc7bb768cff15d702ac8cd10108d7", - SubchannelMD5 = "c0bc1ac22c7e0e53407836c8f2331a94", + Md5 = "7c8fc7bb768cff15d702ac8cd10108d7", + LongMd5 = "7c8fc7bb768cff15d702ac8cd10108d7", + SubchannelMd5 = "c0bc1ac22c7e0e53407836c8f2331a94", Tracks = new[] { new TrackInfoTestExpected @@ -940,9 +940,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_incd_udf200_finalized.nrg", MediaType = MediaType.CDROMXA, Sectors = 350134, - MD5 = "4a76893cf5e5bee7016692b8f26504e3", - LongMD5 = "f633fb0d3e63ded81118df8d955517a3", - SubchannelMD5 = "d6257be337751e6f10effacaa82d8350", + Md5 = "4a76893cf5e5bee7016692b8f26504e3", + LongMd5 = "f633fb0d3e63ded81118df8d955517a3", + SubchannelMd5 = "d6257be337751e6f10effacaa82d8350", Tracks = new[] { new TrackInfoTestExpected @@ -979,9 +979,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.nrg", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "a34e29e42b60023a6ae59f37d2bd4bea", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", - SubchannelMD5 = "d6ba23bc1118deb2db4a609e72437385", + Md5 = "a34e29e42b60023a6ae59f37d2bd4bea", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", + SubchannelMd5 = "d6ba23bc1118deb2db4a609e72437385", Tracks = new[] { new TrackInfoTestExpected @@ -1130,9 +1130,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_multiple_indexes.nrg", MediaType = MediaType.CDDA, Sectors = 65536, - MD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - LongMD5 = "1b13a8f8aeb23f0b8bbc68518217e771", - SubchannelMD5 = "1a2583cb21730c2ed4f1c53fadffa60a", + Md5 = "1b13a8f8aeb23f0b8bbc68518217e771", + LongMd5 = "1b13a8f8aeb23f0b8bbc68518217e771", + SubchannelMd5 = "1a2583cb21730c2ed4f1c53fadffa60a", Tracks = new[] { new TrackInfoTestExpected @@ -1182,9 +1182,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_multisession.nrg", MediaType = MediaType.CDROMXA, Sectors = 51168, - MD5 = "d5b4f6cd608800aa02a79eb4ddc714dc", - LongMD5 = "5cd43bed94fc3e98f5ad805841c3d0a3", - SubchannelMD5 = "67db42c525f3c850481e94465acd2423", + Md5 = "d5b4f6cd608800aa02a79eb4ddc714dc", + LongMd5 = "5cd43bed94fc3e98f5ad805841c3d0a3", + SubchannelMd5 = "67db42c525f3c850481e94465acd2423", Tracks = new[] { new TrackInfoTestExpected @@ -1302,9 +1302,9 @@ public class V2 : OpticalMediaImageTest TestFile = "test_videocd.nrg", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "5b5e93e5477cd7e8e444d25e8ff42a2a", - LongMD5 = "806eee4238d63e8330710bc141e85bc8", - SubchannelMD5 = "2f111b57f8932c43a6cf4ad2fd5eb5e2", + Md5 = "5b5e93e5477cd7e8e444d25e8ff42a2a", + LongMd5 = "806eee4238d63e8330710bc141e85bc8", + SubchannelMd5 = "2f111b57f8932c43a6cf4ad2fd5eb5e2", Tracks = new[] { new TrackInfoTestExpected @@ -1341,8 +1341,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_audiocd_dao.nrg", MediaType = MediaType.CDDA, Sectors = 279196, - MD5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", - LongMD5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", + Md5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", + LongMd5 = "cce718c0d4d60eb9a0571cd0ae7e2ff2", Tracks = new[] { @@ -1441,8 +1441,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_audiocd_tao.nrg", MediaType = MediaType.CDDA, Sectors = 279196, - MD5 = "5c30e6a6fa2e85751a2e1592fbf3245d", - LongMD5 = "5c30e6a6fa2e85751a2e1592fbf3245d", + Md5 = "5c30e6a6fa2e85751a2e1592fbf3245d", + LongMd5 = "5c30e6a6fa2e85751a2e1592fbf3245d", Tracks = new[] { @@ -1541,8 +1541,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_dvd_iso9660-1999.nrg", MediaType = MediaType.DVDROM, Sectors = 82704, - MD5 = "dac40e24aeccfe416a044bf9502d2b7e", - LongMD5 = "dac40e24aeccfe416a044bf9502d2b7e", + Md5 = "dac40e24aeccfe416a044bf9502d2b7e", + LongMd5 = "dac40e24aeccfe416a044bf9502d2b7e", Tracks = new[] { @@ -1560,8 +1560,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_dvd_joliet.nrg", MediaType = MediaType.DVDROM, Sectors = 83072, - MD5 = "a412c13e81a4044407a81ad794095306", - LongMD5 = "a412c13e81a4044407a81ad794095306", + Md5 = "a412c13e81a4044407a81ad794095306", + LongMd5 = "a412c13e81a4044407a81ad794095306", Tracks = new[] { @@ -1579,8 +1579,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_iso9660-1999_dao.nrg", MediaType = MediaType.CDROM, Sectors = 82695, - MD5 = "b14ace0656db97360e21bc9d7d3d5109", - LongMD5 = "5793b471f2ef0087af63facba9485bee", + Md5 = "b14ace0656db97360e21bc9d7d3d5109", + LongMd5 = "5793b471f2ef0087af63facba9485bee", Tracks = new[] { @@ -1599,8 +1599,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_iso9660-1999_tao.nrg", MediaType = MediaType.CDROM, Sectors = 82695, - MD5 = "b14ace0656db97360e21bc9d7d3d5109", - LongMD5 = "5793b471f2ef0087af63facba9485bee", + Md5 = "b14ace0656db97360e21bc9d7d3d5109", + LongMd5 = "5793b471f2ef0087af63facba9485bee", Tracks = new[] { @@ -1619,8 +1619,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_dao.nrg", MediaType = MediaType.CDROM, Sectors = 83068, - MD5 = "05dcbde7856dae96bb1fcff7d02fdb96", - LongMD5 = "bf5a216352b7a025fb98d76b38afbe3d", + Md5 = "05dcbde7856dae96bb1fcff7d02fdb96", + LongMd5 = "bf5a216352b7a025fb98d76b38afbe3d", Tracks = new[] { @@ -1639,8 +1639,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_tao.nrg", MediaType = MediaType.CDROM, Sectors = 83068, - MD5 = "05dcbde7856dae96bb1fcff7d02fdb96", - LongMD5 = "bf5a216352b7a025fb98d76b38afbe3d", + Md5 = "05dcbde7856dae96bb1fcff7d02fdb96", + LongMd5 = "bf5a216352b7a025fb98d76b38afbe3d", Tracks = new[] { @@ -1659,8 +1659,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_102_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85364, - MD5 = "331c02751e4c2fd505fffa163b1bc361", - LongMD5 = "12f448affe38c96311c9de4633f787e1", + Md5 = "331c02751e4c2fd505fffa163b1bc361", + LongMd5 = "12f448affe38c96311c9de4633f787e1", Tracks = new[] { @@ -1679,8 +1679,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_102_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85364, - MD5 = "52df6748a9436452e6a024d6d43cc5fb", - LongMD5 = "ed6f139b0e763690d84b1f4aba2a6b78", + Md5 = "52df6748a9436452e6a024d6d43cc5fb", + LongMd5 = "ed6f139b0e763690d84b1f4aba2a6b78", Tracks = new[] { @@ -1699,8 +1699,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85364, - MD5 = "45703870e27a99cdc5ee486f9b919209", - LongMD5 = "d9ed9c8bafd5f218d3b7f6aee6be2d44", + Md5 = "45703870e27a99cdc5ee486f9b919209", + LongMd5 = "d9ed9c8bafd5f218d3b7f6aee6be2d44", Tracks = new[] { @@ -1719,8 +1719,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85364, - MD5 = "56392a983981f9e222ea18807934a3d4", - LongMD5 = "9cbd519fe328fcb206c1786fbbfeeb87", + Md5 = "56392a983981f9e222ea18807934a3d4", + LongMd5 = "9cbd519fe328fcb206c1786fbbfeeb87", Tracks = new[] { @@ -1739,8 +1739,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "ee86f608a9276e4bc267b8c66907ada4", - LongMD5 = "f92ebc7cd69e2e060db761eba6582d67", + Md5 = "ee86f608a9276e4bc267b8c66907ada4", + LongMd5 = "f92ebc7cd69e2e060db761eba6582d67", Tracks = new[] { @@ -1759,8 +1759,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "6fbd06e26bbeb49b19434b8630b4711d", - LongMD5 = "68692050b99c94dc61c38c2b315ac8f5", + Md5 = "6fbd06e26bbeb49b19434b8630b4711d", + LongMd5 = "68692050b99c94dc61c38c2b315ac8f5", Tracks = new[] { @@ -1779,8 +1779,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85368, - MD5 = "408ff544e060baa6b67cce490aba1f77", - LongMD5 = "c48e0ec4b399399507e1da52e569db33", + Md5 = "408ff544e060baa6b67cce490aba1f77", + LongMd5 = "c48e0ec4b399399507e1da52e569db33", Tracks = new[] { @@ -1799,8 +1799,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_150_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85368, - MD5 = "79fc10eb1b87a95cc46581a6680fed02", - LongMD5 = "1ba7ebd3904756d07f28c8cca5df3176", + Md5 = "79fc10eb1b87a95cc46581a6680fed02", + LongMd5 = "1ba7ebd3904756d07f28c8cca5df3176", Tracks = new[] { @@ -1819,8 +1819,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85366, - MD5 = "cfd56ea81d9927f3bd84303e2e46f3d0", - LongMD5 = "5906fae5ed3eae8b34d7b1c3768254f3", + Md5 = "cfd56ea81d9927f3bd84303e2e46f3d0", + LongMd5 = "5906fae5ed3eae8b34d7b1c3768254f3", Tracks = new[] { @@ -1839,8 +1839,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85366, - MD5 = "45a74e0240eafd4a25f3719fcb63c423", - LongMD5 = "5d2ebb99b0aaaacd08294f910b95ea25", + Md5 = "45a74e0240eafd4a25f3719fcb63c423", + LongMd5 = "5d2ebb99b0aaaacd08294f910b95ea25", Tracks = new[] { @@ -1859,8 +1859,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "a36f10b5881798f73a60dcabfdbda2e5", - LongMD5 = "cbef2b2fa29347456f2d2c6aadf0a65a", + Md5 = "a36f10b5881798f73a60dcabfdbda2e5", + LongMd5 = "cbef2b2fa29347456f2d2c6aadf0a65a", Tracks = new[] { @@ -1879,8 +1879,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "20484d666fdb7be5cb4783853f1d5e11", - LongMD5 = "3fd901634fca7ec9979b69ae8b242d5c", + Md5 = "20484d666fdb7be5cb4783853f1d5e11", + LongMd5 = "3fd901634fca7ec9979b69ae8b242d5c", Tracks = new[] { @@ -1899,8 +1899,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85370, - MD5 = "477788d0e383b9dbd9bf179c6eae1950", - LongMD5 = "b688819e815a7dea55ab894666d98a36", + Md5 = "477788d0e383b9dbd9bf179c6eae1950", + LongMd5 = "b688819e815a7dea55ab894666d98a36", Tracks = new[] { @@ -1919,8 +1919,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_200_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85370, - MD5 = "884633f3720b20c36c2f56032456ff42", - LongMD5 = "520c0da95e556285f264055309d0643d", + Md5 = "884633f3720b20c36c2f56032456ff42", + LongMd5 = "520c0da95e556285f264055309d0643d", Tracks = new[] { @@ -1939,8 +1939,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85366, - MD5 = "8703cbb59eb1dfb6f7b3748f9e410698", - LongMD5 = "750009655962df0f01d3261ed71e2b06", + Md5 = "8703cbb59eb1dfb6f7b3748f9e410698", + LongMd5 = "750009655962df0f01d3261ed71e2b06", Tracks = new[] { @@ -1959,8 +1959,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85366, - MD5 = "5a8ee84276bdf1b1d0b07b64639892a4", - LongMD5 = "2b89eb05149632731bc07aef7bd85518", + Md5 = "5a8ee84276bdf1b1d0b07b64639892a4", + LongMd5 = "2b89eb05149632731bc07aef7bd85518", Tracks = new[] { @@ -1979,8 +1979,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "b88ca672a6f86f84072a626b62ba9f14", - LongMD5 = "131c8da49d40e850f4e956cc8770445d", + Md5 = "b88ca672a6f86f84072a626b62ba9f14", + LongMd5 = "131c8da49d40e850f4e956cc8770445d", Tracks = new[] { @@ -1999,8 +1999,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 86529, - MD5 = "7b7558a98a0ade5e3d5046eb24983c2b", - LongMD5 = "2d625d5192a506cf2baf91f8b04ff722", + Md5 = "7b7558a98a0ade5e3d5046eb24983c2b", + LongMd5 = "2d625d5192a506cf2baf91f8b04ff722", Tracks = new[] { @@ -2019,8 +2019,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85370, - MD5 = "2b96f44ee072f04cb7477abc23c0ac78", - LongMD5 = "bf7ad9935df332783848f815458e1687", + Md5 = "2b96f44ee072f04cb7477abc23c0ac78", + LongMd5 = "bf7ad9935df332783848f815458e1687", Tracks = new[] { @@ -2039,8 +2039,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode1_joliet_udf_201_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85370, - MD5 = "70ea1fca4e5929514d15be2b16156961", - LongMD5 = "929cff7615d84c900c637067e6bf44e6", + Md5 = "70ea1fca4e5929514d15be2b16156961", + LongMd5 = "929cff7615d84c900c637067e6bf44e6", Tracks = new[] { @@ -2059,8 +2059,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_iso9660-1999_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 82697, - MD5 = "9712faa85483cf520e0efae0bbd53164", - LongMD5 = "c7a5031c12fcac644f20384c8cafe3a8", + Md5 = "9712faa85483cf520e0efae0bbd53164", + LongMd5 = "c7a5031c12fcac644f20384c8cafe3a8", Tracks = new[] { @@ -2079,8 +2079,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_iso9660-1999_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 82697, - MD5 = "9712faa85483cf520e0efae0bbd53164", - LongMD5 = "c7a5031c12fcac644f20384c8cafe3a8", + Md5 = "9712faa85483cf520e0efae0bbd53164", + LongMd5 = "c7a5031c12fcac644f20384c8cafe3a8", Tracks = new[] { @@ -2099,8 +2099,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83082, - MD5 = "2a391c84479c34267439103ca6abf7bf", - LongMD5 = "dd5fd9f1e45acff0c2c9b85f6abb3ab8", + Md5 = "2a391c84479c34267439103ca6abf7bf", + LongMd5 = "dd5fd9f1e45acff0c2c9b85f6abb3ab8", Tracks = new[] { @@ -2119,8 +2119,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 83082, - MD5 = "2a391c84479c34267439103ca6abf7bf", - LongMD5 = "dd5fd9f1e45acff0c2c9b85f6abb3ab8", + Md5 = "2a391c84479c34267439103ca6abf7bf", + LongMd5 = "dd5fd9f1e45acff0c2c9b85f6abb3ab8", Tracks = new[] { @@ -2139,8 +2139,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_102_physical_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85378, - MD5 = "0861eb66287123d470b7945debe8fb12", - LongMD5 = "139d794e62632e4845ab24daff3685f0", + Md5 = "0861eb66287123d470b7945debe8fb12", + LongMd5 = "139d794e62632e4845ab24daff3685f0", Tracks = new[] { @@ -2159,8 +2159,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_102_physical_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85378, - MD5 = "b2b0772bbc6b950bbdbaaac90831c9f2", - LongMD5 = "9cd6841be3c35cd3ea012fbb4f5b313d", + Md5 = "b2b0772bbc6b950bbdbaaac90831c9f2", + LongMd5 = "9cd6841be3c35cd3ea012fbb4f5b313d", Tracks = new[] { @@ -2179,8 +2179,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_physical_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85378, - MD5 = "8329b3663619eca9d424eb1fbc7036b7", - LongMD5 = "451bc347c53260b50c48b101e64e9023", + Md5 = "8329b3663619eca9d424eb1fbc7036b7", + LongMd5 = "451bc347c53260b50c48b101e64e9023", Tracks = new[] { @@ -2199,8 +2199,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_physical_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85378, - MD5 = "055310ad3609d44011081863d617d33f", - LongMD5 = "a9d37132e6b519bb774f603129c1b7dd", + Md5 = "055310ad3609d44011081863d617d33f", + LongMd5 = "a9d37132e6b519bb774f603129c1b7dd", Tracks = new[] { @@ -2219,8 +2219,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_sparing_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "cc9ece6ddcbb456ff5cf197d0f21b785", - LongMD5 = "d0042821851343b7149231e13f60677d", + Md5 = "cc9ece6ddcbb456ff5cf197d0f21b785", + LongMd5 = "d0042821851343b7149231e13f60677d", Tracks = new[] { @@ -2239,8 +2239,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_sparing_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "ae08aedc15e623ed2a035b9813e5360d", - LongMD5 = "260416feefd735fbfa9d428197fc31ce", + Md5 = "ae08aedc15e623ed2a035b9813e5360d", + LongMd5 = "260416feefd735fbfa9d428197fc31ce", Tracks = new[] { @@ -2259,8 +2259,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_virtual_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85382, - MD5 = "23ba6f2deb635e408e7938345aaecd5e", - LongMD5 = "3c3cc0829c0f5b3dc90552cd06f6caca", + Md5 = "23ba6f2deb635e408e7938345aaecd5e", + LongMd5 = "3c3cc0829c0f5b3dc90552cd06f6caca", Tracks = new[] { @@ -2279,8 +2279,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_150_virtual_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85382, - MD5 = "1b7b0d16a910b65173fd777c974e94b6", - LongMD5 = "cb9495de8c27af64b84925b32351ceb2", + Md5 = "1b7b0d16a910b65173fd777c974e94b6", + LongMd5 = "cb9495de8c27af64b84925b32351ceb2", Tracks = new[] { @@ -2299,8 +2299,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_physical_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85380, - MD5 = "7f550c2b0b587275a63ccf13a732bb55", - LongMD5 = "629a18aa832bc0336d7f5eeb69d179c8", + Md5 = "7f550c2b0b587275a63ccf13a732bb55", + LongMd5 = "629a18aa832bc0336d7f5eeb69d179c8", Tracks = new[] { @@ -2319,8 +2319,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_physical_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85380, - MD5 = "119fe576b2a81e0070b48748545ed691", - LongMD5 = "aae875760f7a1e6e41b1b93b71de3b20", + Md5 = "119fe576b2a81e0070b48748545ed691", + LongMd5 = "aae875760f7a1e6e41b1b93b71de3b20", Tracks = new[] { @@ -2339,8 +2339,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_sparing_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "2b4b5af6ac9d988a2dc38dc5b873d574", - LongMD5 = "5c18f49d07d53fd799e74f24d4d53484", + Md5 = "2b4b5af6ac9d988a2dc38dc5b873d574", + LongMd5 = "5c18f49d07d53fd799e74f24d4d53484", Tracks = new[] { @@ -2359,8 +2359,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_sparing_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "0613ae6e1c5b87ae563b3f7f572a8b18", - LongMD5 = "a6169364cb292c245e435eb63cb47057", + Md5 = "0613ae6e1c5b87ae563b3f7f572a8b18", + LongMd5 = "a6169364cb292c245e435eb63cb47057", Tracks = new[] { @@ -2379,8 +2379,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_virtual_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85384, - MD5 = "d45ffe1153db6f5c71596cbd905fc488", - LongMD5 = "a902f86d13d56f2e6f227a52634089d9", + Md5 = "d45ffe1153db6f5c71596cbd905fc488", + LongMd5 = "a902f86d13d56f2e6f227a52634089d9", Tracks = new[] { @@ -2399,8 +2399,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_200_virtual_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85384, - MD5 = "779eecd0085b18b1d9918b41423dd339", - LongMD5 = "d0513c7eee273befeff5ce89f9238560", + Md5 = "779eecd0085b18b1d9918b41423dd339", + LongMd5 = "d0513c7eee273befeff5ce89f9238560", Tracks = new[] { @@ -2419,8 +2419,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_physical_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85380, - MD5 = "4c81ffc4fa384850de42910b35a5aca3", - LongMD5 = "b3a211be5fdae118e301a64de7fcb179", + Md5 = "4c81ffc4fa384850de42910b35a5aca3", + LongMd5 = "b3a211be5fdae118e301a64de7fcb179", Tracks = new[] { @@ -2439,8 +2439,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_physical_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85380, - MD5 = "55785037c6349fa1f7fdd0b908181818", - LongMD5 = "eab4b4988478a929abb00456c79bdd93", + Md5 = "55785037c6349fa1f7fdd0b908181818", + LongMd5 = "eab4b4988478a929abb00456c79bdd93", Tracks = new[] { @@ -2459,8 +2459,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_sparing_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "92ce7748584f7e6ed60c4bd507b4dc0f", - LongMD5 = "685810f81bfdf3726b29c6bfb3fe6240", + Md5 = "92ce7748584f7e6ed60c4bd507b4dc0f", + LongMd5 = "685810f81bfdf3726b29c6bfb3fe6240", Tracks = new[] { @@ -2479,8 +2479,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_sparing_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 86529, - MD5 = "2a546c0c5eabb2bdcf23f30b463bb275", - LongMD5 = "50de9b1be03914910e6c60f7bfa0e077", + Md5 = "2a546c0c5eabb2bdcf23f30b463bb275", + LongMd5 = "50de9b1be03914910e6c60f7bfa0e077", Tracks = new[] { @@ -2499,8 +2499,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_virtual_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85384, - MD5 = "8122aa37899aea7ca6edd5da216ea172", - LongMD5 = "20a452a3389e06af32a79137b005dc66", + Md5 = "8122aa37899aea7ca6edd5da216ea172", + LongMd5 = "20a452a3389e06af32a79137b005dc66", Tracks = new[] { @@ -2519,8 +2519,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_mode2_joliet_udf_201_virtual_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 85384, - MD5 = "92b7c6ba9530389f8189f5ca271dfb25", - LongMD5 = "f7c3a968839604a0317132c76387617c", + Md5 = "92b7c6ba9530389f8189f5ca271dfb25", + LongMd5 = "f7c3a968839604a0317132c76387617c", Tracks = new[] { @@ -2539,8 +2539,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_102_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84616, - MD5 = "d15dc18c94c1800c578dc50130395a3e", - LongMD5 = "e133b2452e7f8a3fb0993e6626b81dbf", + Md5 = "d15dc18c94c1800c578dc50130395a3e", + LongMd5 = "e133b2452e7f8a3fb0993e6626b81dbf", Tracks = new[] { @@ -2559,8 +2559,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_102_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84616, - MD5 = "897d2c63f0e181854191c859d9aa8bd2", - LongMD5 = "00b91fff0f255a541f9e6ce1484f7853", + Md5 = "897d2c63f0e181854191c859d9aa8bd2", + LongMd5 = "00b91fff0f255a541f9e6ce1484f7853", Tracks = new[] { @@ -2579,8 +2579,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84616, - MD5 = "d3dd0903e74a4a714114751fe3071ceb", - LongMD5 = "9764d6dcd88081043d12592ec529739e", + Md5 = "d3dd0903e74a4a714114751fe3071ceb", + LongMd5 = "9764d6dcd88081043d12592ec529739e", Tracks = new[] { @@ -2599,8 +2599,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84616, - MD5 = "076f320539c8171246e4d24a5cf3d533", - LongMD5 = "70a988b0c6c9ecd3ae3b12a18dd4dc0e", + Md5 = "076f320539c8171246e4d24a5cf3d533", + LongMd5 = "70a988b0c6c9ecd3ae3b12a18dd4dc0e", Tracks = new[] { @@ -2619,8 +2619,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "fac65be4def378788d467966e2b795d8", - LongMD5 = "0c221dec63b409a3785d7183b4149176", + Md5 = "fac65be4def378788d467966e2b795d8", + LongMd5 = "0c221dec63b409a3785d7183b4149176", Tracks = new[] { @@ -2639,8 +2639,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "366195d1e5140c0a690d2b256891db60", - LongMD5 = "934e4d7fde8b1ad40c8135e43159e74b", + Md5 = "366195d1e5140c0a690d2b256891db60", + LongMd5 = "934e4d7fde8b1ad40c8135e43159e74b", Tracks = new[] { @@ -2659,8 +2659,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84620, - MD5 = "a40b83ad5ba0de4a1e19426c0bd05934", - LongMD5 = "4b7698c901b19739c5911db97eb1ca55", + Md5 = "a40b83ad5ba0de4a1e19426c0bd05934", + LongMd5 = "4b7698c901b19739c5911db97eb1ca55", Tracks = new[] { @@ -2679,8 +2679,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_150_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84620, - MD5 = "cc0ebb19ee2fa513c7fcdc6c4916536d", - LongMD5 = "7cee40146211ed2bbd50dbe5082bd290", + Md5 = "cc0ebb19ee2fa513c7fcdc6c4916536d", + LongMd5 = "7cee40146211ed2bbd50dbe5082bd290", Tracks = new[] { @@ -2699,8 +2699,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84618, - MD5 = "86d67a9f66ff43f89f5a58b785598b08", - LongMD5 = "1bb6cc5f1db38a4bb4598cd8776d5aaf", + Md5 = "86d67a9f66ff43f89f5a58b785598b08", + LongMd5 = "1bb6cc5f1db38a4bb4598cd8776d5aaf", Tracks = new[] { @@ -2719,8 +2719,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84618, - MD5 = "ca9cee749466053ab344a27a4b5c2e11", - LongMD5 = "3880fae96c3fb170fb4f337985adc5c5", + Md5 = "ca9cee749466053ab344a27a4b5c2e11", + LongMd5 = "3880fae96c3fb170fb4f337985adc5c5", Tracks = new[] { @@ -2739,8 +2739,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "803526863c0ec3f64c2a89cdb7ebce77", - LongMD5 = "5f16344d375502a1082c635f5e27ea4e", + Md5 = "803526863c0ec3f64c2a89cdb7ebce77", + LongMd5 = "5f16344d375502a1082c635f5e27ea4e", Tracks = new[] { @@ -2759,8 +2759,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "00570af53cea4275c7191ba52e65f1bf", - LongMD5 = "2efedcd2a6bfb1658015221ecfba0752", + Md5 = "00570af53cea4275c7191ba52e65f1bf", + LongMd5 = "2efedcd2a6bfb1658015221ecfba0752", Tracks = new[] { @@ -2779,8 +2779,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84622, - MD5 = "b0b56d1663c508e7d0ceb33f3bb5cc78", - LongMD5 = "20a0714daaff2d41798d97f72cd95b3a", + Md5 = "b0b56d1663c508e7d0ceb33f3bb5cc78", + LongMd5 = "20a0714daaff2d41798d97f72cd95b3a", Tracks = new[] { @@ -2799,8 +2799,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_200_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84622, - MD5 = "de4c155829449b40632bb9165dba0839", - LongMD5 = "f12ca7d65ddad197d3075926ad7c3aaf", + Md5 = "de4c155829449b40632bb9165dba0839", + LongMd5 = "f12ca7d65ddad197d3075926ad7c3aaf", Tracks = new[] { @@ -2819,8 +2819,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_physical_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84618, - MD5 = "bd83c27796677aa75f067c474952226e", - LongMD5 = "220904f85af94dff3b899e36c30c6511", + Md5 = "bd83c27796677aa75f067c474952226e", + LongMd5 = "220904f85af94dff3b899e36c30c6511", Tracks = new[] { @@ -2839,8 +2839,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_physical_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84618, - MD5 = "fa86ee2ecaf7a0b9e06b1e0ea3e66a16", - LongMD5 = "e6e3a29fc6642716c1c302c63586f7cb", + Md5 = "fa86ee2ecaf7a0b9e06b1e0ea3e66a16", + LongMd5 = "e6e3a29fc6642716c1c302c63586f7cb", Tracks = new[] { @@ -2859,8 +2859,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_sparing_dao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "7f6b97cd47875e397de275b56a3cfd86", - LongMD5 = "1b50de41d291308c1aa678da06a38978", + Md5 = "7f6b97cd47875e397de275b56a3cfd86", + LongMd5 = "1b50de41d291308c1aa678da06a38978", Tracks = new[] { @@ -2879,8 +2879,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_sparing_tao.nrg", MediaType = MediaType.CDROM, Sectors = 85793, - MD5 = "c3bed9a87c42cafe1f7a1239eaa0fac6", - LongMD5 = "0c5c3ab226f73c3c36636abdb6ac289e", + Md5 = "c3bed9a87c42cafe1f7a1239eaa0fac6", + LongMd5 = "0c5c3ab226f73c3c36636abdb6ac289e", Tracks = new[] { @@ -2899,8 +2899,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_virtual_dao.nrg", MediaType = MediaType.CDROM, Sectors = 84622, - MD5 = "54ba4fe1ac87998dd0cb7dddfea97664", - LongMD5 = "a946851e149714a084ea3d1794964fc5", + Md5 = "54ba4fe1ac87998dd0cb7dddfea97664", + LongMd5 = "a946851e149714a084ea3d1794964fc5", Tracks = new[] { @@ -2919,8 +2919,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_data_udf_201_virtual_tao.nrg", MediaType = MediaType.CDROM, Sectors = 84622, - MD5 = "372d1a672f8ec1310c8665024b35b483", - LongMD5 = "e4e2304b1cccffdac1e781bae228dee4", + Md5 = "372d1a672f8ec1310c8665024b35b483", + LongMd5 = "e4e2304b1cccffdac1e781bae228dee4", Tracks = new[] { @@ -2939,8 +2939,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_enhancedcd_dao.nrg", MediaType = MediaType.CDPLUS, Sectors = 337261, - MD5 = "9f1272614a307e3fac0b3e6ba90098e8", - LongMD5 = "b5d6a75d73752f78a978e51e7f4c4adf", + Md5 = "9f1272614a307e3fac0b3e6ba90098e8", + LongMd5 = "b5d6a75d73752f78a978e51e7f4c4adf", Tracks = new[] { @@ -3047,8 +3047,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_enhancedcd_tao.nrg", MediaType = MediaType.CDPLUS, Sectors = 337261, - MD5 = "7bbe7fd534a37882924c718604c9a6e9", - LongMD5 = "c3053f05e4f371fcceeaf001bd1b235c", + Md5 = "7bbe7fd534a37882924c718604c9a6e9", + LongMd5 = "c3053f05e4f371fcceeaf001bd1b235c", Tracks = new[] { @@ -3155,8 +3155,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_hdburn_full.nrg", MediaType = MediaType.CDROM, Sectors = 727605, - MD5 = "f47418bf60ea47be64e97c17192e2d5f", - LongMD5 = "e7daf8bc5100fd211028cf0f6491d343", + Md5 = "f47418bf60ea47be64e97c17192e2d5f", + LongMd5 = "e7daf8bc5100fd211028cf0f6491d343", Tracks = new[] { @@ -3175,8 +3175,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_hdburn.nrg", MediaType = MediaType.CDROM, Sectors = 31084, - MD5 = "c76c3537f1b3f3c4feecca0e35b4b859", - LongMD5 = "a58449cfb0de9708f2a19d515d9d37f8", + Md5 = "c76c3537f1b3f3c4feecca0e35b4b859", + LongMd5 = "a58449cfb0de9708f2a19d515d9d37f8", Tracks = new[] { @@ -3195,8 +3195,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_mixed_mode_dao.nrg", MediaType = MediaType.CDROMXA, Sectors = 362041, - MD5 = "e50fb58ee954ae5bcec18c09896095a5", - LongMD5 = "1d3da4b1804a0e9aa07d8f7c2f51672b", + Md5 = "e50fb58ee954ae5bcec18c09896095a5", + LongMd5 = "1d3da4b1804a0e9aa07d8f7c2f51672b", Tracks = new[] { new TrackInfoTestExpected @@ -3302,8 +3302,8 @@ public class V2 : OpticalMediaImageTest TestFile = "make_mixed_mode_tao.nrg", MediaType = MediaType.CDROMXA, Sectors = 362041, - MD5 = "c1b14eec8c9bc1177926c8ef5f382cc0", - LongMD5 = "8f62724f4f6bfe8898daca1b39b25eb8", + Md5 = "c1b14eec8c9bc1177926c8ef5f382cc0", + LongMd5 = "8f62724f4f6bfe8898daca1b39b25eb8", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/OpticalMediaImageTest.cs b/Aaru.Tests/Images/OpticalMediaImageTest.cs index d45b8cf1d..52a8b6fd3 100644 --- a/Aaru.Tests/Images/OpticalMediaImageTest.cs +++ b/Aaru.Tests/Images/OpticalMediaImageTest.cs @@ -47,7 +47,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -140,7 +140,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -304,7 +304,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -358,7 +358,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest } } - Assert.AreEqual(@long ? Tests[i].LongMD5 : Tests[i].MD5, ctx.End(), + Assert.AreEqual(@long ? Tests[i].LongMd5 : Tests[i].Md5, ctx.End(), $"{(@long ? "Long hash" : "Hash")}: {testFile}"); } @@ -397,7 +397,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest } } - Assert.AreEqual(Tests[i].SubchannelMD5, ctx.End(), $"Subchannel hash: {testFile}"); + Assert.AreEqual(Tests[i].SubchannelMd5, ctx.End(), $"Subchannel hash: {testFile}"); } else { @@ -425,7 +425,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest ctx.Update(sector); } - Assert.AreEqual(Tests[i].MD5, ctx.End(), $"Hash: {testFile}"); + Assert.AreEqual(Tests[i].Md5, ctx.End(), $"Hash: {testFile}"); } }); }); diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs index 12e66baec..0661744a6 100644 --- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs +++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs @@ -39,7 +39,7 @@ public class Cuesheet : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "PowerISO", "Cuesheet"); - public override IMediaImage _plugin => new CdrWin(); + public override IMediaImage Plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.cue", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "7557c72d4cf6df8bc1896388b863727a", - LongMD5 = "7557c72d4cf6df8bc1896388b863727a", + Md5 = "7557c72d4cf6df8bc1896388b863727a", + LongMd5 = "7557c72d4cf6df8bc1896388b863727a", Tracks = new[] { new TrackInfoTestExpected @@ -235,8 +235,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_audiocd.cue", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c7e38c848cdaf293fc5f62df06bc574d", - LongMD5 = "c7e38c848cdaf293fc5f62df06bc574d", + Md5 = "c7e38c848cdaf293fc5f62df06bc574d", + LongMd5 = "c7e38c848cdaf293fc5f62df06bc574d", Tracks = new[] { new TrackInfoTestExpected @@ -358,8 +358,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrom.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -395,8 +395,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrw.cue", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -592,8 +592,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "b91d0e8e6b486051734134dc009d8c0a", - LongMD5 = "b91d0e8e6b486051734134dc009d8c0a", + Md5 = "b91d0e8e6b486051734134dc009d8c0a", + LongMd5 = "b91d0e8e6b486051734134dc009d8c0a", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/QEMU/HyperV.cs b/Aaru.Tests/Images/QEMU/HyperV.cs index be6e6d0be..48500ebfd 100644 --- a/Aaru.Tests/Images/QEMU/HyperV.cs +++ b/Aaru.Tests/Images/QEMU/HyperV.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class HyperV : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Hyper-V"); - public override IMediaImage _plugin => new Vhdx(); + public override IMediaImage Plugin => new Vhdx(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class HyperV : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/Parallels.cs b/Aaru.Tests/Images/QEMU/Parallels.cs index 7d29d9d3c..33b03f6e6 100644 --- a/Aaru.Tests/Images/QEMU/Parallels.cs +++ b/Aaru.Tests/Images/QEMU/Parallels.cs @@ -38,7 +38,7 @@ public class Parallels : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Parallels"); - public override IMediaImage _plugin => new DiscImages.Parallels(); + public override IMediaImage Plugin => new DiscImages.Parallels(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Parallels : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/QCOW.cs b/Aaru.Tests/Images/QEMU/QCOW.cs index 404826ec1..3bf3a4f3c 100644 --- a/Aaru.Tests/Images/QEMU/QCOW.cs +++ b/Aaru.Tests/Images/QEMU/QCOW.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.QEMU; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class QCOW : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write"); - public override IMediaImage _plugin => new Qcow(); + public override IMediaImage Plugin => new Qcow(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class QCOW : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/QCOW2.cs b/Aaru.Tests/Images/QEMU/QCOW2.cs index 2f1f65bfc..154ede509 100644 --- a/Aaru.Tests/Images/QEMU/QCOW2.cs +++ b/Aaru.Tests/Images/QEMU/QCOW2.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.QEMU; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class QCOW2 : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Qcow2(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class QCOW2 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class QCOW2 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/QCOW3.cs b/Aaru.Tests/Images/QEMU/QCOW3.cs index ae4736b7d..1b34143c8 100644 --- a/Aaru.Tests/Images/QEMU/QCOW3.cs +++ b/Aaru.Tests/Images/QEMU/QCOW3.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.QEMU; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class QCOW3 : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new Qcow2(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class QCOW3 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +67,7 @@ public class QCOW3 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/QED.cs b/Aaru.Tests/Images/QEMU/QED.cs index e02c15f30..6e00dc119 100644 --- a/Aaru.Tests/Images/QEMU/QED.cs +++ b/Aaru.Tests/Images/QEMU/QED.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.QEMU; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class QED : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Enhanced Disk"); - public override IMediaImage _plugin => new Qed(); + public override IMediaImage Plugin => new Qed(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class QED : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/Raw.cs b/Aaru.Tests/Images/QEMU/Raw.cs index 68bc5c7b7..66a303ea3 100644 --- a/Aaru.Tests/Images/QEMU/Raw.cs +++ b/Aaru.Tests/Images/QEMU/Raw.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/VMware5.cs b/Aaru.Tests/Images/QEMU/VMware5.cs index dde6d7adf..4e70aa90e 100644 --- a/Aaru.Tests/Images/QEMU/VMware5.cs +++ b/Aaru.Tests/Images/QEMU/VMware5.cs @@ -39,7 +39,7 @@ public class VMware5 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 5"); - public override IMediaImage _plugin => new VMware(); + public override IMediaImage Plugin => new VMware(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class VMware5 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "1ad282643cc7f97c57dc874b3d4ece9b", + Md5 = "1ad282643cc7f97c57dc874b3d4ece9b", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/VMware6.cs b/Aaru.Tests/Images/QEMU/VMware6.cs index 20a5dff0e..44fd127d8 100644 --- a/Aaru.Tests/Images/QEMU/VMware6.cs +++ b/Aaru.Tests/Images/QEMU/VMware6.cs @@ -39,7 +39,7 @@ public class VMware6 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 6"); - public override IMediaImage _plugin => new VMware(); + public override IMediaImage Plugin => new VMware(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class VMware6 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "1ad282643cc7f97c57dc874b3d4ece9b", + Md5 = "1ad282643cc7f97c57dc874b3d4ece9b", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/VirtualBox.cs b/Aaru.Tests/Images/QEMU/VirtualBox.cs index a81f520a0..1abee654d 100644 --- a/Aaru.Tests/Images/QEMU/VirtualBox.cs +++ b/Aaru.Tests/Images/QEMU/VirtualBox.cs @@ -39,7 +39,7 @@ public class VirtualBox : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualBox"); - public override IMediaImage _plugin => new Vdi(); + public override IMediaImage Plugin => new Vdi(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class VirtualBox : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 251904, SectorSize = 512, - MD5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", + Md5 = "4bfc9e9e2dd86aa52ef709e77d2617ed", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs index 2f0df6df8..ccdb62357 100644 --- a/Aaru.Tests/Images/QEMU/VirtualPC.cs +++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs @@ -39,7 +39,7 @@ public class VirtualPC : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualPC"); - public override IMediaImage _plugin => new Vhd(); + public override IMediaImage Plugin => new Vhd(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class VirtualPC : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 512064, SectorSize = 512, - MD5 = "26d2745c1d614207b4bce4ee003c326d", + Md5 = "26d2745c1d614207b4bce4ee003c326d", Partitions = new[] { new BlockPartitionVolumes @@ -65,7 +65,7 @@ public class VirtualPC : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20536, SectorSize = 512, - MD5 = "adfad4fb019f157e868baa39e7753db7", + Md5 = "adfad4fb019f157e868baa39e7753db7", Partitions = new[] { new BlockPartitionVolumes @@ -81,7 +81,7 @@ public class VirtualPC : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 251940, SectorSize = 512, - MD5 = "7126d647c1cefc5a81b4140e10f50269", + Md5 = "7126d647c1cefc5a81b4140e10f50269", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/RayDIM.cs b/Aaru.Tests/Images/RayDIM.cs index a7f6036e3..449e27009 100644 --- a/Aaru.Tests/Images/RayDIM.cs +++ b/Aaru.Tests/Images/RayDIM.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class RayDIM : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Disk IMage Archiver"); - public override IMediaImage _plugin => new RayDim(); + public override IMediaImage Plugin => new RayDim(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 336, SectorSize = 512, - MD5 = "c109e802e65365245dedd1737ec65c92" + Md5 = "c109e802e65365245dedd1737ec65c92" }, new BlockImageTestExpected { @@ -57,7 +59,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 336, SectorSize = 512, - MD5 = "d6eb723ac53eb469f64d8df69efef3dd", + Md5 = "d6eb723ac53eb469f64d8df69efef3dd", Partitions = new[] { new BlockPartitionVolumes @@ -73,7 +75,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 378, SectorSize = 512, - MD5 = "a327c34060570e1a917eb1d88716a11a" + Md5 = "a327c34060570e1a917eb1d88716a11a" }, new BlockImageTestExpected { @@ -81,7 +83,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 378, SectorSize = 512, - MD5 = "b9807f1c25bf472633e7e80fa947a4d1", + Md5 = "b9807f1c25bf472633e7e80fa947a4d1", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 672, SectorSize = 512, - MD5 = "8b9e6662ef25a08d167f7ec4436efac8" + Md5 = "8b9e6662ef25a08d167f7ec4436efac8" }, new BlockImageTestExpected { @@ -105,7 +107,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 672, SectorSize = 512, - MD5 = "532694cde41f1553587b65c528bc185b", + Md5 = "532694cde41f1553587b65c528bc185b", Partitions = new[] { new BlockPartitionVolumes @@ -121,7 +123,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 756, SectorSize = 512, - MD5 = "a0b2aa16acaab9f521dff74ba93485ae" + Md5 = "a0b2aa16acaab9f521dff74ba93485ae" }, new BlockImageTestExpected { @@ -129,7 +131,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 756, SectorSize = 512, - MD5 = "934e3a0f07410d0f4750f2beb3ce48f1", + Md5 = "934e3a0f07410d0f4750f2beb3ce48f1", Partitions = new[] { new BlockPartitionVolumes @@ -145,7 +147,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "78819708381987b3120fc777a5f08f2d" + Md5 = "78819708381987b3120fc777a5f08f2d" }, new BlockImageTestExpected { @@ -153,7 +155,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "37dbeabaf72384870284ccd102b85eb7", + Md5 = "37dbeabaf72384870284ccd102b85eb7", Partitions = new[] { new BlockPartitionVolumes @@ -169,7 +171,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "e8bbbd22db87181974e12ba0227ea011" + Md5 = "e8bbbd22db87181974e12ba0227ea011" }, new BlockImageTestExpected { @@ -177,7 +179,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "9f5635f3df4d880a500910b0ad1ab535" + Md5 = "9f5635f3df4d880a500910b0ad1ab535" }, new BlockImageTestExpected { @@ -185,7 +187,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "95ea232f59e44db374b994cfe7f1c07f", + Md5 = "95ea232f59e44db374b994cfe7f1c07f", Partitions = new[] { new BlockPartitionVolumes @@ -201,7 +203,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9e2b01f4397db2a6c76e2bc267df37b3" + Md5 = "9e2b01f4397db2a6c76e2bc267df37b3" }, new BlockImageTestExpected { @@ -209,7 +211,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "656002e6e620cb3b73c27f4c21d32edb" + Md5 = "656002e6e620cb3b73c27f4c21d32edb" }, new BlockImageTestExpected { @@ -217,7 +219,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1244cc2c101c66e6bb4ad5183b356b19" + Md5 = "1244cc2c101c66e6bb4ad5183b356b19" }, new BlockImageTestExpected { @@ -225,7 +227,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8cad624afc06ab756f9800eba22ee886" + Md5 = "8cad624afc06ab756f9800eba22ee886" }, new BlockImageTestExpected { @@ -233,7 +235,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "84cce7b4d8c8e21040163cd2d03a730c" + Md5 = "84cce7b4d8c8e21040163cd2d03a730c" }, new BlockImageTestExpected { @@ -241,7 +243,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d236783dfd1dc29f350c51949b1e9e68" + Md5 = "d236783dfd1dc29f350c51949b1e9e68" }, new BlockImageTestExpected { @@ -249,7 +251,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "6915f208cdda762eea2fe64ad754e72f" + Md5 = "6915f208cdda762eea2fe64ad754e72f" }, new BlockImageTestExpected { @@ -257,7 +259,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2302991363cb3681cffdc4388915b51e", + Md5 = "2302991363cb3681cffdc4388915b51e", Partitions = new[] { new BlockPartitionVolumes @@ -273,7 +275,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "4e4cafed1cc22ea72201169427e5e1b6" + Md5 = "4e4cafed1cc22ea72201169427e5e1b6" }, new BlockImageTestExpected { @@ -281,7 +283,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1a4c7487382c98b7bc74623ddfb488e6" + Md5 = "1a4c7487382c98b7bc74623ddfb488e6" }, new BlockImageTestExpected { @@ -289,7 +291,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "af83d011608042d35021e39aa5e10b2f", + Md5 = "af83d011608042d35021e39aa5e10b2f", Partitions = new[] { new BlockPartitionVolumes @@ -305,7 +307,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6642c1a32d2c58e93481d664974fc202", + Md5 = "6642c1a32d2c58e93481d664974fc202", Partitions = new[] { new BlockPartitionVolumes @@ -321,7 +323,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "846f01b8b60cb3c775bd66419e977926", + Md5 = "846f01b8b60cb3c775bd66419e977926", Partitions = new[] { new BlockPartitionVolumes @@ -337,7 +339,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "5101f89850dc28efbcfb7622086a9ddf", + Md5 = "5101f89850dc28efbcfb7622086a9ddf", Partitions = new[] { new BlockPartitionVolumes @@ -353,7 +355,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "8e570be2ed1f00ddea82e50a2d9c446a", + Md5 = "8e570be2ed1f00ddea82e50a2d9c446a", Partitions = new[] { new BlockPartitionVolumes @@ -369,7 +371,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "abba2a1ddd60a649047a9c44d94bbeae", + Md5 = "abba2a1ddd60a649047a9c44d94bbeae", Partitions = new[] { new BlockPartitionVolumes @@ -385,7 +387,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e3bc48bec81be5b35be73d41fdffd2ab", + Md5 = "e3bc48bec81be5b35be73d41fdffd2ab", Partitions = new[] { new BlockPartitionVolumes @@ -401,7 +403,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "43b5068af9d016d1432eb2e12d2b802a", + Md5 = "43b5068af9d016d1432eb2e12d2b802a", Partitions = new[] { new BlockPartitionVolumes @@ -417,7 +419,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5bf2ad4dc300592604b6e32f8b8e2656", + Md5 = "5bf2ad4dc300592604b6e32f8b8e2656", Partitions = new[] { new BlockPartitionVolumes @@ -433,7 +435,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", + Md5 = "cb9a832ca6a4097b8ccc30d2108e1f7d", Partitions = new[] { new BlockPartitionVolumes @@ -449,7 +451,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "56d181a6bb8713e6b2854fe8887faab6", + Md5 = "56d181a6bb8713e6b2854fe8887faab6", Partitions = new[] { new BlockPartitionVolumes @@ -465,7 +467,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "41aef7cff26aefda1add8d49c5b962c2", + Md5 = "41aef7cff26aefda1add8d49c5b962c2", Partitions = new[] { new BlockPartitionVolumes @@ -481,7 +483,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "2437c5f089f1cba3866b36360b016f16", + Md5 = "2437c5f089f1cba3866b36360b016f16", Partitions = new[] { new BlockPartitionVolumes @@ -497,7 +499,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_8, Sectors = 1280, SectorSize = 512, - MD5 = "bdaa8f17373b265830fdf3a06b794367", + Md5 = "bdaa8f17373b265830fdf3a06b794367", Partitions = new[] { new BlockPartitionVolumes @@ -513,7 +515,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "629932c285478d0540ff7936aa008351", + Md5 = "629932c285478d0540ff7936aa008351", Partitions = new[] { new BlockPartitionVolumes @@ -529,7 +531,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "7a2abef5d4701e2e49abb05af8d4da50", + Md5 = "7a2abef5d4701e2e49abb05af8d4da50", Partitions = new[] { new BlockPartitionVolumes @@ -545,7 +547,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "e3507522c914264f44fb2c92c3170c09", + Md5 = "e3507522c914264f44fb2c92c3170c09", Partitions = new[] { new BlockPartitionVolumes @@ -561,7 +563,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "824fe65dbb1a42b6b94f05405ef984f2", + Md5 = "824fe65dbb1a42b6b94f05405ef984f2", Partitions = new[] { new BlockPartitionVolumes @@ -577,7 +579,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", + Md5 = "1a8c2e78e7132cf9ba5d6c2b75876be0", Partitions = new[] { new BlockPartitionVolumes @@ -593,7 +595,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "936b20bb0966fe693b4d5e2353e24846", + Md5 = "936b20bb0966fe693b4d5e2353e24846", Partitions = new[] { new BlockPartitionVolumes @@ -609,7 +611,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "803b01a0b440c2837d37c21308f30cd5", + Md5 = "803b01a0b440c2837d37c21308f30cd5", Partitions = new[] { new BlockPartitionVolumes @@ -625,7 +627,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "aa0d31f914760cc4cde75479779ebed6", + Md5 = "aa0d31f914760cc4cde75479779ebed6", Partitions = new[] { new BlockPartitionVolumes @@ -641,7 +643,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "31269ed6464302ae26d22b7c87bceb23", + Md5 = "31269ed6464302ae26d22b7c87bceb23", Partitions = new[] { new BlockPartitionVolumes @@ -657,7 +659,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "5e413433c54f48978d281c6e66d1106e", + Md5 = "5e413433c54f48978d281c6e66d1106e", Partitions = new[] { new BlockPartitionVolumes @@ -673,7 +675,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "a7688d6be942272ce866736e6007bc46", + Md5 = "a7688d6be942272ce866736e6007bc46", Partitions = new[] { new BlockPartitionVolumes @@ -689,7 +691,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "24a7459d080cea3a60d131b8fd7dc5d1", + Md5 = "24a7459d080cea3a60d131b8fd7dc5d1", Partitions = new[] { new BlockPartitionVolumes @@ -705,7 +707,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3612, SectorSize = 512, - MD5 = "ef0c3da4749da2f79d7d623d9b6f3d4d", + Md5 = "ef0c3da4749da2f79d7d623d9b6f3d4d", Partitions = new[] { new BlockPartitionVolumes @@ -721,7 +723,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5120, SectorSize = 512, - MD5 = "5231d2e8a99ba5f8dfd16ca1a05f40cd", + Md5 = "5231d2e8a99ba5f8dfd16ca1a05f40cd", Partitions = new[] { new BlockPartitionVolumes @@ -737,7 +739,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "8f91482c56161ecbf5d86f42b03b9636", + Md5 = "8f91482c56161ecbf5d86f42b03b9636", Partitions = new[] { new BlockPartitionVolumes @@ -753,7 +755,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5fc19ca552b6db957061e9a1750394d2", + Md5 = "5fc19ca552b6db957061e9a1750394d2", Partitions = new[] { new BlockPartitionVolumes @@ -769,7 +771,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "a33b46f042b78fe3d0b3c5dbb3908a93", + Md5 = "a33b46f042b78fe3d0b3c5dbb3908a93", Partitions = new[] { new BlockPartitionVolumes @@ -785,7 +787,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "565d3c001cbb532154aa5d3c65b2439c", + Md5 = "565d3c001cbb532154aa5d3c65b2439c", Partitions = new[] { new BlockPartitionVolumes @@ -801,7 +803,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "e60442c3ebd72c99bdd7545fdba59613", + Md5 = "e60442c3ebd72c99bdd7545fdba59613", Partitions = new[] { new BlockPartitionVolumes @@ -817,7 +819,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "058a33a129539285c9b64010496af52f", + Md5 = "058a33a129539285c9b64010496af52f", Partitions = new[] { new BlockPartitionVolumes @@ -833,7 +835,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0726ecbc38965d30a6222c3e74cd1aa3", + Md5 = "0726ecbc38965d30a6222c3e74cd1aa3", Partitions = new[] { new BlockPartitionVolumes @@ -849,7 +851,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "c9a193837db7d8a5eb025eb41e8a76d7" + Md5 = "c9a193837db7d8a5eb025eb41e8a76d7" }, new BlockImageTestExpected { @@ -857,7 +859,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c38d69ac88520f14fcc6d6ced22b065d", + Md5 = "c38d69ac88520f14fcc6d6ced22b065d", Partitions = new[] { new BlockPartitionVolumes @@ -873,7 +875,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "91d51964e1e64ef3f6f622fa19aa833c", + Md5 = "91d51964e1e64ef3f6f622fa19aa833c", Partitions = new[] { new BlockPartitionVolumes @@ -889,7 +891,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "db36d9651c952ff679ec33223c8db2d3", + Md5 = "db36d9651c952ff679ec33223c8db2d3", Partitions = new[] { new BlockPartitionVolumes @@ -905,7 +907,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3024, SectorSize = 512, - MD5 = "952f33314fb930c2d02ef4604585c0e6", + Md5 = "952f33314fb930c2d02ef4604585c0e6", Partitions = new[] { new BlockPartitionVolumes @@ -921,7 +923,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1207a1cc7ff73d4f74c8984b4e7db33f", + Md5 = "1207a1cc7ff73d4f74c8984b4e7db33f", Partitions = new[] { new BlockPartitionVolumes @@ -937,7 +939,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "53dfcaceed8203ee629fc7fe520e1217", + Md5 = "53dfcaceed8203ee629fc7fe520e1217", Partitions = new[] { new BlockPartitionVolumes @@ -953,7 +955,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", + Md5 = "d40a99cb549fcfb26fcf9ef01b5dfca7", Partitions = new[] { new BlockPartitionVolumes @@ -969,7 +971,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 420, SectorSize = 512, - MD5 = "6433f8fbf8dda1e307b15a4203c1a4e6", + Md5 = "6433f8fbf8dda1e307b15a4203c1a4e6", Partitions = new[] { new BlockPartitionVolumes @@ -985,7 +987,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "126dfd25363c076727dfaab03955c931", + Md5 = "126dfd25363c076727dfaab03955c931", Partitions = new[] { new BlockPartitionVolumes @@ -1001,7 +1003,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "386763ae9afde1a0a19eb4a54ba462aa", + Md5 = "386763ae9afde1a0a19eb4a54ba462aa", Partitions = new[] { new BlockPartitionVolumes @@ -1017,7 +1019,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1033,7 +1035,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1049,7 +1051,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "f01541de322c8d6d7321084d7a245e7b", + Md5 = "f01541de322c8d6d7321084d7a245e7b", Partitions = new[] { new BlockPartitionVolumes @@ -1065,7 +1067,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1081,7 +1083,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "7973e569ed93beb1ece2e84a5ef3a8d1", + Md5 = "7973e569ed93beb1ece2e84a5ef3a8d1", Partitions = new[] { new BlockPartitionVolumes @@ -1097,7 +1099,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a793047503af08e83361427b3e2806e0", + Md5 = "a793047503af08e83361427b3e2806e0", Partitions = new[] { new BlockPartitionVolumes @@ -1113,7 +1115,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", + Md5 = "ba6ec1652ff41bcc687aaf9c4e32dc18", Partitions = new[] { new BlockPartitionVolumes @@ -1129,7 +1131,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "6631b66fdfd89319323771c41334c7ba", + Md5 = "6631b66fdfd89319323771c41334c7ba", Partitions = new[] { new BlockPartitionVolumes @@ -1145,7 +1147,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "56471a253f4d6803b634e2bbff6c0931", + Md5 = "56471a253f4d6803b634e2bbff6c0931", Partitions = new[] { new BlockPartitionVolumes @@ -1161,7 +1163,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "7d36aee5a3071ff75b979f3acb649c40", + Md5 = "7d36aee5a3071ff75b979f3acb649c40", Partitions = new[] { new BlockPartitionVolumes @@ -1177,7 +1179,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "0ccb62039363ab544c69eca229a17fae", + Md5 = "0ccb62039363ab544c69eca229a17fae", Partitions = new[] { new BlockPartitionVolumes @@ -1193,7 +1195,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "7851d31fad9302ff45d3ded4fba25387", + Md5 = "7851d31fad9302ff45d3ded4fba25387", Partitions = new[] { new BlockPartitionVolumes @@ -1209,7 +1211,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "915b08c82591e8488320e001b7303b6d", + Md5 = "915b08c82591e8488320e001b7303b6d", Partitions = new[] { new BlockPartitionVolumes @@ -1225,7 +1227,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "5e5ea6fe9adf842221fdc60e56630405", + Md5 = "5e5ea6fe9adf842221fdc60e56630405", Partitions = new[] { new BlockPartitionVolumes @@ -1241,7 +1243,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a22e254f7e3526ec30dc4915a19fcb52", + Md5 = "a22e254f7e3526ec30dc4915a19fcb52", Partitions = new[] { new BlockPartitionVolumes @@ -1257,7 +1259,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ddc6c1200c60e9f7796280f50c2e5283", + Md5 = "ddc6c1200c60e9f7796280f50c2e5283", Partitions = new[] { new BlockPartitionVolumes @@ -1273,7 +1275,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6efa72a33021d5051546c3e0dd4c3c09" + Md5 = "6efa72a33021d5051546c3e0dd4c3c09" }, new BlockImageTestExpected { @@ -1281,7 +1283,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "8b5acfd14818ff9556d3d81361ce4862" + Md5 = "8b5acfd14818ff9556d3d81361ce4862" }, new BlockImageTestExpected { @@ -1289,7 +1291,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "298c377de52947c472a85d281b6d3d4d" + Md5 = "298c377de52947c472a85d281b6d3d4d" }, new BlockImageTestExpected { @@ -1297,7 +1299,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "32975e1a2d10a360331de84682371277" + Md5 = "32975e1a2d10a360331de84682371277" }, new BlockImageTestExpected { @@ -1305,7 +1307,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "a5dc382d75ec46434b313e289c281d8c" + Md5 = "a5dc382d75ec46434b313e289c281d8c" }, new BlockImageTestExpected { @@ -1313,7 +1315,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "3a7f25fa38019109e89051993076063a" + Md5 = "3a7f25fa38019109e89051993076063a" }, new BlockImageTestExpected { @@ -1321,7 +1323,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "e63014a4299f52f22e6e2c9609f51979" + Md5 = "e63014a4299f52f22e6e2c9609f51979" }, new BlockImageTestExpected { @@ -1329,7 +1331,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "be05d1ff10ef8b2220546c4db962ac9e", + Md5 = "be05d1ff10ef8b2220546c4db962ac9e", Partitions = new[] { new BlockPartitionVolumes @@ -1345,7 +1347,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "e01d813dd6c3a49428520df40d63cadd", + Md5 = "e01d813dd6c3a49428520df40d63cadd", Partitions = new[] { new BlockPartitionVolumes @@ -1361,7 +1363,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c8b03a8550ed3e70e1c78316aa445aa", + Md5 = "1c8b03a8550ed3e70e1c78316aa445aa", Partitions = new[] { new BlockPartitionVolumes @@ -1377,7 +1379,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "0bdf9130c07bb5d558a4705249f949d0", + Md5 = "0bdf9130c07bb5d558a4705249f949d0", Partitions = new[] { new BlockPartitionVolumes @@ -1393,7 +1395,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", + Md5 = "2dafeddaa99e7dc0db5ef69e128f9c8e", Partitions = new[] { new BlockPartitionVolumes @@ -1409,7 +1411,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "0c043ceba489ef80c1b7f58534af12f5" + Md5 = "0c043ceba489ef80c1b7f58534af12f5" }, new BlockImageTestExpected { @@ -1417,7 +1419,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_SS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "028769dc0abefab1740cc309432588b6", + Md5 = "028769dc0abefab1740cc309432588b6", Partitions = new[] { new BlockPartitionVolumes @@ -1433,7 +1435,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "152023525154b45ab26687190bac94db", + Md5 = "152023525154b45ab26687190bac94db", Partitions = new[] { new BlockPartitionVolumes @@ -1449,7 +1451,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "db38ecd93f28dd065927fed21917eed5", + Md5 = "db38ecd93f28dd065927fed21917eed5", Partitions = new[] { new BlockPartitionVolumes @@ -1465,7 +1467,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "ca53f9cc4dcd04d06f5c4c3df09195ab" + Md5 = "ca53f9cc4dcd04d06f5c4c3df09195ab" }, new BlockImageTestExpected { @@ -1473,7 +1475,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "fde94075cb3fd1c52af32062b0251af0" + Md5 = "fde94075cb3fd1c52af32062b0251af0" }, new BlockImageTestExpected { @@ -1481,7 +1483,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "f206c0caa4e0eda37233ab6e89ab5493", + Md5 = "f206c0caa4e0eda37233ab6e89ab5493", Partitions = new[] { new BlockPartitionVolumes @@ -1497,7 +1499,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "4375fe3d7e50a5044b4850d8542363fb", + Md5 = "4375fe3d7e50a5044b4850d8542363fb", Partitions = new[] { new BlockPartitionVolumes @@ -1513,7 +1515,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1512, SectorSize = 512, - MD5 = "d3106f2c989a0afcf97b63b051be8312" + Md5 = "d3106f2c989a0afcf97b63b051be8312" }, new BlockImageTestExpected { @@ -1521,7 +1523,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "8245ddd644583bd78ac0638133c89824" + Md5 = "8245ddd644583bd78ac0638133c89824" }, new BlockImageTestExpected { @@ -1529,7 +1531,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "33c51a3d6f13cfedb5f08bf4c3cba7b9" + Md5 = "33c51a3d6f13cfedb5f08bf4c3cba7b9" }, new BlockImageTestExpected { @@ -1537,7 +1539,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1545,7 +1547,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1553,7 +1555,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "647f14749f59be471aac04a71a079a64" + Md5 = "647f14749f59be471aac04a71a079a64" }, new BlockImageTestExpected { @@ -1561,7 +1563,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "517cdd5e42a4673f733d1aedfb46770f" + Md5 = "517cdd5e42a4673f733d1aedfb46770f" }, new BlockImageTestExpected { @@ -1569,7 +1571,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "40199611e6e75bbc37ad6c52a5b77eae" + Md5 = "40199611e6e75bbc37ad6c52a5b77eae" }, new BlockImageTestExpected { @@ -1577,7 +1579,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5080, SectorSize = 512, - MD5 = "fabacd63bd25f4c3db71523c21242bfb" + Md5 = "fabacd63bd25f4c3db71523c21242bfb" }, new BlockImageTestExpected { @@ -1585,7 +1587,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 9144, SectorSize = 512, - MD5 = "0d1a1dfa4482422ff11fea76f8cef3a9" + Md5 = "0d1a1dfa4482422ff11fea76f8cef3a9" }, new BlockImageTestExpected { @@ -1593,7 +1595,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 13716, SectorSize = 512, - MD5 = "a6a67106457a20b46d05f2d9b27244f1" + Md5 = "a6a67106457a20b46d05f2d9b27244f1" }, new BlockImageTestExpected { @@ -1601,7 +1603,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "85574aebeef03eb355bf8541955d06ea" + Md5 = "85574aebeef03eb355bf8541955d06ea" }, new BlockImageTestExpected { @@ -1609,7 +1611,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 630, SectorSize = 512, - MD5 = "53a50481d90228f527b72f058de257da", + Md5 = "53a50481d90228f527b72f058de257da", Partitions = new[] { new BlockPartitionVolumes @@ -1625,7 +1627,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "0d71b4952dadbfb1061acc1f4640c787" + Md5 = "0d71b4952dadbfb1061acc1f4640c787" }, new BlockImageTestExpected { @@ -1633,7 +1635,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" + Md5 = "af7ac6b5b9d2d57dad22dbb64ef7de38" }, new BlockImageTestExpected { @@ -1641,7 +1643,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "5ac0a9fc7337f761098f816359b0f6f7", + Md5 = "5ac0a9fc7337f761098f816359b0f6f7", Partitions = new[] { new BlockPartitionVolumes @@ -1657,7 +1659,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "1ea6ec8e663218b1372048f6e25795b5", + Md5 = "1ea6ec8e663218b1372048f6e25795b5", Partitions = new[] { new BlockPartitionVolumes @@ -1673,7 +1675,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "77a1167b1b9043496e32b8578cde0ff0", + Md5 = "77a1167b1b9043496e32b8578cde0ff0", Partitions = new[] { new BlockPartitionVolumes @@ -1689,7 +1691,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1680, SectorSize = 512, - MD5 = "2b2c891ef5edee8518a1ae2ed3ab71a0", + Md5 = "2b2c891ef5edee8518a1ae2ed3ab71a0", Partitions = new[] { new BlockPartitionVolumes @@ -1705,7 +1707,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "32c044c5c2b0bd13806149a759c14935", + Md5 = "32c044c5c2b0bd13806149a759c14935", Partitions = new[] { new BlockPartitionVolumes @@ -1721,7 +1723,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "8752095abc13dba3f3467669da333891", + Md5 = "8752095abc13dba3f3467669da333891", Partitions = new[] { new BlockPartitionVolumes @@ -1737,7 +1739,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "aece7cd34bbba3e75307fa70404d9d30", + Md5 = "aece7cd34bbba3e75307fa70404d9d30", Partitions = new[] { new BlockPartitionVolumes @@ -1753,7 +1755,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3280, SectorSize = 512, - MD5 = "5289afb16a6e4a33213e3bcca56c6230", + Md5 = "5289afb16a6e4a33213e3bcca56c6230", Partitions = new[] { new BlockPartitionVolumes @@ -1769,7 +1771,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3360, SectorSize = 512, - MD5 = "092308e5df684702dd0ec393b6d3563a", + Md5 = "092308e5df684702dd0ec393b6d3563a", Partitions = new[] { new BlockPartitionVolumes @@ -1785,7 +1787,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b96596711f4d2ee85dfda0fe3b9f26c3", + Md5 = "b96596711f4d2ee85dfda0fe3b9f26c3", Partitions = new[] { new BlockPartitionVolumes @@ -1801,7 +1803,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a4f461af7fda5e93a7ab63fcbb7e7683", + Md5 = "a4f461af7fda5e93a7ab63fcbb7e7683", Partitions = new[] { new BlockPartitionVolumes @@ -1817,7 +1819,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "963f3aa8d4468d4373054f842d0e2245", + Md5 = "963f3aa8d4468d4373054f842d0e2245", Partitions = new[] { new BlockPartitionVolumes @@ -1833,7 +1835,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", + Md5 = "4feeaf4b4ee5dad85db727fbbda4b6d1", Partitions = new[] { new BlockPartitionVolumes @@ -1849,7 +1851,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "3c77ca681df78e4cd7baa162aa9b0859", + Md5 = "3c77ca681df78e4cd7baa162aa9b0859", Partitions = new[] { new BlockPartitionVolumes @@ -1865,7 +1867,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "51da1f86c49657ffdb367bb2ddeb7990", + Md5 = "51da1f86c49657ffdb367bb2ddeb7990", Partitions = new[] { new BlockPartitionVolumes @@ -1881,7 +1883,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "b81a4987f89936630b8ebc62e4bbce6e" + Md5 = "b81a4987f89936630b8ebc62e4bbce6e" /* TODO: IndexOutOfRangeException Partitions = new[] { @@ -1899,7 +1901,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "f76f92dd326c99c5efad5ee58daf72e1", + Md5 = "f76f92dd326c99c5efad5ee58daf72e1", Partitions = new[] { new BlockPartitionVolumes @@ -1915,7 +1917,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "b6f2c10e42908e334025bc4ffd81e771", + Md5 = "b6f2c10e42908e334025bc4ffd81e771", Partitions = new[] { new BlockPartitionVolumes @@ -1931,7 +1933,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "f2f409ea2a62a7866fd2777cc4fc9739", + Md5 = "f2f409ea2a62a7866fd2777cc4fc9739", Partitions = new[] { new BlockPartitionVolumes @@ -1947,7 +1949,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1512, SectorSize = 512, - MD5 = "be89d2aab865a1217a3dda86e99bed97", + Md5 = "be89d2aab865a1217a3dda86e99bed97", Partitions = new[] { new BlockPartitionVolumes @@ -1963,7 +1965,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "30a93f30dd4485c6fc037fe0775d3fc7", + Md5 = "30a93f30dd4485c6fc037fe0775d3fc7", Partitions = new[] { new BlockPartitionVolumes @@ -1979,7 +1981,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "e0caf02cce5597c98313bcc480366ec7", + Md5 = "e0caf02cce5597c98313bcc480366ec7", Partitions = new[] { new BlockPartitionVolumes @@ -1995,7 +1997,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "39bf5a98bcb2185d855ac06378febcfa", + Md5 = "39bf5a98bcb2185d855ac06378febcfa", Partitions = new[] { new BlockPartitionVolumes @@ -2011,7 +2013,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "dc20055b6e6fd6f8e1114d4be2effeed", + Md5 = "dc20055b6e6fd6f8e1114d4be2effeed", Partitions = new[] { new BlockPartitionVolumes @@ -2027,7 +2029,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "56af9256cf71d5aac5fd5d363674bc49", + Md5 = "56af9256cf71d5aac5fd5d363674bc49", Partitions = new[] { new BlockPartitionVolumes @@ -2043,7 +2045,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "bbba1e2d1418e05c3a4e7b4d585d160b", + Md5 = "bbba1e2d1418e05c3a4e7b4d585d160b", Partitions = new[] { new BlockPartitionVolumes @@ -2059,7 +2061,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "bca3a045e81617f7f5ebb5a8818eac47", + Md5 = "bca3a045e81617f7f5ebb5a8818eac47", Partitions = new[] { new BlockPartitionVolumes @@ -2075,7 +2077,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "a296663cb8e75e94603221352f29cfff", + Md5 = "a296663cb8e75e94603221352f29cfff", Partitions = new[] { new BlockPartitionVolumes @@ -2091,7 +2093,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ecda36ebf0e1100233cb0ec722c18583", + Md5 = "ecda36ebf0e1100233cb0ec722c18583", Partitions = new[] { new BlockPartitionVolumes @@ -2107,7 +2109,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "cef2f4fe9b1a32d5c0544f814e634264", + Md5 = "cef2f4fe9b1a32d5c0544f814e634264", Partitions = new[] { new BlockPartitionVolumes @@ -2123,7 +2125,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "bbe58e26b8f8f822cd3edfd37a4e4924", + Md5 = "bbe58e26b8f8f822cd3edfd37a4e4924", Partitions = new[] { new BlockPartitionVolumes @@ -2139,7 +2141,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "b9b6ebdf711364c979de7cf70c3a438a", + Md5 = "b9b6ebdf711364c979de7cf70c3a438a", Partitions = new[] { new BlockPartitionVolumes @@ -2155,7 +2157,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "d37424f367f545acbb397f2bed766843", + Md5 = "d37424f367f545acbb397f2bed766843", Partitions = new[] { new BlockPartitionVolumes @@ -2171,7 +2173,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "9963dd6f19ce6bd56eabeccdfbbd821a", + Md5 = "9963dd6f19ce6bd56eabeccdfbbd821a", Partitions = new[] { new BlockPartitionVolumes @@ -2187,7 +2189,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "acf6604559ae8217f7869823e2429024", + Md5 = "acf6604559ae8217f7869823e2429024", Partitions = new[] { new BlockPartitionVolumes @@ -2203,7 +2205,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "23bf2139cdfdc4c16db058fd31ea6481", + Md5 = "23bf2139cdfdc4c16db058fd31ea6481", Partitions = new[] { new BlockPartitionVolumes @@ -2219,7 +2221,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "fa26adda0415f02057b113ad29c80c8d", + Md5 = "fa26adda0415f02057b113ad29c80c8d", Partitions = new[] { new BlockPartitionVolumes @@ -2235,7 +2237,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", + Md5 = "4f2a8d036fefd6c6c88d99eda3aa12b7", Partitions = new[] { new BlockPartitionVolumes @@ -2251,7 +2253,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1404, SectorSize = 512, - MD5 = "1f6a23974b29d525706a2b0228325656", + Md5 = "1f6a23974b29d525706a2b0228325656", Partitions = new[] { new BlockPartitionVolumes @@ -2267,7 +2269,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "d81f5cb64fd0b99f138eab34110bbc3c", + Md5 = "d81f5cb64fd0b99f138eab34110bbc3c", Partitions = new[] { new BlockPartitionVolumes @@ -2283,7 +2285,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "a89006a75d13bee9202d1d6e52721ccb", + Md5 = "a89006a75d13bee9202d1d6e52721ccb", Partitions = new[] { new BlockPartitionVolumes @@ -2299,7 +2301,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "e1ad4a022778d7a0b24a93d8e68a59dc", + Md5 = "e1ad4a022778d7a0b24a93d8e68a59dc", Partitions = new[] { new BlockPartitionVolumes @@ -2315,7 +2317,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 420, SectorSize = 512, - MD5 = "56a95fcf1d6f5c3108a17207b53ec07c", + Md5 = "56a95fcf1d6f5c3108a17207b53ec07c", Partitions = new[] { new BlockPartitionVolumes @@ -2331,7 +2333,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "beef1cdb004dc69391d6b3d508988b95", + Md5 = "beef1cdb004dc69391d6b3d508988b95", Partitions = new[] { new BlockPartitionVolumes @@ -2347,7 +2349,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6213897b7dbf263f12abf76901d43862" + Md5 = "6213897b7dbf263f12abf76901d43862" }, new BlockImageTestExpected { @@ -2355,7 +2357,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0aef12c906b744101b932d799ca88a78", + Md5 = "0aef12c906b744101b932d799ca88a78", Partitions = new[] { new BlockPartitionVolumes @@ -2371,7 +2373,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "e7367df9998de0030a97b5131d1bed20", + Md5 = "e7367df9998de0030a97b5131d1bed20", Partitions = new[] { new BlockPartitionVolumes @@ -2387,7 +2389,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c36b819cfe355c11360bc120c9216fe", + Md5 = "1c36b819cfe355c11360bc120c9216fe", Partitions = new[] { new BlockPartitionVolumes @@ -2403,7 +2405,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "25114403c11e337480e2afc4e6e32108", + Md5 = "25114403c11e337480e2afc4e6e32108", Partitions = new[] { new BlockPartitionVolumes @@ -2419,7 +2421,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "3d7760ddaa55cd258057773d15106b78", + Md5 = "3d7760ddaa55cd258057773d15106b78", Partitions = new[] { new BlockPartitionVolumes @@ -2435,7 +2437,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "29054ef703394ee3b35e849468a412ba", + Md5 = "29054ef703394ee3b35e849468a412ba", Partitions = new[] { new BlockPartitionVolumes @@ -2451,7 +2453,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "c91e852828c2aeee2fc94a6adbeed0ae", + Md5 = "c91e852828c2aeee2fc94a6adbeed0ae", Partitions = new[] { new BlockPartitionVolumes @@ -2467,7 +2469,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "efb6cfe53a6770f0ae388cb2c7f46264", + Md5 = "efb6cfe53a6770f0ae388cb2c7f46264", Partitions = new[] { new BlockPartitionVolumes @@ -2483,7 +2485,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "6116f7c1397cadd55ba8d79c2aadc9dd", + Md5 = "6116f7c1397cadd55ba8d79c2aadc9dd", Partitions = new[] { new BlockPartitionVolumes @@ -2499,7 +2501,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "93100f8d86e5d0d0e6340f59c52a5e0d", + Md5 = "93100f8d86e5d0d0e6340f59c52a5e0d", Partitions = new[] { new BlockPartitionVolumes @@ -2515,7 +2517,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "cf7b7d43aa70863bedcc4a8432a5af67", + Md5 = "cf7b7d43aa70863bedcc4a8432a5af67", Partitions = new[] { new BlockPartitionVolumes @@ -2531,7 +2533,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "02259cd5fbcc20f8484aa6bece7a37c6", + Md5 = "02259cd5fbcc20f8484aa6bece7a37c6", Partitions = new[] { new BlockPartitionVolumes @@ -2547,7 +2549,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "073a172879a71339ef4b00ebb47b67fc", + Md5 = "073a172879a71339ef4b00ebb47b67fc", Partitions = new[] { new BlockPartitionVolumes @@ -2563,7 +2565,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "d9890897130d0fc1eee3dbf4d9b0440f", + Md5 = "d9890897130d0fc1eee3dbf4d9b0440f", Partitions = new[] { new BlockPartitionVolumes @@ -2579,7 +2581,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "09ca721aa883d5bbaa422c7943b0782c", + Md5 = "09ca721aa883d5bbaa422c7943b0782c", Partitions = new[] { new BlockPartitionVolumes @@ -2595,7 +2597,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "259ff90e41e60682d948dd7d6af89735" + Md5 = "259ff90e41e60682d948dd7d6af89735" }, new BlockImageTestExpected { @@ -2603,7 +2605,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "b40f8273fa7492bfe71c3d743269b97c", + Md5 = "b40f8273fa7492bfe71c3d743269b97c", Partitions = new[] { new BlockPartitionVolumes @@ -2619,7 +2621,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9827ba1b3e9cac41263caabd862e78f9", + Md5 = "9827ba1b3e9cac41263caabd862e78f9", Partitions = new[] { new BlockPartitionVolumes @@ -2635,7 +2637,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "67d299c6e83f3f0fbcb8faa9ffa422c1", + Md5 = "67d299c6e83f3f0fbcb8faa9ffa422c1", Partitions = new[] { new BlockPartitionVolumes @@ -2651,7 +2653,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "81d3bfec7b201f6a4503eb24c4394d4a", + Md5 = "81d3bfec7b201f6a4503eb24c4394d4a", Partitions = new[] { new BlockPartitionVolumes @@ -2667,7 +2669,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d07f7ffaee89742c6477aaaf94eb5715", + Md5 = "d07f7ffaee89742c6477aaaf94eb5715", Partitions = new[] { new BlockPartitionVolumes @@ -2683,7 +2685,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "56af87802a9852e6e01e08d544740816", + Md5 = "56af87802a9852e6e01e08d544740816", Partitions = new[] { new BlockPartitionVolumes @@ -2699,7 +2701,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1512, SectorSize = 512, - MD5 = "34b7b99ef6fba2235eedbd8ae406d7d3", + Md5 = "34b7b99ef6fba2235eedbd8ae406d7d3", Partitions = new[] { new BlockPartitionVolumes @@ -2715,7 +2717,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d9db52d992a76bf3bbc626ff844215a5", + Md5 = "d9db52d992a76bf3bbc626ff844215a5", Partitions = new[] { new BlockPartitionVolumes @@ -2731,7 +2733,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1680, SectorSize = 512, - MD5 = "3b74e367926181152c3499de8dd9b914", + Md5 = "3b74e367926181152c3499de8dd9b914", Partitions = new[] { new BlockPartitionVolumes @@ -2747,7 +2749,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5904, SectorSize = 512, - MD5 = "82825116ffe6d68b4d920ad4875bd709" + Md5 = "82825116ffe6d68b4d920ad4875bd709" }, new BlockImageTestExpected { @@ -2755,7 +2757,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 5904, SectorSize = 512, - MD5 = "e7cdd1123b08eac4e9571825b1f6172f", + Md5 = "e7cdd1123b08eac4e9571825b1f6172f", Partitions = new[] { new BlockPartitionVolumes @@ -2771,7 +2773,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "3b16537076c5517306dc672f8f1e376e" + Md5 = "3b16537076c5517306dc672f8f1e376e" }, new BlockImageTestExpected { @@ -2779,7 +2781,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "022893d7766205894fca41bcde3c9f6c", + Md5 = "022893d7766205894fca41bcde3c9f6c", Partitions = new[] { new BlockPartitionVolumes @@ -2795,7 +2797,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1d32a686b7675c7a4f88c15522738432" + Md5 = "1d32a686b7675c7a4f88c15522738432" }, new BlockImageTestExpected { @@ -2803,7 +2805,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "084d4d75f5e780cb9ec66a2fa784c371", + Md5 = "084d4d75f5e780cb9ec66a2fa784c371", Partitions = new[] { new BlockPartitionVolumes @@ -2819,7 +2821,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1e06f21a1c11ea3347212da115bca08f", + Md5 = "1e06f21a1c11ea3347212da115bca08f", Partitions = new[] { new BlockPartitionVolumes @@ -2835,7 +2837,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "8eb8cb310feaf03c69fffd4f6e729847", + Md5 = "8eb8cb310feaf03c69fffd4f6e729847", Partitions = new[] { new BlockPartitionVolumes @@ -2851,7 +2853,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "3fc3a03d049416d81f81cc3b9ea8e5de", + Md5 = "3fc3a03d049416d81f81cc3b9ea8e5de", Partitions = new[] { new BlockPartitionVolumes @@ -2867,7 +2869,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2bfd2e0a81bad704f8fc7758358cfcca", + Md5 = "2bfd2e0a81bad704f8fc7758358cfcca", Partitions = new[] { new BlockPartitionVolumes @@ -2883,7 +2885,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "3c4becd695ed25866d39966a9a93c2d9", + Md5 = "3c4becd695ed25866d39966a9a93c2d9", Partitions = new[] { new BlockPartitionVolumes @@ -2899,7 +2901,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "1d32a686b7675c7a4f88c15522738432" + Md5 = "1d32a686b7675c7a4f88c15522738432" }, new BlockImageTestExpected { @@ -2907,7 +2909,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "72282e11f7d91bf9c090b550fabfe80d", + Md5 = "72282e11f7d91bf9c090b550fabfe80d", Partitions = new[] { new BlockPartitionVolumes @@ -2923,7 +2925,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2720, SectorSize = 512, - MD5 = "457c1126dc7f36bbbabe9e17e90372e3", + Md5 = "457c1126dc7f36bbbabe9e17e90372e3", Partitions = new[] { new BlockPartitionVolumes @@ -2939,7 +2941,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "852181d5913c6f290872c66bbe992314", + Md5 = "852181d5913c6f290872c66bbe992314", Partitions = new[] { new BlockPartitionVolumes @@ -2955,7 +2957,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2980cc32504c945598dc50f1db576994", + Md5 = "2980cc32504c945598dc50f1db576994", Partitions = new[] { new BlockPartitionVolumes @@ -2971,7 +2973,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "c1c58d74fffb3656dd7f60f74ae8a629", + Md5 = "c1c58d74fffb3656dd7f60f74ae8a629", Partitions = new[] { new BlockPartitionVolumes @@ -2987,7 +2989,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3024, SectorSize = 512, - MD5 = "67391c3750f17a806503be3f9d514b1f", + Md5 = "67391c3750f17a806503be3f9d514b1f", Partitions = new[] { new BlockPartitionVolumes @@ -3003,7 +3005,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "e45d41a61fbe48f328c995fcc10a5548", + Md5 = "e45d41a61fbe48f328c995fcc10a5548", Partitions = new[] { new BlockPartitionVolumes @@ -3019,7 +3021,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3360, SectorSize = 512, - MD5 = "c7764476489072dd053d5ec878171423", + Md5 = "c7764476489072dd053d5ec878171423", Partitions = new[] { new BlockPartitionVolumes @@ -3035,7 +3037,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "15f71b92bd72aba5d80bf70eca4d5b1e", + Md5 = "15f71b92bd72aba5d80bf70eca4d5b1e", Partitions = new[] { new BlockPartitionVolumes @@ -3051,7 +3053,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3528, SectorSize = 512, - MD5 = "f725bc714c3204e835e23c726ce77b89", + Md5 = "f725bc714c3204e835e23c726ce77b89", Partitions = new[] { new BlockPartitionVolumes @@ -3067,7 +3069,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "02d7c237c6ac1fbcd2fbbfb45c5fb767" + Md5 = "02d7c237c6ac1fbcd2fbbfb45c5fb767" }, new BlockImageTestExpected { @@ -3075,7 +3077,7 @@ public class RayDIM : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "99f83e846c5106dd4992646726e91636", + Md5 = "99f83e846c5106dd4992646726e91636", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/RsIde.cs b/Aaru.Tests/Images/RsIde.cs index 4a79e05a2..5828ce7c0 100644 --- a/Aaru.Tests/Images/RsIde.cs +++ b/Aaru.Tests/Images/RsIde.cs @@ -37,7 +37,7 @@ using NUnit.Framework; 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 IMediaImage Plugin => new DiscImages.RsIde(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class RsIde : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 20480, SectorSize = 512, - MD5 = "ee7b8fe07784f2ebacc18da1fc248f5a", + Md5 = "ee7b8fe07784f2ebacc18da1fc248f5a", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/SaveDskF.cs b/Aaru.Tests/Images/SaveDskF.cs index 417536701..8e3c693c1 100644 --- a/Aaru.Tests/Images/SaveDskF.cs +++ b/Aaru.Tests/Images/SaveDskF.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class SaveDskF : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF"); - public override IMediaImage _plugin => new DiscImages.SaveDskF(); + public override IMediaImage Plugin => new DiscImages.SaveDskF(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5a1e0a75d31d88c1ce7429fd333c268f" + Md5 = "5a1e0a75d31d88c1ce7429fd333c268f" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5a1e0a75d31d88c1ce7429fd333c268f" + Md5 = "5a1e0a75d31d88c1ce7429fd333c268f" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "4989762c82f173f9b52e0bdb8cf5becb" + Md5 = "4989762c82f173f9b52e0bdb8cf5becb" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "4989762c82f173f9b52e0bdb8cf5becb" + Md5 = "4989762c82f173f9b52e0bdb8cf5becb" }, new BlockImageTestExpected { @@ -79,7 +79,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5a1e0a75d31d88c1ce7429fd333c268f" + Md5 = "5a1e0a75d31d88c1ce7429fd333c268f" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "5a1e0a75d31d88c1ce7429fd333c268f" + Md5 = "5a1e0a75d31d88c1ce7429fd333c268f" }, new BlockImageTestExpected { @@ -95,7 +95,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "c1a67b27bc76b64d0845965501b24120" + Md5 = "c1a67b27bc76b64d0845965501b24120" }, new BlockImageTestExpected { @@ -103,7 +103,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "c1a67b27bc76b64d0845965501b24120" + Md5 = "c1a67b27bc76b64d0845965501b24120" }, new BlockImageTestExpected { @@ -111,7 +111,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "8a4d35dd0d97e6bca8b000170a43a56f" + Md5 = "8a4d35dd0d97e6bca8b000170a43a56f" }, new BlockImageTestExpected { @@ -119,7 +119,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "8a4d35dd0d97e6bca8b000170a43a56f" + Md5 = "8a4d35dd0d97e6bca8b000170a43a56f" }, new BlockImageTestExpected { @@ -127,7 +127,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "c1a67b27bc76b64d0845965501b24120" + Md5 = "c1a67b27bc76b64d0845965501b24120" }, new BlockImageTestExpected { @@ -135,7 +135,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "c1a67b27bc76b64d0845965501b24120" + Md5 = "c1a67b27bc76b64d0845965501b24120" }, new BlockImageTestExpected { @@ -143,7 +143,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" + Md5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" }, new BlockImageTestExpected { @@ -151,7 +151,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" + Md5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" }, new BlockImageTestExpected { @@ -159,7 +159,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "2ce745ac23712d3eb03d7a11ba933b12" + Md5 = "2ce745ac23712d3eb03d7a11ba933b12" }, new BlockImageTestExpected { @@ -167,7 +167,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "2ce745ac23712d3eb03d7a11ba933b12" + Md5 = "2ce745ac23712d3eb03d7a11ba933b12" }, new BlockImageTestExpected { @@ -175,7 +175,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" + Md5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" }, new BlockImageTestExpected { @@ -183,7 +183,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" + Md5 = "1c28b4c3cdc1dbf19c24a5eca3891a87" }, new BlockImageTestExpected { @@ -191,7 +191,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "65ce0cd08d90c882df12637c9c72c1ba" + Md5 = "65ce0cd08d90c882df12637c9c72c1ba" }, new BlockImageTestExpected { @@ -199,7 +199,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "65ce0cd08d90c882df12637c9c72c1ba" + Md5 = "65ce0cd08d90c882df12637c9c72c1ba" }, new BlockImageTestExpected { @@ -207,7 +207,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6f5d09c13a7b481bad9ea78042e61e00" + Md5 = "6f5d09c13a7b481bad9ea78042e61e00" }, new BlockImageTestExpected { @@ -215,7 +215,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "6f5d09c13a7b481bad9ea78042e61e00" + Md5 = "6f5d09c13a7b481bad9ea78042e61e00" }, new BlockImageTestExpected { @@ -223,7 +223,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "65ce0cd08d90c882df12637c9c72c1ba" + Md5 = "65ce0cd08d90c882df12637c9c72c1ba" }, new BlockImageTestExpected { @@ -231,7 +231,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "65ce0cd08d90c882df12637c9c72c1ba" + Md5 = "65ce0cd08d90c882df12637c9c72c1ba" }, new BlockImageTestExpected { @@ -239,7 +239,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "412fdc582506c0d7e76735d403b30759" + Md5 = "412fdc582506c0d7e76735d403b30759" }, new BlockImageTestExpected { @@ -247,7 +247,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "412fdc582506c0d7e76735d403b30759" + Md5 = "412fdc582506c0d7e76735d403b30759" }, new BlockImageTestExpected { @@ -255,7 +255,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "fd81fceb26bda5b02053c5c729a6f67f" + Md5 = "fd81fceb26bda5b02053c5c729a6f67f" }, new BlockImageTestExpected { @@ -263,7 +263,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "fd81fceb26bda5b02053c5c729a6f67f" + Md5 = "fd81fceb26bda5b02053c5c729a6f67f" }, new BlockImageTestExpected { @@ -271,7 +271,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "412fdc582506c0d7e76735d403b30759" + Md5 = "412fdc582506c0d7e76735d403b30759" }, new BlockImageTestExpected { @@ -279,7 +279,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "412fdc582506c0d7e76735d403b30759" + Md5 = "412fdc582506c0d7e76735d403b30759" }, new BlockImageTestExpected { @@ -287,7 +287,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "d81f5cb64fd0b99f138eab34110bbc3c", + Md5 = "d81f5cb64fd0b99f138eab34110bbc3c", Partitions = new[] { new BlockPartitionVolumes @@ -303,7 +303,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "a89006a75d13bee9202d1d6e52721ccb", + Md5 = "a89006a75d13bee9202d1d6e52721ccb", Partitions = new[] { new BlockPartitionVolumes @@ -319,7 +319,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 400, SectorSize = 512, - MD5 = "e1ad4a022778d7a0b24a93d8e68a59dc", + Md5 = "e1ad4a022778d7a0b24a93d8e68a59dc", Partitions = new[] { new BlockPartitionVolumes @@ -335,7 +335,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 410, SectorSize = 512, - MD5 = "353f3c2125ab6f74e3a271b60ad34840", + Md5 = "353f3c2125ab6f74e3a271b60ad34840", Partitions = new[] { new BlockPartitionVolumes @@ -351,7 +351,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "319fa8bef964c2a63e34bdb48e77cc4e", + Md5 = "319fa8bef964c2a63e34bdb48e77cc4e", Partitions = new[] { new BlockPartitionVolumes @@ -367,7 +367,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1804, SectorSize = 512, - MD5 = "306a61469b4c3c83f3e5f9ae409d83cd", + Md5 = "306a61469b4c3c83f3e5f9ae409d83cd", Partitions = new[] { new BlockPartitionVolumes @@ -383,7 +383,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "beef1cdb004dc69391d6b3d508988b95", + Md5 = "beef1cdb004dc69391d6b3d508988b95", Partitions = new[] { new BlockPartitionVolumes @@ -399,7 +399,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6213897b7dbf263f12abf76901d43862" + Md5 = "6213897b7dbf263f12abf76901d43862" }, new BlockImageTestExpected { @@ -407,7 +407,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0aef12c906b744101b932d799ca88a78", + Md5 = "0aef12c906b744101b932d799ca88a78", Partitions = new[] { new BlockPartitionVolumes @@ -423,7 +423,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "348d12add1ed226cd712a4a6a10d1a34", + Md5 = "348d12add1ed226cd712a4a6a10d1a34", Partitions = new[] { new BlockPartitionVolumes @@ -439,7 +439,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "1c36b819cfe355c11360bc120c9216fe", + Md5 = "1c36b819cfe355c11360bc120c9216fe", Partitions = new[] { new BlockPartitionVolumes @@ -455,7 +455,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "25114403c11e337480e2afc4e6e32108", + Md5 = "25114403c11e337480e2afc4e6e32108", Partitions = new[] { new BlockPartitionVolumes @@ -471,7 +471,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "3d7760ddaa55cd258057773d15106b78", + Md5 = "3d7760ddaa55cd258057773d15106b78", Partitions = new[] { new BlockPartitionVolumes @@ -487,7 +487,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "29054ef703394ee3b35e849468a412ba", + Md5 = "29054ef703394ee3b35e849468a412ba", Partitions = new[] { new BlockPartitionVolumes @@ -503,7 +503,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "c91e852828c2aeee2fc94a6adbeed0ae", + Md5 = "c91e852828c2aeee2fc94a6adbeed0ae", Partitions = new[] { new BlockPartitionVolumes @@ -519,7 +519,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "efb6cfe53a6770f0ae388cb2c7f46264", + Md5 = "efb6cfe53a6770f0ae388cb2c7f46264", Partitions = new[] { new BlockPartitionVolumes @@ -535,7 +535,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "6116f7c1397cadd55ba8d79c2aadc9dd", + Md5 = "6116f7c1397cadd55ba8d79c2aadc9dd", Partitions = new[] { new BlockPartitionVolumes @@ -551,7 +551,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "93100f8d86e5d0d0e6340f59c52a5e0d", + Md5 = "93100f8d86e5d0d0e6340f59c52a5e0d", Partitions = new[] { new BlockPartitionVolumes @@ -567,7 +567,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "cf7b7d43aa70863bedcc4a8432a5af67", + Md5 = "cf7b7d43aa70863bedcc4a8432a5af67", Partitions = new[] { new BlockPartitionVolumes @@ -583,7 +583,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "215198cf2a336e718208fc207bb62c6d", + Md5 = "215198cf2a336e718208fc207bb62c6d", Partitions = new[] { new BlockPartitionVolumes @@ -599,7 +599,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3116, SectorSize = 512, - MD5 = "2c96964b5d91444302e21721c25ea120", + Md5 = "2c96964b5d91444302e21721c25ea120", Partitions = new[] { new BlockPartitionVolumes @@ -615,7 +615,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "02259cd5fbcc20f8484aa6bece7a37c6", + Md5 = "02259cd5fbcc20f8484aa6bece7a37c6", Partitions = new[] { new BlockPartitionVolumes @@ -631,7 +631,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "073a172879a71339ef4b00ebb47b67fc", + Md5 = "073a172879a71339ef4b00ebb47b67fc", Partitions = new[] { new BlockPartitionVolumes @@ -647,7 +647,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "d9890897130d0fc1eee3dbf4d9b0440f", + Md5 = "d9890897130d0fc1eee3dbf4d9b0440f", Partitions = new[] { new BlockPartitionVolumes @@ -663,7 +663,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "09ca721aa883d5bbaa422c7943b0782c", + Md5 = "09ca721aa883d5bbaa422c7943b0782c", Partitions = new[] { new BlockPartitionVolumes @@ -679,7 +679,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_525, Sectors = 3040, SectorSize = 512, - MD5 = "d78dc81491edeec99aa202d02f3daf00" + Md5 = "d78dc81491edeec99aa202d02f3daf00" }, new BlockImageTestExpected { @@ -687,7 +687,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1968, SectorSize = 512, - MD5 = "9a8670fbaf6307b8d5f32aa10e1be435", + Md5 = "9a8670fbaf6307b8d5f32aa10e1be435", Partitions = new[] { new BlockPartitionVolumes @@ -703,7 +703,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1968, SectorSize = 512, - MD5 = "05d29642cdcddafa0dcaff91682f8fe0", + Md5 = "05d29642cdcddafa0dcaff91682f8fe0", Partitions = new[] { new BlockPartitionVolumes @@ -719,7 +719,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 9408, SectorSize = 128, - MD5 = "beb782f6bc970e32ceef79cd112e2e48" + Md5 = "beb782f6bc970e32ceef79cd112e2e48" }, new BlockImageTestExpected { @@ -727,7 +727,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2132, SectorSize = 512, - MD5 = "a99603cd3219aab1299e66b2999f0e57", + Md5 = "a99603cd3219aab1299e66b2999f0e57", Partitions = new[] { new BlockPartitionVolumes @@ -743,7 +743,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" + Md5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" }, new BlockImageTestExpected { @@ -751,7 +751,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" + Md5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" }, new BlockImageTestExpected { @@ -759,7 +759,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "9827ba1b3e9cac41263caabd862e78f9", + Md5 = "9827ba1b3e9cac41263caabd862e78f9", Partitions = new[] { new BlockPartitionVolumes @@ -775,7 +775,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "2e69bbd591ab736e471834ae03dde9a6", + Md5 = "2e69bbd591ab736e471834ae03dde9a6", Partitions = new[] { new BlockPartitionVolumes @@ -791,7 +791,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "81d3bfec7b201f6a4503eb24c4394d4a", + Md5 = "81d3bfec7b201f6a4503eb24c4394d4a", Partitions = new[] { new BlockPartitionVolumes @@ -807,7 +807,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "26532a62985b51a2c3b877a57f6d257b", + Md5 = "26532a62985b51a2c3b877a57f6d257b", Partitions = new[] { new BlockPartitionVolumes @@ -823,7 +823,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "a7771acff766557cc23b8c6943b588f9", + Md5 = "a7771acff766557cc23b8c6943b588f9", Partitions = new[] { new BlockPartitionVolumes @@ -839,7 +839,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d07f7ffaee89742c6477aaaf94eb5715", + Md5 = "d07f7ffaee89742c6477aaaf94eb5715", Partitions = new[] { new BlockPartitionVolumes @@ -855,7 +855,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "56af87802a9852e6e01e08d544740816", + Md5 = "56af87802a9852e6e01e08d544740816", Partitions = new[] { new BlockPartitionVolumes @@ -871,7 +871,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "e574be0d057f2ef775dfb685561d27cf" + Md5 = "e574be0d057f2ef775dfb685561d27cf" }, new BlockImageTestExpected { @@ -879,7 +879,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "e574be0d057f2ef775dfb685561d27cf" + Md5 = "e574be0d057f2ef775dfb685561d27cf" }, new BlockImageTestExpected { @@ -887,7 +887,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" + Md5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" }, new BlockImageTestExpected { @@ -895,7 +895,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" + Md5 = "2aefc1e97f29bf9982e0fd7091dfb9f5" }, new BlockImageTestExpected { @@ -903,7 +903,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "fd7fb1ba11cdfe11db54af0322abf59d", + Md5 = "fd7fb1ba11cdfe11db54af0322abf59d", Partitions = new[] { new BlockPartitionVolumes @@ -919,7 +919,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d9db52d992a76bf3bbc626ff844215a5", + Md5 = "d9db52d992a76bf3bbc626ff844215a5", Partitions = new[] { new BlockPartitionVolumes @@ -935,7 +935,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "5949d0be57ce8bffcda7c4be4d1348ee", + Md5 = "5949d0be57ce8bffcda7c4be4d1348ee", Partitions = new[] { new BlockPartitionVolumes @@ -951,7 +951,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "e4746aa9629a2325c520db1c8a641ac6" + Md5 = "e4746aa9629a2325c520db1c8a641ac6" }, new BlockImageTestExpected { @@ -959,7 +959,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "e4746aa9629a2325c520db1c8a641ac6" + Md5 = "e4746aa9629a2325c520db1c8a641ac6" }, new BlockImageTestExpected { @@ -967,7 +967,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "4aeafaf2a088d6a7406856dce8118567", + Md5 = "4aeafaf2a088d6a7406856dce8118567", Partitions = new[] { new BlockPartitionVolumes @@ -983,7 +983,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "42e73287b23ac985c9825466cae26859" + Md5 = "42e73287b23ac985c9825466cae26859" }, new BlockImageTestExpected { @@ -991,7 +991,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "42e73287b23ac985c9825466cae26859" + Md5 = "42e73287b23ac985c9825466cae26859" }, new BlockImageTestExpected { @@ -999,7 +999,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "e4746aa9629a2325c520db1c8a641ac6" + Md5 = "e4746aa9629a2325c520db1c8a641ac6" }, new BlockImageTestExpected { @@ -1007,7 +1007,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "e4746aa9629a2325c520db1c8a641ac6" + Md5 = "e4746aa9629a2325c520db1c8a641ac6" }, new BlockImageTestExpected { @@ -1015,7 +1015,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3608, SectorSize = 512, - MD5 = "2f6964d410b275c8e9f60fe2f24b361a" + Md5 = "2f6964d410b275c8e9f60fe2f24b361a" }, new BlockImageTestExpected { @@ -1023,7 +1023,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3608, SectorSize = 512, - MD5 = "967726aede85c68f66887672078f8856", + Md5 = "967726aede85c68f66887672078f8856", Partitions = new[] { new BlockPartitionVolumes @@ -1039,7 +1039,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 15776, SectorSize = 128, - MD5 = "786e45bbfcb369913968aa31365f00bb" + Md5 = "786e45bbfcb369913968aa31365f00bb" }, new BlockImageTestExpected { @@ -1047,7 +1047,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3772, SectorSize = 512, - MD5 = "3fa4f87d7058ba940b88e0d80f0d7ded", + Md5 = "3fa4f87d7058ba940b88e0d80f0d7ded", Partitions = new[] { new BlockPartitionVolumes @@ -1063,7 +1063,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "003e9130d83a23018f488f9fa89cae5e" + Md5 = "003e9130d83a23018f488f9fa89cae5e" }, new BlockImageTestExpected { @@ -1071,7 +1071,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "003e9130d83a23018f488f9fa89cae5e" + Md5 = "003e9130d83a23018f488f9fa89cae5e" }, new BlockImageTestExpected { @@ -1079,7 +1079,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "b042310181410227d0072fef1e98a989", + Md5 = "b042310181410227d0072fef1e98a989", Partitions = new[] { new BlockPartitionVolumes @@ -1095,7 +1095,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "00e61c06bf29f0c04a7eabe2dbd7efb6" + Md5 = "00e61c06bf29f0c04a7eabe2dbd7efb6" }, new BlockImageTestExpected { @@ -1103,7 +1103,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "1e06f21a1c11ea3347212da115bca08f", + Md5 = "1e06f21a1c11ea3347212da115bca08f", Partitions = new[] { new BlockPartitionVolumes @@ -1119,7 +1119,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "3fc3a03d049416d81f81cc3b9ea8e5de", + Md5 = "3fc3a03d049416d81f81cc3b9ea8e5de", Partitions = new[] { new BlockPartitionVolumes @@ -1135,7 +1135,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7e3bf04f3660dd1052a335dc99441e44", + Md5 = "7e3bf04f3660dd1052a335dc99441e44", Partitions = new[] { new BlockPartitionVolumes @@ -1151,7 +1151,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "8eb8cb310feaf03c69fffd4f6e729847", + Md5 = "8eb8cb310feaf03c69fffd4f6e729847", Partitions = new[] { new BlockPartitionVolumes @@ -1167,7 +1167,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_HD, Sectors = 3444, SectorSize = 512, - MD5 = "a58fd062f024b95714f1223a8bc2232f", + Md5 = "a58fd062f024b95714f1223a8bc2232f", Partitions = new[] { new BlockPartitionVolumes @@ -1183,7 +1183,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2bfd2e0a81bad704f8fc7758358cfcca", + Md5 = "2bfd2e0a81bad704f8fc7758358cfcca", Partitions = new[] { new BlockPartitionVolumes @@ -1199,7 +1199,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "a79ec33c623697b4562dacaed31523b8", + Md5 = "a79ec33c623697b4562dacaed31523b8", Partitions = new[] { new BlockPartitionVolumes @@ -1215,7 +1215,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "3c4becd695ed25866d39966a9a93c2d9", + Md5 = "3c4becd695ed25866d39966a9a93c2d9", Partitions = new[] { new BlockPartitionVolumes @@ -1231,7 +1231,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "009cc68e28b2b13814d3afbec9d9e59f" + Md5 = "009cc68e28b2b13814d3afbec9d9e59f" }, new BlockImageTestExpected { @@ -1239,7 +1239,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "009cc68e28b2b13814d3afbec9d9e59f" + Md5 = "009cc68e28b2b13814d3afbec9d9e59f" }, new BlockImageTestExpected { @@ -1247,7 +1247,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "003e9130d83a23018f488f9fa89cae5e" + Md5 = "003e9130d83a23018f488f9fa89cae5e" }, new BlockImageTestExpected { @@ -1255,7 +1255,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "003e9130d83a23018f488f9fa89cae5e" + Md5 = "003e9130d83a23018f488f9fa89cae5e" }, new BlockImageTestExpected { @@ -1263,7 +1263,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "72282e11f7d91bf9c090b550fabfe80d", + Md5 = "72282e11f7d91bf9c090b550fabfe80d", Partitions = new[] { new BlockPartitionVolumes @@ -1279,7 +1279,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2720, SectorSize = 512, - MD5 = "457c1126dc7f36bbbabe9e17e90372e3", + Md5 = "457c1126dc7f36bbbabe9e17e90372e3", Partitions = new[] { new BlockPartitionVolumes @@ -1295,7 +1295,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_HD, Sectors = 2788, SectorSize = 512, - MD5 = "852181d5913c6f290872c66bbe992314", + Md5 = "852181d5913c6f290872c66bbe992314", Partitions = new[] { new BlockPartitionVolumes @@ -1311,7 +1311,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "2980cc32504c945598dc50f1db576994", + Md5 = "2980cc32504c945598dc50f1db576994", Partitions = new[] { new BlockPartitionVolumes @@ -1327,7 +1327,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "c1c58d74fffb3656dd7f60f74ae8a629", + Md5 = "c1c58d74fffb3656dd7f60f74ae8a629", Partitions = new[] { new BlockPartitionVolumes @@ -1343,7 +1343,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2988, SectorSize = 512, - MD5 = "097bb2fd34cee5ebde7b5641975ffd60", + Md5 = "097bb2fd34cee5ebde7b5641975ffd60", Partitions = new[] { new BlockPartitionVolumes @@ -1359,7 +1359,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "e45d41a61fbe48f328c995fcc10a5548", + Md5 = "e45d41a61fbe48f328c995fcc10a5548", Partitions = new[] { new BlockPartitionVolumes @@ -1375,7 +1375,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "c25f2a57c71db1cd4fea2263598f544a", + Md5 = "c25f2a57c71db1cd4fea2263598f544a", Partitions = new[] { new BlockPartitionVolumes @@ -1391,7 +1391,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "15f71b92bd72aba5d80bf70eca4d5b1e", + Md5 = "15f71b92bd72aba5d80bf70eca4d5b1e", Partitions = new[] { new BlockPartitionVolumes @@ -1407,7 +1407,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "d88c8d818e238c9e52b8588b5fd52efe", + Md5 = "d88c8d818e238c9e52b8588b5fd52efe", Partitions = new[] { new BlockPartitionVolumes @@ -1423,7 +1423,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "2770e5b1b7935ca6e9695a32008b936a" + Md5 = "2770e5b1b7935ca6e9695a32008b936a" }, new BlockImageTestExpected { @@ -1431,7 +1431,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "2770e5b1b7935ca6e9695a32008b936a" + Md5 = "2770e5b1b7935ca6e9695a32008b936a" }, new BlockImageTestExpected { @@ -1439,7 +1439,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "3d5fcdaf627257ae9f50a06bdba26965", + Md5 = "3d5fcdaf627257ae9f50a06bdba26965", Partitions = new[] { new BlockPartitionVolumes @@ -1455,7 +1455,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "34b4bdab5fcc17076cceb7c1a39ea430" + Md5 = "34b4bdab5fcc17076cceb7c1a39ea430" }, new BlockImageTestExpected { @@ -1463,7 +1463,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "34b4bdab5fcc17076cceb7c1a39ea430" + Md5 = "34b4bdab5fcc17076cceb7c1a39ea430" }, new BlockImageTestExpected { @@ -1471,7 +1471,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "2770e5b1b7935ca6e9695a32008b936a" + Md5 = "2770e5b1b7935ca6e9695a32008b936a" }, new BlockImageTestExpected { @@ -1479,7 +1479,7 @@ public class SaveDskF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "2770e5b1b7935ca6e9695a32008b936a" + Md5 = "2770e5b1b7935ca6e9695a32008b936a" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs index 45d493cf5..d13bf80b0 100644 --- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs +++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs @@ -38,7 +38,7 @@ public class DiskCopy42 : BlockMediaImageTest { 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(); + public override IMediaImage Plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -64,7 +64,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +80,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -96,7 +96,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -104,7 +104,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs index 5c2055417..637bb7afe 100644 --- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs +++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs @@ -39,7 +39,7 @@ public class DiskDup : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskDup+"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 91108, SectorSize = 512, - MD5 = "69e3234920e472b24365060241934ca6" + Md5 = "69e3234920e472b24365060241934ca6" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +129,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class DiskDup : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs index ab8884696..e3554f1a8 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class ROCo : BlockMediaImageTest { 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 IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +51,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 91108, SectorSize = 512, - MD5 = "69e3234920e472b24365060241934ca6" + Md5 = "69e3234920e472b24365060241934ca6" }, new BlockImageTestExpected { @@ -57,7 +59,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -65,7 +67,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -73,7 +75,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -81,7 +83,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +99,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +115,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +131,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -137,7 +139,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -145,7 +147,7 @@ public class ROCo : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs index 449a6d2f7..df04eb9cc 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs @@ -39,7 +39,7 @@ 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 IMediaImage _plugin => new Ndif(); + public override IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 91108, SectorSize = 512, - MD5 = "69e3234920e472b24365060241934ca6" + Md5 = "69e3234920e472b24365060241934ca6" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +129,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class RdWr : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs index c1a3d11df..0f22490f4 100644 --- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs +++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs @@ -39,7 +39,7 @@ public class Rdxx : BlockMediaImageTest { 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 IMediaImage Plugin => new Ndif(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 91108, SectorSize = 512, - MD5 = "69e3234920e472b24365060241934ca6" + Md5 = "69e3234920e472b24365060241934ca6" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +129,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class Rdxx : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs index 4c06829cb..98cfd5cbd 100644 --- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs +++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs @@ -39,7 +39,7 @@ public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 91108, SectorSize = 512, - MD5 = "69e3234920e472b24365060241934ca6" + Md5 = "69e3234920e472b24365060241934ca6" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "3160038ca028ccf52ad7863790072145" + Md5 = "3160038ca028ccf52ad7863790072145" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "5e255c4bc0f6a26ecd27845b37e65aaa" + Md5 = "5e255c4bc0f6a26ecd27845b37e65aaa" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "652dc979c177f2d8e846587158b38478" + Md5 = "652dc979c177f2d8e846587158b38478" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "ff419213080574056ebd9adf7bab3d32", + Md5 = "ff419213080574056ebd9adf7bab3d32", Partitions = new[] { new BlockPartitionVolumes @@ -97,7 +97,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "c2be571406cf6353269faa59a4a8c0a4", + Md5 = "c2be571406cf6353269faa59a4a8c0a4", Partitions = new[] { new BlockPartitionVolumes @@ -113,7 +113,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "92ea7a359957012a682ba126cfdef0ce", + Md5 = "92ea7a359957012a682ba126cfdef0ce", Partitions = new[] { new BlockPartitionVolumes @@ -129,7 +129,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "7975e8cf7579a6848d6fb4e546d1f682" + Md5 = "7975e8cf7579a6848d6fb4e546d1f682" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "a72da7aedadbe194c22a3d71c62e4766" + Md5 = "a72da7aedadbe194c22a3d71c62e4766" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7fbf0251a93cb36d98e68b7d19624de5" + Md5 = "7fbf0251a93cb36d98e68b7d19624de5" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/TapeMediaImageTest.cs b/Aaru.Tests/Images/TapeMediaImageTest.cs index 4652af12c..30d9fdcf8 100644 --- a/Aaru.Tests/Images/TapeMediaImageTest.cs +++ b/Aaru.Tests/Images/TapeMediaImageTest.cs @@ -40,7 +40,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as ITapeImage; + var image = Activator.CreateInstance(Plugin.GetType()) as ITapeImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -85,7 +85,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -129,7 +129,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest IFilter filter = filtersList.GetFilter(testFile); filter.Open(testFile); - var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage; + var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage; Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}"); ErrorNumber opened = image.Open(filter); @@ -161,7 +161,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest ctx.Update(sector); } - Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}"); + Assert.AreEqual(test.Md5, ctx.End(), $"Hash: {testFile}"); } }); } diff --git a/Aaru.Tests/Images/TeleDisk.cs b/Aaru.Tests/Images/TeleDisk.cs index 1930ef1bf..74f759e68 100644 --- a/Aaru.Tests/Images/TeleDisk.cs +++ b/Aaru.Tests/Images/TeleDisk.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class TeleDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk"); - public override IMediaImage _plugin => new DiscImages.TeleDisk(); + public override IMediaImage Plugin => new DiscImages.TeleDisk(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "beef1cdb004dc69391d6b3d508988b95", + Md5 = "beef1cdb004dc69391d6b3d508988b95", Partitions = new[] { new BlockPartitionVolumes @@ -63,7 +63,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "0aef12c906b744101b932d799ca88a78" + Md5 = "0aef12c906b744101b932d799ca88a78" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 820, SectorSize = 512, - MD5 = "348d12add1ed226cd712a4a6a10d1a34", + Md5 = "348d12add1ed226cd712a4a6a10d1a34", Partitions = new[] { new BlockPartitionVolumes @@ -87,7 +87,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.ECMA_78_2, Sectors = 1440, SectorSize = 512, - MD5 = "1c36b819cfe355c11360bc120c9216fe", + Md5 = "1c36b819cfe355c11360bc120c9216fe", Partitions = new[] { new BlockPartitionVolumes @@ -103,7 +103,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1600, SectorSize = 512, - MD5 = "25114403c11e337480e2afc4e6e32108", + Md5 = "25114403c11e337480e2afc4e6e32108", Partitions = new[] { new BlockPartitionVolumes @@ -119,7 +119,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_DD, Sectors = 1640, SectorSize = 512, - MD5 = "3d7760ddaa55cd258057773d15106b78", + Md5 = "3d7760ddaa55cd258057773d15106b78", Partitions = new[] { new BlockPartitionVolumes @@ -135,7 +135,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "29054ef703394ee3b35e849468a412ba" + Md5 = "29054ef703394ee3b35e849468a412ba" }, new BlockImageTestExpected { @@ -143,7 +143,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_DD, Sectors = 1640, SectorSize = 512, - MD5 = "c91e852828c2aeee2fc94a6adbeed0ae", + Md5 = "c91e852828c2aeee2fc94a6adbeed0ae", Partitions = new[] { new BlockPartitionVolumes @@ -159,7 +159,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 840, SectorSize = 512, - MD5 = "efb6cfe53a6770f0ae388cb2c7f46264", + Md5 = "efb6cfe53a6770f0ae388cb2c7f46264", Partitions = new[] { new BlockPartitionVolumes @@ -175,7 +175,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1476, SectorSize = 512, - MD5 = "6116f7c1397cadd55ba8d79c2aadc9dd", + Md5 = "6116f7c1397cadd55ba8d79c2aadc9dd", Partitions = new[] { new BlockPartitionVolumes @@ -191,7 +191,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1600, SectorSize = 512, - MD5 = "93100f8d86e5d0d0e6340f59c52a5e0d", + Md5 = "93100f8d86e5d0d0e6340f59c52a5e0d", Partitions = new[] { new BlockPartitionVolumes @@ -207,7 +207,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_525_DD, Sectors = 1640, SectorSize = 512, - MD5 = "cf7b7d43aa70863bedcc4a8432a5af67", + Md5 = "cf7b7d43aa70863bedcc4a8432a5af67", Partitions = new[] { new BlockPartitionVolumes @@ -223,7 +223,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "6213897b7dbf263f12abf76901d43862" + Md5 = "6213897b7dbf263f12abf76901d43862" }, new BlockImageTestExpected { @@ -231,7 +231,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "073a172879a71339ef4b00ebb47b67fc", + Md5 = "073a172879a71339ef4b00ebb47b67fc", Partitions = new[] { new BlockPartitionVolumes @@ -247,7 +247,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "d9890897130d0fc1eee3dbf4d9b0440f", + Md5 = "d9890897130d0fc1eee3dbf4d9b0440f", Partitions = new[] { new BlockPartitionVolumes @@ -263,7 +263,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2788, SectorSize = 512, - MD5 = "09ca721aa883d5bbaa422c7943b0782c", + Md5 = "09ca721aa883d5bbaa422c7943b0782c", Partitions = new[] { new BlockPartitionVolumes @@ -279,7 +279,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "02259cd5fbcc20f8484aa6bece7a37c6", + Md5 = "02259cd5fbcc20f8484aa6bece7a37c6", Partitions = new[] { new BlockPartitionVolumes @@ -295,7 +295,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 128, - MD5 = "b903ea7e0c9d7e4c6251df4825212db4" + Md5 = "b903ea7e0c9d7e4c6251df4825212db4" }, new BlockImageTestExpected { @@ -303,7 +303,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -319,7 +319,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "db9cfb6eea18820b7a7e0b5b45594471", + Md5 = "db9cfb6eea18820b7a7e0b5b45594471", Partitions = new[] { new BlockPartitionVolumes @@ -335,7 +335,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "26532a62985b51a2c3b877a57f6d257b", + Md5 = "26532a62985b51a2c3b877a57f6d257b", Partitions = new[] { new BlockPartitionVolumes @@ -351,7 +351,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "a7771acff766557cc23b8c6943b588f9", + Md5 = "a7771acff766557cc23b8c6943b588f9", Partitions = new[] { new BlockPartitionVolumes @@ -367,7 +367,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d07f7ffaee89742c6477aaaf94eb5715", + Md5 = "d07f7ffaee89742c6477aaaf94eb5715", Partitions = new[] { new BlockPartitionVolumes @@ -383,7 +383,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -399,7 +399,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "56af87802a9852e6e01e08d544740816", + Md5 = "56af87802a9852e6e01e08d544740816", Partitions = new[] { new BlockPartitionVolumes @@ -415,7 +415,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1494, SectorSize = 512, - MD5 = "fd7fb1ba11cdfe11db54af0322abf59d", + Md5 = "fd7fb1ba11cdfe11db54af0322abf59d", Partitions = new[] { new BlockPartitionVolumes @@ -431,7 +431,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "d9db52d992a76bf3bbc626ff844215a5", + Md5 = "d9db52d992a76bf3bbc626ff844215a5", Partitions = new[] { new BlockPartitionVolumes @@ -447,7 +447,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1660, SectorSize = 512, - MD5 = "5949d0be57ce8bffcda7c4be4d1348ee", + Md5 = "5949d0be57ce8bffcda7c4be4d1348ee", Partitions = new[] { new BlockPartitionVolumes @@ -463,7 +463,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -479,7 +479,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1148, SectorSize = 512, - MD5 = "4b88a3e43b57778422e8b1e851a9c902" + Md5 = "4b88a3e43b57778422e8b1e851a9c902" }, new BlockImageTestExpected { @@ -487,7 +487,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1804, SectorSize = 512, - MD5 = "d032d928c43b66419b7404b016ec07ff" + Md5 = "d032d928c43b66419b7404b016ec07ff" }, new BlockImageTestExpected { @@ -495,7 +495,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "1d32a686b7675c7a4f88c15522738432" + Md5 = "1d32a686b7675c7a4f88c15522738432" }, new BlockImageTestExpected { @@ -503,7 +503,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "8aea37782c507baf6b294467249b4608" + Md5 = "8aea37782c507baf6b294467249b4608" }, new BlockImageTestExpected { @@ -511,7 +511,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_HD, Sectors = 2880, SectorSize = 512, - MD5 = "8aea37782c507baf6b294467249b4608" + Md5 = "8aea37782c507baf6b294467249b4608" }, new BlockImageTestExpected { @@ -519,7 +519,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "1d32a686b7675c7a4f88c15522738432" + Md5 = "1d32a686b7675c7a4f88c15522738432" }, new BlockImageTestExpected { @@ -527,7 +527,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "28764d4f69c3865e2af71a41ca3f432f" + Md5 = "28764d4f69c3865e2af71a41ca3f432f" }, new BlockImageTestExpected { @@ -535,7 +535,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 332, SectorSize = 512, - MD5 = "62b900808c3e9f91f8361fd1716155a1" + Md5 = "62b900808c3e9f91f8361fd1716155a1" }, new BlockImageTestExpected { @@ -543,7 +543,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" }, new BlockImageTestExpected { @@ -551,7 +551,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "7e3bf04f3660dd1052a335dc99441e44", + Md5 = "7e3bf04f3660dd1052a335dc99441e44", Partitions = new[] { new BlockPartitionVolumes @@ -567,7 +567,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "8eb8cb310feaf03c69fffd4f6e729847", + Md5 = "8eb8cb310feaf03c69fffd4f6e729847", Partitions = new[] { new BlockPartitionVolumes @@ -583,7 +583,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DMF_82, Sectors = 3444, SectorSize = 512, - MD5 = "a58fd062f024b95714f1223a8bc2232f", + Md5 = "a58fd062f024b95714f1223a8bc2232f", Partitions = new[] { new BlockPartitionVolumes @@ -599,7 +599,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "2bfd2e0a81bad704f8fc7758358cfcca", + Md5 = "2bfd2e0a81bad704f8fc7758358cfcca", Partitions = new[] { new BlockPartitionVolumes @@ -615,7 +615,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "a79ec33c623697b4562dacaed31523b8", + Md5 = "a79ec33c623697b4562dacaed31523b8", Partitions = new[] { new BlockPartitionVolumes @@ -631,7 +631,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -647,7 +647,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "3c4becd695ed25866d39966a9a93c2d9", + Md5 = "3c4becd695ed25866d39966a9a93c2d9", Partitions = new[] { new BlockPartitionVolumes @@ -663,7 +663,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2460, SectorSize = 512, - MD5 = "72282e11f7d91bf9c090b550fabfe80d", + Md5 = "72282e11f7d91bf9c090b550fabfe80d", Partitions = new[] { new BlockPartitionVolumes @@ -679,7 +679,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2720, SectorSize = 512, - MD5 = "457c1126dc7f36bbbabe9e17e90372e3", + Md5 = "457c1126dc7f36bbbabe9e17e90372e3", Partitions = new[] { new BlockPartitionVolumes @@ -695,7 +695,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2788, SectorSize = 512, - MD5 = "852181d5913c6f290872c66bbe992314", + Md5 = "852181d5913c6f290872c66bbe992314", Partitions = new[] { new BlockPartitionVolumes @@ -711,7 +711,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "2980cc32504c945598dc50f1db576994", + Md5 = "2980cc32504c945598dc50f1db576994", Partitions = new[] { new BlockPartitionVolumes @@ -727,7 +727,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2952, SectorSize = 512, - MD5 = "c1c58d74fffb3656dd7f60f74ae8a629", + Md5 = "c1c58d74fffb3656dd7f60f74ae8a629", Partitions = new[] { new BlockPartitionVolumes @@ -743,7 +743,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3200, SectorSize = 512, - MD5 = "e45d41a61fbe48f328c995fcc10a5548", + Md5 = "e45d41a61fbe48f328c995fcc10a5548", Partitions = new[] { new BlockPartitionVolumes @@ -759,7 +759,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3320, SectorSize = 512, - MD5 = "c25f2a57c71db1cd4fea2263598f544a", + Md5 = "c25f2a57c71db1cd4fea2263598f544a", Partitions = new[] { new BlockPartitionVolumes @@ -775,7 +775,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DMF, Sectors = 3360, SectorSize = 512, - MD5 = "15f71b92bd72aba5d80bf70eca4d5b1e", + Md5 = "15f71b92bd72aba5d80bf70eca4d5b1e", Partitions = new[] { new BlockPartitionVolumes @@ -791,7 +791,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "d88c8d818e238c9e52b8588b5fd52efe", + Md5 = "d88c8d818e238c9e52b8588b5fd52efe", Partitions = new[] { new BlockPartitionVolumes @@ -807,7 +807,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56", + Md5 = "b4a602f67903c46eef62addb0780aa56", Partitions = new[] { new BlockPartitionVolumes @@ -823,7 +823,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 640, SectorSize = 512, - MD5 = "728f9361203dc39961b1413aa050f70d" + Md5 = "728f9361203dc39961b1413aa050f70d" }, new BlockImageTestExpected { @@ -831,7 +831,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 640, SectorSize = 512, - MD5 = "728f9361203dc39961b1413aa050f70d" + Md5 = "728f9361203dc39961b1413aa050f70d" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/Toast.cs b/Aaru.Tests/Images/Toast.cs index 60f47c0a6..fd5a8ef21 100644 --- a/Aaru.Tests/Images/Toast.cs +++ b/Aaru.Tests/Images/Toast.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Toast : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,9 +47,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -67,9 +67,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_dos_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -87,9 +87,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_dos.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -107,9 +107,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ebook_eng.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -127,9 +127,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ebook_fra.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -147,9 +147,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_joliet_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -167,9 +167,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_joliet.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -187,9 +187,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_mac_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -207,9 +207,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_mac.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -227,9 +227,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -247,9 +247,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -267,9 +267,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver_dos_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -287,9 +287,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver_dos.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -307,9 +307,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver_joliet_apple.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -327,9 +327,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver_joliet.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -347,9 +347,9 @@ public class Toast : OpticalMediaImageTest TestFile = "toast_3.5.7_iso9660_xa_ver.toast.lz", MediaType = MediaType.CD, Sectors = 0, - MD5 = "UNKNOWN", - LongMD5 = "UNKNOWN", - SubchannelMD5 = "UNKNOWN", + Md5 = "UNKNOWN", + LongMd5 = "UNKNOWN", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/UltraISO/Alcohol.cs b/Aaru.Tests/Images/UltraISO/Alcohol.cs index 7a3c85e5a..154383c2a 100644 --- a/Aaru.Tests/Images/UltraISO/Alcohol.cs +++ b/Aaru.Tests/Images/UltraISO/Alcohol.cs @@ -39,7 +39,7 @@ public class Alcohol : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Alcohol"); - public override IMediaImage _plugin => new Alcohol120(); + public override IMediaImage Plugin => new Alcohol120(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.mds", MediaType = MediaType.CDROMXA, Sectors = 279300, - MD5 = "556d7d32e3c01c2087cc56b25fe5f66d", - LongMD5 = "556d7d32e3c01c2087cc56b25fe5f66d", + Md5 = "556d7d32e3c01c2087cc56b25fe5f66d", + LongMd5 = "556d7d32e3c01c2087cc56b25fe5f66d", Tracks = new[] { new TrackInfoTestExpected @@ -235,8 +235,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_audiocd.mds", MediaType = MediaType.CDROMXA, Sectors = 247073, - MD5 = "c96a7bf12427078bab252d941716cc32", - LongMD5 = "c96a7bf12427078bab252d941716cc32", + Md5 = "c96a7bf12427078bab252d941716cc32", + LongMd5 = "c96a7bf12427078bab252d941716cc32", Tracks = new[] { new TrackInfoTestExpected @@ -358,8 +358,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_cdrom.mds", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -395,8 +395,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_cdrw.mds", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -426,8 +426,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_dvdram_v2.mds", MediaType = MediaType.DVDROM, Sectors = 471090, - MD5 = "35cb08dd5fedfb8e9ad2918292e51791", - LongMD5 = "35cb08dd5fedfb8e9ad2918292e51791", + Md5 = "35cb08dd5fedfb8e9ad2918292e51791", + LongMd5 = "35cb08dd5fedfb8e9ad2918292e51791", Tracks = new[] { new TrackInfoTestExpected @@ -456,8 +456,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_dvd-r+dl.mds", MediaType = MediaType.DVDROM, Sectors = 3455920, - MD5 = "1cd9b9be5c5e337c5e6576156b84b726", - LongMD5 = "1cd9b9be5c5e337c5e6576156b84b726", + Md5 = "1cd9b9be5c5e337c5e6576156b84b726", + LongMd5 = "1cd9b9be5c5e337c5e6576156b84b726", Tracks = new[] { new TrackInfoTestExpected @@ -486,8 +486,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_dvdrom.mds", MediaType = MediaType.DVDROM, Sectors = 2146357, - MD5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", - LongMD5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", + Md5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", + LongMd5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", Tracks = new[] { new TrackInfoTestExpected @@ -516,8 +516,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "report_enhancedcd.mds", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "97e5bf1caf3998e818d40cd845c6ecc9", - LongMD5 = "07b4d88c8f38cc0168a2f5725b31c52e", + Md5 = "97e5bf1caf3998e818d40cd845c6ecc9", + LongMd5 = "07b4d88c8f38cc0168a2f5725b31c52e", Tracks = new[] { new TrackInfoTestExpected @@ -650,8 +650,8 @@ public class Alcohol : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.mds", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "9a19aa0df066732a8ec34025e8160248", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", + Md5 = "9a19aa0df066732a8ec34025e8160248", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs index 3fafeea7f..f8798e597 100644 --- a/Aaru.Tests/Images/UltraISO/CloneCD.cs +++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.UltraISO; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class CloneCD : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "CloneCD"); - public override IMediaImage _plugin => new CloneCd(); + public override IMediaImage Plugin => new CloneCd(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,9 +50,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.ccd", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "e159c422cba79ce772437458c11c00d8", - LongMD5 = "e159c422cba79ce772437458c11c00d8", - SubchannelMD5 = "f43afdef9df3fc5b3d74494f0908223f", + Md5 = "e159c422cba79ce772437458c11c00d8", + LongMd5 = "e159c422cba79ce772437458c11c00d8", + SubchannelMd5 = "f43afdef9df3fc5b3d74494f0908223f", Tracks = new[] { new TrackInfoTestExpected @@ -236,9 +238,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_audiocd.ccd", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "e6b61ad780c72d162c3ceb784de1fbd2", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "e6b61ad780c72d162c3ceb784de1fbd2", Tracks = new[] { new TrackInfoTestExpected @@ -360,9 +362,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_cdrom.ccd", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "292b671b4b296a20511516557dbbd2b1", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "292b671b4b296a20511516557dbbd2b1", Tracks = new[] { new TrackInfoTestExpected @@ -398,9 +400,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_cdrw.ccd", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "4b054ac37c290a91a47997c84c9978d6", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "4b054ac37c290a91a47997c84c9978d6", Tracks = new[] { new TrackInfoTestExpected @@ -430,9 +432,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "report_enhancedcd.ccd", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "97e5bf1caf3998e818d40cd845c6ecc9", - LongMD5 = "07b4d88c8f38cc0168a2f5725b31c52e", - SubchannelMD5 = "74910fc131a456fa3d39a666dcee3dcc", + Md5 = "97e5bf1caf3998e818d40cd845c6ecc9", + LongMd5 = "07b4d88c8f38cc0168a2f5725b31c52e", + SubchannelMd5 = "74910fc131a456fa3d39a666dcee3dcc", Tracks = new[] { new TrackInfoTestExpected @@ -565,9 +567,9 @@ public class CloneCD : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.ccd", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "8d8493eb8eba6c67be7a8f47d4fde971", - LongMD5 = "5a9eb4f35ecc39de5c011a2bac8549b5", - SubchannelMD5 = "159b910e0ec1a88e004b9bcebdbde747", + Md5 = "8d8493eb8eba6c67be7a8f47d4fde971", + LongMd5 = "5a9eb4f35ecc39de5c011a2bac8549b5", + SubchannelMd5 = "159b910e0ec1a88e004b9bcebdbde747", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs index 4ebb6b067..372470b96 100644 --- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs +++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs @@ -39,7 +39,7 @@ public class Cuesheet : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Cuesheet"); - public override IMediaImage _plugin => new CdrWin(); + public override IMediaImage Plugin => new CdrWin(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,8 +48,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.cue", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "d3b069721052a1093151c6f7504ca593", - LongMD5 = "d3b069721052a1093151c6f7504ca593", + Md5 = "d3b069721052a1093151c6f7504ca593", + LongMd5 = "d3b069721052a1093151c6f7504ca593", Tracks = new[] { new TrackInfoTestExpected @@ -235,8 +235,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_audiocd.cue", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c041297aca68c206d95d20aa9435e01b", - LongMD5 = "c041297aca68c206d95d20aa9435e01b", + Md5 = "c041297aca68c206d95d20aa9435e01b", + LongMd5 = "c041297aca68c206d95d20aa9435e01b", Tracks = new[] { new TrackInfoTestExpected @@ -358,8 +358,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrom.cue", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -395,8 +395,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_cdrw.cue", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -426,8 +426,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvdram_v2.cue", MediaType = MediaType.CDROM, Sectors = 471090, - MD5 = "35cb08dd5fedfb8e9ad2918292e51791", - LongMD5 = "c7ee3dc509bb40948c383686b6f66da9", + Md5 = "35cb08dd5fedfb8e9ad2918292e51791", + LongMd5 = "c7ee3dc509bb40948c383686b6f66da9", Tracks = new[] { new TrackInfoTestExpected @@ -457,8 +457,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvd-r+dl.cue", MediaType = MediaType.CDROM, Sectors = 3455920, - MD5 = "ea4cfa28a4e449d7b59251b98394c7f4", - LongMD5 = "282de41e0118781f8a9216b0a4a31088", + Md5 = "ea4cfa28a4e449d7b59251b98394c7f4", + LongMd5 = "282de41e0118781f8a9216b0a4a31088", Tracks = new[] { new TrackInfoTestExpected @@ -488,8 +488,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "report_dvdrom.cue", MediaType = MediaType.CDROM, Sectors = 2146357, - MD5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", - LongMD5 = "8325ba263cfa419f9566de93e55248d5", + Md5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", + LongMd5 = "8325ba263cfa419f9566de93e55248d5", Tracks = new[] { new TrackInfoTestExpected @@ -643,8 +643,8 @@ public class Cuesheet : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.cue", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "9a19aa0df066732a8ec34025e8160248", - LongMD5 = "e981f7dfdb522ba937fe75474e23a446", + Md5 = "9a19aa0df066732a8ec34025e8160248", + LongMd5 = "e981f7dfdb522ba937fe75474e23a446", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs index aca314db6..675e088dd 100644 --- a/Aaru.Tests/Images/UltraISO/Nero.cs +++ b/Aaru.Tests/Images/UltraISO/Nero.cs @@ -38,7 +38,7 @@ public class Nero : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Nero"); - public override IMediaImage _plugin => new DiscImages.Nero(); + public override IMediaImage Plugin => new DiscImages.Nero(); public override OpticalImageTestExpected[] Tests => new[] { @@ -47,9 +47,9 @@ public class Nero : OpticalMediaImageTest TestFile = "cdiready_the_apprentice.nrg", MediaType = MediaType.CDDA, Sectors = 279300, - MD5 = "f6bd226d3f249fa821460aeb1393cf3b", - LongMD5 = "f6bd226d3f249fa821460aeb1393cf3b", - SubchannelMD5 = "UNKNOWN", + Md5 = "f6bd226d3f249fa821460aeb1393cf3b", + LongMd5 = "f6bd226d3f249fa821460aeb1393cf3b", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -235,9 +235,9 @@ public class Nero : OpticalMediaImageTest TestFile = "report_audiocd.nrg", MediaType = MediaType.CDDA, Sectors = 247073, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "UNKNOWN", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -359,9 +359,9 @@ public class Nero : OpticalMediaImageTest TestFile = "report_cdrom.nrg", MediaType = MediaType.CDROM, Sectors = 254265, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "UNKNOWN", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -397,9 +397,9 @@ public class Nero : OpticalMediaImageTest TestFile = "report_cdrw.nrg", MediaType = MediaType.CDROM, Sectors = 308224, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "UNKNOWN", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -429,8 +429,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvdram_v2.nrg", MediaType = MediaType.DVDROM, Sectors = 471090, - MD5 = "35cb08dd5fedfb8e9ad2918292e51791", - LongMD5 = "35cb08dd5fedfb8e9ad2918292e51791", + Md5 = "35cb08dd5fedfb8e9ad2918292e51791", + LongMd5 = "35cb08dd5fedfb8e9ad2918292e51791", Tracks = new[] { new TrackInfoTestExpected @@ -459,8 +459,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvd-r+dl.nrg", MediaType = MediaType.DVDROM, Sectors = 3455920, - MD5 = "1cd9b9be5c5e337c5e6576156b84b726", - LongMD5 = "1cd9b9be5c5e337c5e6576156b84b726", + Md5 = "1cd9b9be5c5e337c5e6576156b84b726", + LongMd5 = "1cd9b9be5c5e337c5e6576156b84b726", Tracks = new[] { new TrackInfoTestExpected @@ -489,8 +489,8 @@ public class Nero : OpticalMediaImageTest TestFile = "report_dvdrom.nrg", MediaType = MediaType.DVDROM, Sectors = 2146357, - MD5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", - LongMD5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", + Md5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", + LongMd5 = "5e1841b7cd6ac0a95b8ae6f110fd89f2", Tracks = new[] { new TrackInfoTestExpected @@ -519,9 +519,9 @@ public class Nero : OpticalMediaImageTest TestFile = "report_enhancedcd.nrg", MediaType = MediaType.CDPLUS, Sectors = 303316, - MD5 = "31d07fe62a6505c1d15a88d2c264f3b5", - LongMD5 = "916333b50640479f0c989997bb6de629", - SubchannelMD5 = "UNKNOWN", + Md5 = "31d07fe62a6505c1d15a88d2c264f3b5", + LongMd5 = "916333b50640479f0c989997bb6de629", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected @@ -654,9 +654,9 @@ public class Nero : OpticalMediaImageTest TestFile = "test_multi_karaoke_sampler.nrg", MediaType = MediaType.CDROMXA, Sectors = 329158, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", - SubchannelMD5 = "UNKNOWN", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", + SubchannelMd5 = "UNKNOWN", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/Virtual98.cs b/Aaru.Tests/Images/Virtual98.cs index 26cbd518d..a6367559d 100644 --- a/Aaru.Tests/Images/Virtual98.cs +++ b/Aaru.Tests/Images/Virtual98.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class Virtual98 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98"); - public override IMediaImage _plugin => new DiscImages.Virtual98(); + public override IMediaImage Plugin => new DiscImages.Virtual98(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 524288, SectorSize = 256, - MD5 = "be3693b92a5242101e80087611b33092" + Md5 = "be3693b92a5242101e80087611b33092" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 81920, SectorSize = 256, - MD5 = "811b2a9d08abbecf4cb75531d5e51808" + Md5 = "811b2a9d08abbecf4cb75531d5e51808" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1048576, SectorSize = 256, - MD5 = "cf4375422f50d62e163d697a18542eca" + Md5 = "cf4375422f50d62e163d697a18542eca" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 167936, SectorSize = 256, - MD5 = "fe4fc08015f1e3a4562e8e867107b561" + Md5 = "fe4fc08015f1e3a4562e8e867107b561" }, new BlockImageTestExpected { @@ -79,7 +79,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2097152, SectorSize = 256, - MD5 = "afb49485f0ef2b39e8377c1fe880e77b" + Md5 = "afb49485f0ef2b39e8377c1fe880e77b" }, new BlockImageTestExpected { @@ -87,7 +87,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 266240, SectorSize = 256, - MD5 = "9e4c0bc8bc955b1a21a94df0f7bec3ab" + Md5 = "9e4c0bc8bc955b1a21a94df0f7bec3ab" }, new BlockImageTestExpected { @@ -95,7 +95,7 @@ public class Virtual98 : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 327680, SectorSize = 256, - MD5 = "f5906261c390ea5c5a0e46864fb066cd" + Md5 = "f5906261c390ea5c5a0e46864fb066cd" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs index 51073ff8b..1aec88a3d 100644 --- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs +++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs @@ -39,7 +39,7 @@ public class VirtualPc : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualBox", "VirtualPC"); - public override IMediaImage _plugin => new Vhd(); + public override IMediaImage Plugin => new Vhd(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 512000, SectorSize = 512, - MD5 = "ab3248888d6f10ef30a084fac6a1e2fd" + Md5 = "ab3248888d6f10ef30a084fac6a1e2fd" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20480, SectorSize = 512, - MD5 = "f1c9645dbc14efddc7d8a322685f26eb" + Md5 = "f1c9645dbc14efddc7d8a322685f26eb" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 512000, SectorSize = 512, - MD5 = "ab3248888d6f10ef30a084fac6a1e2fd" + Md5 = "ab3248888d6f10ef30a084fac6a1e2fd" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20480, SectorSize = 512, - MD5 = "f1c9645dbc14efddc7d8a322685f26eb" + Md5 = "f1c9645dbc14efddc7d8a322685f26eb" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 512000, SectorSize = 512, - MD5 = "ab3248888d6f10ef30a084fac6a1e2fd" + Md5 = "ab3248888d6f10ef30a084fac6a1e2fd" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20480, SectorSize = 512, - MD5 = "f1c9645dbc14efddc7d8a322685f26eb" + Md5 = "f1c9645dbc14efddc7d8a322685f26eb" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/VirtualPC/Raw.cs b/Aaru.Tests/Images/VirtualPC/Raw.cs index bd0496068..1f82ef2a3 100644 --- a/Aaru.Tests/Images/VirtualPC/Raw.cs +++ b/Aaru.Tests/Images/VirtualPC/Raw.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 307024, SectorSize = 512, - MD5 = "56eb1b7a4ea849e93de35f48b8912cd1" + Md5 = "56eb1b7a4ea849e93de35f48b8912cd1" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 102306, SectorSize = 512, - MD5 = "f05abd9ff39f6b7e39834724b52a49e1" + Md5 = "f05abd9ff39f6b7e39834724b52a49e1" }, new BlockImageTestExpected { @@ -64,7 +64,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 62356, SectorSize = 512, - MD5 = "46d5f39b1169a2721863b71e2944e3c2" + Md5 = "46d5f39b1169a2721863b71e2944e3c2" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 61404, SectorSize = 512, - MD5 = "86b522d83ab057fa76eab0941357e1f6" + Md5 = "86b522d83ab057fa76eab0941357e1f6" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 266016, SectorSize = 512, - MD5 = "5f4d4c4f268ea19c91bf4fb49f4894b6", + Md5 = "5f4d4c4f268ea19c91bf4fb49f4894b6", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs index 85b9b9488..2847fdaf7 100644 --- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs +++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class VirtualPc : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC"); - public override IMediaImage _plugin => new Vhd(); + public override IMediaImage Plugin => new Vhd(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 261936, SectorSize = 512, - MD5 = "cc634bb9bbf2dcdd88cfe251390e2049", + Md5 = "cc634bb9bbf2dcdd88cfe251390e2049", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 261936, SectorSize = 512, - MD5 = "0b6f655387e101c0249e922b1714a484", + Md5 = "0b6f655387e101c0249e922b1714a484", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +80,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1052352, SectorSize = 512, - MD5 = "12ebc62199ecaae97efe406ee891d68f", + Md5 = "12ebc62199ecaae97efe406ee891d68f", Partitions = new[] { new BlockPartitionVolumes @@ -96,7 +96,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1052352, SectorSize = 512, - MD5 = "4943fc799eddd6f386b2923847824ffc", + Md5 = "4943fc799eddd6f386b2923847824ffc", Partitions = new[] { new BlockPartitionVolumes @@ -112,7 +112,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "a6041066df8f52f5d14b8200766d6bb5" + Md5 = "a6041066df8f52f5d14b8200766d6bb5" }, new BlockImageTestExpected { @@ -120,7 +120,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20468, SectorSize = 512, - MD5 = "1c843b778d48a67b78e4ca65ab602673" + Md5 = "1c843b778d48a67b78e4ca65ab602673" }, new BlockImageTestExpected { @@ -128,7 +128,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "e924cd1bbb16f6a6056f81df410922ae" + Md5 = "e924cd1bbb16f6a6056f81df410922ae" }, new BlockImageTestExpected { @@ -136,7 +136,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20468, SectorSize = 512, - MD5 = "b790693b1c94bed209ee1bb9d0b6a075" + Md5 = "b790693b1c94bed209ee1bb9d0b6a075" }, new BlockImageTestExpected { @@ -144,7 +144,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "1f9e3dc39db37a9e01fede6a12844222" + Md5 = "1f9e3dc39db37a9e01fede6a12844222" }, new BlockImageTestExpected { @@ -152,7 +152,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "943a9da318111f50a92c3f2314fad1e0" + Md5 = "943a9da318111f50a92c3f2314fad1e0" }, new BlockImageTestExpected { @@ -160,7 +160,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20468, SectorSize = 512, - MD5 = "4b4e98a5bba2469382132f9289ae1c57" + Md5 = "4b4e98a5bba2469382132f9289ae1c57" }, new BlockImageTestExpected { @@ -168,7 +168,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "1f9e3dc39db37a9e01fede6a12844222" + Md5 = "1f9e3dc39db37a9e01fede6a12844222" }, new BlockImageTestExpected { @@ -176,7 +176,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20468, SectorSize = 512, - MD5 = "4b4e98a5bba2469382132f9289ae1c57" + Md5 = "4b4e98a5bba2469382132f9289ae1c57" }, new BlockImageTestExpected { @@ -184,7 +184,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 31456656, SectorSize = 512, - MD5 = "df41b76f8532fc8ef775f89212191244" + Md5 = "df41b76f8532fc8ef775f89212191244" }, new BlockImageTestExpected { @@ -192,7 +192,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 511056, SectorSize = 512, - MD5 = "1f9e3dc39db37a9e01fede6a12844222" + Md5 = "1f9e3dc39db37a9e01fede6a12844222" }, new BlockImageTestExpected { @@ -200,7 +200,7 @@ public class VirtualPc : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 20468, SectorSize = 512, - MD5 = "4b4e98a5bba2469382132f9289ae1c57" + Md5 = "4b4e98a5bba2469382132f9289ae1c57" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs index 72cc225fc..1a0d49b5c 100644 --- a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs +++ b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class nosub : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "nosub"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,8 +51,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", Tracks = new[] { new TrackInfoTestExpected @@ -173,8 +175,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -211,8 +213,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -249,8 +251,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -281,8 +283,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw.cs index 16eefcd15..4d707d136 100644 --- a/Aaru.Tests/Images/cdrdao/cooked/rw.cs +++ b/Aaru.Tests/Images/cdrdao/cooked/rw.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class rw : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +51,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "d62fd0cdca05b4b42f7c17b316610e15", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "d62fd0cdca05b4b42f7c17b316610e15", Tracks = new[] { new TrackInfoTestExpected @@ -174,9 +176,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "e89c610fbf1093480603de7e4b5fe99b", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "e89c610fbf1093480603de7e4b5fe99b", Tracks = new[] { new TrackInfoTestExpected @@ -213,9 +215,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "7e67d6238f1cda44cb491e5f590f5794", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "7e67d6238f1cda44cb491e5f590f5794", Tracks = new[] { new TrackInfoTestExpected @@ -252,9 +254,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "2ec808f5618ef407ae1f49cb23648914", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "2ec808f5618ef407ae1f49cb23648914", Tracks = new[] { new TrackInfoTestExpected @@ -285,9 +287,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", - SubchannelMD5 = "6841e5744d8301c219742ecd61fd9ac4", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", + SubchannelMd5 = "6841e5744d8301c219742ecd61fd9ac4", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs index af4f8b5b8..468db75f4 100644 --- a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs +++ b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class rw_raw : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw_raw"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +51,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "e68088c7f1236c2304778e976057bd6e", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "e68088c7f1236c2304778e976057bd6e", Tracks = new[] { new TrackInfoTestExpected @@ -174,9 +176,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "8ed5c39d7435aeac23e77478625f14f1", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "8ed5c39d7435aeac23e77478625f14f1", Tracks = new[] { new TrackInfoTestExpected @@ -213,9 +215,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "0ba3fa223e887fb955458fc7b40b0396", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "0ba3fa223e887fb955458fc7b40b0396", Tracks = new[] { new TrackInfoTestExpected @@ -252,9 +254,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "eaf6dcfb86e9aca9856d736f3b04c765", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "eaf6dcfb86e9aca9856d736f3b04c765", Tracks = new[] { new TrackInfoTestExpected @@ -285,9 +287,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", - SubchannelMD5 = "7ac088d8a737d8d39b1cced86d11c7b5", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", + SubchannelMd5 = "7ac088d8a737d8d39b1cced86d11c7b5", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/cdrdao/raw/nosub.cs b/Aaru.Tests/Images/cdrdao/raw/nosub.cs index 682175ad8..9a25c39a1 100644 --- a/Aaru.Tests/Images/cdrdao/raw/nosub.cs +++ b/Aaru.Tests/Images/cdrdao/raw/nosub.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.raw; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class nosub : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "nosub"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,8 +51,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", Tracks = new[] { new TrackInfoTestExpected @@ -173,8 +175,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -211,8 +213,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", Tracks = new[] { new TrackInfoTestExpected @@ -249,8 +251,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", Tracks = new[] { new TrackInfoTestExpected @@ -281,8 +283,8 @@ public class nosub : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/cdrdao/raw/rw.cs b/Aaru.Tests/Images/cdrdao/raw/rw.cs index 7b9d5376b..bb8ec7bde 100644 --- a/Aaru.Tests/Images/cdrdao/raw/rw.cs +++ b/Aaru.Tests/Images/cdrdao/raw/rw.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.raw; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class rw : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -49,9 +51,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - LongMD5 = "c09f408a4416634d8ac1c1ffd0ed75a5", - SubchannelMD5 = "2dc7b6159f8ba4fc8c1c58407d7741ba", + Md5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + LongMd5 = "c09f408a4416634d8ac1c1ffd0ed75a5", + SubchannelMd5 = "2dc7b6159f8ba4fc8c1c58407d7741ba", Tracks = new[] { new TrackInfoTestExpected @@ -174,9 +176,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "5bdb9b11d8bc01867f629134ee635f90", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "5bdb9b11d8bc01867f629134ee635f90", Tracks = new[] { new TrackInfoTestExpected @@ -213,9 +215,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "2cee3bd721e3ecee6f426cbe7c7026c2", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "2cee3bd721e3ecee6f426cbe7c7026c2", Tracks = new[] { new TrackInfoTestExpected @@ -252,9 +254,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "7e39b9ba733af2efefcc4297ec01e66e", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "7e39b9ba733af2efefcc4297ec01e66e", Tracks = new[] { new TrackInfoTestExpected @@ -285,9 +287,9 @@ public class rw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "d38c92fe94f3c3ac3c7799ff9866e46b", - LongMD5 = "40b4ea8170056ea27190fd0bdaec3a6c", - SubchannelMD5 = "24d557ef2fafe96991d9a15474e27eae", + Md5 = "d38c92fe94f3c3ac3c7799ff9866e46b", + LongMd5 = "40b4ea8170056ea27190fd0bdaec3a6c", + SubchannelMd5 = "24d557ef2fafe96991d9a15474e27eae", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs index a22227fa7..043405f90 100644 --- a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs +++ b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.cdrdao.raw; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,11 +36,12 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class rw_raw : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw_raw"); - public override IMediaImage _plugin => new Cdrdao(); + public override IMediaImage Plugin => new Cdrdao(); public override OpticalImageTestExpected[] Tests => new[] { @@ -48,9 +50,9 @@ public class rw_raw : OpticalMediaImageTest TestFile = "gigarec.toc", MediaType = MediaType.CDROM, Sectors = 469652, - MD5 = "cafcd998298d8d1d447ab2e567638c9e", - LongMD5 = "092b4207604685c6b274068b6eca52c0", - SubchannelMD5 = "607c53d8ea5589bbc8a3e4ff5857cb5d", + Md5 = "cafcd998298d8d1d447ab2e567638c9e", + LongMd5 = "092b4207604685c6b274068b6eca52c0", + SubchannelMd5 = "607c53d8ea5589bbc8a3e4ff5857cb5d", Tracks = new[] { new TrackInfoTestExpected @@ -80,9 +82,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDDA, Sectors = 247073, SectorSize = 2352, - MD5 = "1787cdeab550752d159a8ecca62fe386", - LongMD5 = "1787cdeab550752d159a8ecca62fe386", - SubchannelMD5 = "4fa3d7dd5e1710878ac318986a677fb3", + Md5 = "1787cdeab550752d159a8ecca62fe386", + LongMd5 = "1787cdeab550752d159a8ecca62fe386", + SubchannelMd5 = "4fa3d7dd5e1710878ac318986a677fb3", Tracks = new[] { new TrackInfoTestExpected @@ -205,9 +207,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "d81b6abcfa5f84ba0647f38f86cc8fc8", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "d81b6abcfa5f84ba0647f38f86cc8fc8", Tracks = new[] { new TrackInfoTestExpected @@ -244,9 +246,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 254265, SectorSize = 2048, - MD5 = "bf4bbec517101d0d6f45d2e4d50cb875", - LongMD5 = "3d3f9cf7d1ba2249b1e7960071e5af46", - SubchannelMD5 = "935c5d899c1cf0e46fa571df99400253", + Md5 = "bf4bbec517101d0d6f45d2e4d50cb875", + LongMd5 = "3d3f9cf7d1ba2249b1e7960071e5af46", + SubchannelMd5 = "935c5d899c1cf0e46fa571df99400253", Tracks = new[] { new TrackInfoTestExpected @@ -283,9 +285,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 308224, SectorSize = 2048, - MD5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", - LongMD5 = "3af5f943ddb9427d9c63a4ce3b704db9", - SubchannelMD5 = "2e9b8107254e46b7be689105f680ee84", + Md5 = "1e55aa420ca8f8ea77d5b597c9cfc19b", + LongMd5 = "3af5f943ddb9427d9c63a4ce3b704db9", + SubchannelMd5 = "2e9b8107254e46b7be689105f680ee84", Tracks = new[] { new TrackInfoTestExpected @@ -315,9 +317,9 @@ public class rw_raw : OpticalMediaImageTest TestFile = "test_enhancedcd.toc", MediaType = MediaType.CDDA, Sectors = 28953, - MD5 = "08629b564dc094927b657b8b9d2106d6", - LongMD5 = "08629b564dc094927b657b8b9d2106d6", - SubchannelMD5 = "4747b7451c06564582940008522c40a4", + Md5 = "08629b564dc094927b657b8b9d2106d6", + LongMd5 = "08629b564dc094927b657b8b9d2106d6", + SubchannelMd5 = "4747b7451c06564582940008522c40a4", Tracks = new[] { new TrackInfoTestExpected @@ -344,9 +346,9 @@ public class rw_raw : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 329008, SectorSize = 2048, - MD5 = "f09312ba25a479fb81912a2965babd22", - LongMD5 = "f48603d11883593f45ec4a3824681e4e", - SubchannelMD5 = "ed0ca0f9bcdd0ebae2671549bf13311e", + Md5 = "f09312ba25a479fb81912a2965babd22", + LongMd5 = "f48603d11883593f45ec4a3824681e4e", + SubchannelMd5 = "ed0ca0f9bcdd0ebae2671549bf13311e", Tracks = new[] { new TrackInfoTestExpected @@ -495,9 +497,9 @@ public class rw_raw : OpticalMediaImageTest TestFile = "test_multisession.toc", MediaType = MediaType.CDROM, Sectors = 8133, - MD5 = "5a62e796e3d3224d4d7c4a94fa067947", - LongMD5 = "84ce0389b12772b371bf93b9ef9cd0d6", - SubchannelMD5 = "90f2548c86ea8fc9cde74ac89c01fad7", + Md5 = "5a62e796e3d3224d4d7c4a94fa067947", + LongMd5 = "84ce0389b12772b371bf93b9ef9cd0d6", + SubchannelMd5 = "90f2548c86ea8fc9cde74ac89c01fad7", Tracks = new[] { new TrackInfoTestExpected @@ -534,9 +536,9 @@ public class rw_raw : OpticalMediaImageTest TestFile = "test_videocd.toc", MediaType = MediaType.CDROMXA, Sectors = 48794, - MD5 = "e30dbde1dbb5a384e9005f148541abbe", - LongMD5 = "23e2214500204f2c42ca2989f928fea2", - SubchannelMD5 = "f738847620ace3f333dbc305321820a1", + Md5 = "e30dbde1dbb5a384e9005f148541abbe", + LongMd5 = "23e2214500204f2c42ca2989f928fea2", + SubchannelMd5 = "f738847620ace3f333dbc305321820a1", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Images/partclone.cs b/Aaru.Tests/Images/partclone.cs index d266f1b73..03c8cfc7a 100644 --- a/Aaru.Tests/Images/partclone.cs +++ b/Aaru.Tests/Images/partclone.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Partclone : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone"); - public override IMediaImage _plugin => new PartClone(); + public override IMediaImage Plugin => new PartClone(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Partclone : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 127882, SectorSize = 4096, - MD5 = "ff239c91166b6b13fa826dd258b40666" + Md5 = "ff239c91166b6b13fa826dd258b40666" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class Partclone : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1012032, SectorSize = 512, - MD5 = "f98b1a51ca2e7bf047d84969a2392a3d", + Md5 = "f98b1a51ca2e7bf047d84969a2392a3d", Partitions = new[] { new BlockPartitionVolumes @@ -72,7 +72,7 @@ public class Partclone : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1023057, SectorSize = 512, - MD5 = "1b0b5eb965a401f16fa8a07e303cd1c0" + Md5 = "1b0b5eb965a401f16fa8a07e303cd1c0" /* TODO: NullReferenceException Partitions = new[] { @@ -90,7 +90,7 @@ public class Partclone : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 127882, SectorSize = 4096, - MD5 = "880a6777d05c496901e930684abbecff" + Md5 = "880a6777d05c496901e930684abbecff" }, new BlockImageTestExpected { @@ -98,7 +98,7 @@ public class Partclone : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 1023056, SectorSize = 512, - MD5 = "61cc3faa286364e7ad5bab18120c1151" + Md5 = "61cc3faa286364e7ad5bab18120c1151" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/pce/DiskCopy42.cs b/Aaru.Tests/Images/pce/DiskCopy42.cs index 57347f1f7..baac4ce1a 100644 --- a/Aaru.Tests/Images/pce/DiskCopy42.cs +++ b/Aaru.Tests/Images/pce/DiskCopy42.cs @@ -38,7 +38,7 @@ public class DiskCopy42 : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "DiskCopy 4.2"); - public override IMediaImage _plugin => new DiscImages.DiskCopy42(); + public override IMediaImage Plugin => new DiscImages.DiskCopy42(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "c5d92544c3e78b7f0a9b4baaa9a64eec", + Md5 = "c5d92544c3e78b7f0a9b4baaa9a64eec", Partitions = new[] { new BlockPartitionVolumes @@ -64,7 +64,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -80,7 +80,7 @@ public class DiskCopy42 : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "93e71b9ecdb39d3ec9245b4f451856d4", + Md5 = "93e71b9ecdb39d3ec9245b4f451856d4", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/pce/ImageDisk.cs b/Aaru.Tests/Images/pce/ImageDisk.cs index 71403aeb7..e8e5497b8 100644 --- a/Aaru.Tests/Images/pce/ImageDisk.cs +++ b/Aaru.Tests/Images/pce/ImageDisk.cs @@ -39,7 +39,7 @@ public class ImageDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "ImageDisk"); - public override IMediaImage _plugin => new Imd(); + public override IMediaImage Plugin => new Imd(); public override BlockImageTestExpected[] Tests => new[] { @@ -49,7 +49,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "8308e749af855a3ded48d474eb7c305e" + Md5 = "8308e749af855a3ded48d474eb7c305e" }, new BlockImageTestExpected { @@ -57,7 +57,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "b7b8a69b10ee4ec921aa8eea232fdd75" + Md5 = "b7b8a69b10ee4ec921aa8eea232fdd75" }, new BlockImageTestExpected { @@ -65,7 +65,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f4a77a2d2a1868dc18e8b92032d02fd2" + Md5 = "f4a77a2d2a1868dc18e8b92032d02fd2" }, new BlockImageTestExpected { @@ -73,7 +73,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "099d95ac42d1a8010f914ac64ede7a70" + Md5 = "099d95ac42d1a8010f914ac64ede7a70" }, new BlockImageTestExpected { @@ -81,7 +81,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_15, Sectors = 2400, SectorSize = 512, - MD5 = "3df7cd10044af75d77e8936af0dbf9ff" + Md5 = "3df7cd10044af75d77e8936af0dbf9ff" }, new BlockImageTestExpected { @@ -89,7 +89,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -105,7 +105,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "d75d3e79d9c5051922d4c2226fa4a6ff" + Md5 = "d75d3e79d9c5051922d4c2226fa4a6ff" }, new BlockImageTestExpected { @@ -113,7 +113,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ATARI_35_SS_DD_11, Sectors = 880, SectorSize = 512, - MD5 = "e16ed33a1a466826562c681d8bdf3e27" + Md5 = "e16ed33a1a466826562c681d8bdf3e27" }, new BlockImageTestExpected { @@ -121,7 +121,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" + Md5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" }, new BlockImageTestExpected { @@ -129,7 +129,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "fd48b2c12097cbc646b4a93ef4f92259" + Md5 = "fd48b2c12097cbc646b4a93ef4f92259" }, new BlockImageTestExpected { @@ -137,7 +137,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "512f7175e753e2e2ad620d448c42545d" + Md5 = "512f7175e753e2e2ad620d448c42545d" }, new BlockImageTestExpected { @@ -145,7 +145,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -161,7 +161,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "db9cfb6eea18820b7a7e0b5b45594471", + Md5 = "db9cfb6eea18820b7a7e0b5b45594471", Partitions = new[] { new BlockPartitionVolumes @@ -177,7 +177,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -193,7 +193,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1600, SectorSize = 512, - MD5 = "93e71b9ecdb39d3ec9245b4f451856d4" + Md5 = "93e71b9ecdb39d3ec9245b4f451856d4" }, new BlockImageTestExpected { @@ -201,7 +201,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -217,7 +217,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "854d0d49a522b64af698e319a24cd68e" + Md5 = "854d0d49a522b64af698e319a24cd68e" }, new BlockImageTestExpected { @@ -225,7 +225,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1812, SectorSize = 1024, - MD5 = "c741c78eecd673f8fc49e77459871940" + Md5 = "c741c78eecd673f8fc49e77459871940" }, new BlockImageTestExpected { @@ -233,7 +233,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3372, SectorSize = 512, - MD5 = "7f9164dc43bffc895db751ba1d9b55a9", + Md5 = "7f9164dc43bffc895db751ba1d9b55a9", Partitions = new[] { new BlockPartitionVolumes @@ -249,7 +249,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3448, SectorSize = 512, - MD5 = "d6ff5df3707887a6ba4cfdc30b3deff4" + Md5 = "d6ff5df3707887a6ba4cfdc30b3deff4" }, new BlockImageTestExpected { @@ -257,7 +257,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -273,7 +273,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2882, SectorSize = 2048, - MD5 = "f5fff7704fb677ebf23d27cd937c9403" + Md5 = "f5fff7704fb677ebf23d27cd937c9403" /* TODO: Division by zero because bytes per cluster is 0 Partitions = new[] { @@ -291,7 +291,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX01, Sectors = 2002, SectorSize = 128, - MD5 = "5b4e36d92b180c3845387391cb5a1c64" + Md5 = "5b4e36d92b180c3845387391cb5a1c64" }, new BlockImageTestExpected { @@ -299,7 +299,7 @@ public class ImageDisk : BlockMediaImageTest MediaType = MediaType.RX50, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/pce/TeleDisk.cs b/Aaru.Tests/Images/pce/TeleDisk.cs index f2f9a845c..b9d7ce17f 100644 --- a/Aaru.Tests/Images/pce/TeleDisk.cs +++ b/Aaru.Tests/Images/pce/TeleDisk.cs @@ -37,7 +37,7 @@ using NUnit.Framework; public class TeleDisk : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "TeleDisk"); - public override IMediaImage _plugin => new DiscImages.TeleDisk(); + public override IMediaImage Plugin => new DiscImages.TeleDisk(); public override BlockImageTestExpected[] Tests => new[] { @@ -47,7 +47,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "8308e749af855a3ded48d474eb7c305e" + Md5 = "8308e749af855a3ded48d474eb7c305e" }, new BlockImageTestExpected { @@ -55,7 +55,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "b7b8a69b10ee4ec921aa8eea232fdd75" + Md5 = "b7b8a69b10ee4ec921aa8eea232fdd75" }, new BlockImageTestExpected { @@ -63,7 +63,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f4a77a2d2a1868dc18e8b92032d02fd2" + Md5 = "f4a77a2d2a1868dc18e8b92032d02fd2" }, new BlockImageTestExpected { @@ -71,7 +71,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "099d95ac42d1a8010f914ac64ede7a70" + Md5 = "099d95ac42d1a8010f914ac64ede7a70" }, new BlockImageTestExpected { @@ -79,7 +79,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.NEC_35_HD_8, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -95,7 +95,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "3df7cd10044af75d77e8936af0dbf9ff" + Md5 = "3df7cd10044af75d77e8936af0dbf9ff" }, new BlockImageTestExpected { @@ -103,7 +103,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "d75d3e79d9c5051922d4c2226fa4a6ff" + Md5 = "d75d3e79d9c5051922d4c2226fa4a6ff" }, new BlockImageTestExpected { @@ -111,7 +111,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 880, SectorSize = 512, - MD5 = "e16ed33a1a466826562c681d8bdf3e27" + Md5 = "e16ed33a1a466826562c681d8bdf3e27" }, new BlockImageTestExpected { @@ -119,7 +119,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "fd48b2c12097cbc646b4a93ef4f92259" + Md5 = "fd48b2c12097cbc646b4a93ef4f92259" }, new BlockImageTestExpected { @@ -127,7 +127,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "512f7175e753e2e2ad620d448c42545d" + Md5 = "512f7175e753e2e2ad620d448c42545d" }, new BlockImageTestExpected { @@ -135,7 +135,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.CBM_35_DD, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -151,7 +151,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "db9cfb6eea18820b7a7e0b5b45594471", + Md5 = "db9cfb6eea18820b7a7e0b5b45594471", Partitions = new[] { new BlockPartitionVolumes @@ -167,7 +167,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -183,7 +183,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -199,7 +199,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "854d0d49a522b64af698e319a24cd68e" + Md5 = "854d0d49a522b64af698e319a24cd68e" }, new BlockImageTestExpected { @@ -207,7 +207,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1148, SectorSize = 512, - MD5 = "4b88a3e43b57778422e8b1e851a9c902" + Md5 = "4b88a3e43b57778422e8b1e851a9c902" }, new BlockImageTestExpected { @@ -215,7 +215,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 1804, SectorSize = 512, - MD5 = "d032d928c43b66419b7404b016ec07ff" + Md5 = "d032d928c43b66419b7404b016ec07ff" }, new BlockImageTestExpected { @@ -223,7 +223,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 332, SectorSize = 512, - MD5 = "62b900808c3e9f91f8361fd1716155a1", + Md5 = "62b900808c3e9f91f8361fd1716155a1", Partitions = new[] { new BlockPartitionVolumes @@ -239,7 +239,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3444, SectorSize = 512, - MD5 = "9dea1e119a73a21a38d134f36b2e5564" + Md5 = "9dea1e119a73a21a38d134f36b2e5564" }, new BlockImageTestExpected { @@ -247,7 +247,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -263,7 +263,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 2880, SectorSize = 512, - MD5 = "b4a602f67903c46eef62addb0780aa56" + Md5 = "b4a602f67903c46eef62addb0780aa56" /* TODO: Division by zero because bytes per cluster is 0 Partitions = new[] { @@ -281,7 +281,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 640, SectorSize = 512, - MD5 = "57965378275db490527ff8c8fc517adf" + Md5 = "57965378275db490527ff8c8fc517adf" }, new BlockImageTestExpected { @@ -289,7 +289,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 640, SectorSize = 512, - MD5 = "728f9361203dc39961b1413aa050f70d" + Md5 = "728f9361203dc39961b1413aa050f70d" }, /* TODO: Not opening new BlockImageTestExpected @@ -306,7 +306,7 @@ public class TeleDisk : BlockMediaImageTest MediaType = MediaType.Unknown, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Images/pce/XDF.cs b/Aaru.Tests/Images/pce/XDF.cs index 5899f449a..71bdcd7d8 100644 --- a/Aaru.Tests/Images/pce/XDF.cs +++ b/Aaru.Tests/Images/pce/XDF.cs @@ -28,6 +28,7 @@ namespace Aaru.Tests.Images.pce; +using System.Diagnostics.CodeAnalysis; using System.IO; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; @@ -35,10 +36,11 @@ using Aaru.DiscImages; using NUnit.Framework; [TestFixture] +[SuppressMessage("ReSharper", "InconsistentNaming")] public class XDF : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +50,7 @@ public class XDF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "90e8f5022bff8fa90c5148ec35f5d64c" + Md5 = "90e8f5022bff8fa90c5148ec35f5d64c" }, new BlockImageTestExpected { @@ -56,7 +58,7 @@ public class XDF : BlockMediaImageTest MediaType = MediaType.XDF_35, Sectors = 3680, SectorSize = 512, - MD5 = "825ca9cdcb2f35ff8bbbda9cb0a27c4d" + Md5 = "825ca9cdcb2f35ff8bbbda9cb0a27c4d" } }; } \ No newline at end of file diff --git a/Aaru.Tests/Images/pce/raw.cs b/Aaru.Tests/Images/pce/raw.cs index daf41e4bd..471a2e6b0 100644 --- a/Aaru.Tests/Images/pce/raw.cs +++ b/Aaru.Tests/Images/pce/raw.cs @@ -38,7 +38,7 @@ using NUnit.Framework; public class Raw : BlockMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw"); - public override IMediaImage _plugin => new ZZZRawImage(); + public override IMediaImage Plugin => new ZZZRawImage(); public override BlockImageTestExpected[] Tests => new[] { @@ -48,7 +48,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_8, Sectors = 320, SectorSize = 512, - MD5 = "8308e749af855a3ded48d474eb7c305e" + Md5 = "8308e749af855a3ded48d474eb7c305e" }, new BlockImageTestExpected { @@ -56,7 +56,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_SS_DD_9, Sectors = 360, SectorSize = 512, - MD5 = "b7b8a69b10ee4ec921aa8eea232fdd75" + Md5 = "b7b8a69b10ee4ec921aa8eea232fdd75" }, new BlockImageTestExpected { @@ -64,7 +64,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_8, Sectors = 640, SectorSize = 512, - MD5 = "f4a77a2d2a1868dc18e8b92032d02fd2" + Md5 = "f4a77a2d2a1868dc18e8b92032d02fd2" }, new BlockImageTestExpected { @@ -72,7 +72,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_DS_DD_9, Sectors = 720, SectorSize = 512, - MD5 = "099d95ac42d1a8010f914ac64ede7a70" + Md5 = "099d95ac42d1a8010f914ac64ede7a70" }, new BlockImageTestExpected { @@ -80,7 +80,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_525_HD, Sectors = 2400, SectorSize = 512, - MD5 = "3df7cd10044af75d77e8936af0dbf9ff" + Md5 = "3df7cd10044af75d77e8936af0dbf9ff" }, new BlockImageTestExpected { @@ -88,7 +88,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.SHARP_525, Sectors = 1232, SectorSize = 1024, - MD5 = "fd54916f713d01b670c1a5df5e74a97f", + Md5 = "fd54916f713d01b670c1a5df5e74a97f", Partitions = new[] { new BlockPartitionVolumes @@ -104,7 +104,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "d75d3e79d9c5051922d4c2226fa4a6ff" + Md5 = "d75d3e79d9c5051922d4c2226fa4a6ff" }, new BlockImageTestExpected { @@ -112,7 +112,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ATARI_35_SS_DD_11, Sectors = 880, SectorSize = 512, - MD5 = "e16ed33a1a466826562c681d8bdf3e27" + Md5 = "e16ed33a1a466826562c681d8bdf3e27" }, new BlockImageTestExpected { @@ -120,7 +120,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" + Md5 = "c5d92544c3e78b7f0a9b4baaa9a64eec" }, new BlockImageTestExpected { @@ -128,7 +128,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "fd48b2c12097cbc646b4a93ef4f92259" + Md5 = "fd48b2c12097cbc646b4a93ef4f92259" }, new BlockImageTestExpected { @@ -136,7 +136,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.CBM_AMIGA_35_DD, Sectors = 1760, SectorSize = 512, - MD5 = "512f7175e753e2e2ad620d448c42545d" + Md5 = "512f7175e753e2e2ad620d448c42545d" }, new BlockImageTestExpected { @@ -144,7 +144,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "c533488a21098a62c85f1649abda2803", + Md5 = "c533488a21098a62c85f1649abda2803", Partitions = new[] { new BlockPartitionVolumes @@ -160,7 +160,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "db9cfb6eea18820b7a7e0b5b45594471", + Md5 = "db9cfb6eea18820b7a7e0b5b45594471", Partitions = new[] { new BlockPartitionVolumes @@ -176,7 +176,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.FDFORMAT_35_DD, Sectors = 1640, SectorSize = 512, - MD5 = "456390a9c6ab05cb458a03c47296de08", + Md5 = "456390a9c6ab05cb458a03c47296de08", Partitions = new[] { new BlockPartitionVolumes @@ -192,7 +192,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonyDS, Sectors = 1600, SectorSize = 512, - MD5 = "93e71b9ecdb39d3ec9245b4f451856d4" + Md5 = "93e71b9ecdb39d3ec9245b4f451856d4" }, new BlockImageTestExpected { @@ -200,7 +200,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.DOS_35_DS_DD_9, Sectors = 1440, SectorSize = 512, - MD5 = "de3f85896f771b7e5bc4c9e3926d64e4", + Md5 = "de3f85896f771b7e5bc4c9e3926d64e4", Partitions = new[] { new BlockPartitionVolumes @@ -216,7 +216,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ECMA_147, Sectors = 5760, SectorSize = 512, - MD5 = "854d0d49a522b64af698e319a24cd68e" + Md5 = "854d0d49a522b64af698e319a24cd68e" }, new BlockImageTestExpected { @@ -224,7 +224,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3605, SectorSize = 512, - MD5 = "c741c78eecd673f8fc49e77459871940" + Md5 = "c741c78eecd673f8fc49e77459871940" }, new BlockImageTestExpected { @@ -232,7 +232,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3768, SectorSize = 512, - MD5 = "0393fbfee10e47c71e0fb7b39237be49" + Md5 = "0393fbfee10e47c71e0fb7b39237be49" }, new BlockImageTestExpected { @@ -240,7 +240,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3372, SectorSize = 512, - MD5 = "7f9164dc43bffc895db751ba1d9b55a9", + Md5 = "7f9164dc43bffc895db751ba1d9b55a9", Partitions = new[] { new BlockPartitionVolumes @@ -256,7 +256,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3448, SectorSize = 512, - MD5 = "d6ff5df3707887a6ba4cfdc30b3deff4" + Md5 = "d6ff5df3707887a6ba4cfdc30b3deff4" }, new BlockImageTestExpected { @@ -264,7 +264,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 3486, SectorSize = 512, - MD5 = "dbd52e9e684f97d9e2292811242bb24e", + Md5 = "dbd52e9e684f97d9e2292811242bb24e", Partitions = new[] { new BlockPartitionVolumes @@ -280,7 +280,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.GENERIC_HDD, Sectors = 2888, SectorSize = 512, - MD5 = "f5fff7704fb677ebf23d27cd937c9403" + Md5 = "f5fff7704fb677ebf23d27cd937c9403" /* TODO: Division by zero because bytes per cluster is 0 Partitions = new[] { @@ -315,7 +315,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.ECMA_54, Sectors = 2002, SectorSize = 128, - MD5 = "5b4e36d92b180c3845387391cb5a1c64" + Md5 = "5b4e36d92b180c3845387391cb5a1c64" }, new BlockImageTestExpected { @@ -323,7 +323,7 @@ public class Raw : BlockMediaImageTest MediaType = MediaType.AppleSonySS, Sectors = 800, SectorSize = 512, - MD5 = "ccd4431139755c58f340681f63510642", + Md5 = "ccd4431139755c58f340681f63510642", Partitions = new[] { new BlockPartitionVolumes diff --git a/Aaru.Tests/Issues/448.cs b/Aaru.Tests/Issues/448.cs index a7947c7dd..ba610e1d6 100644 --- a/Aaru.Tests/Issues/448.cs +++ b/Aaru.Tests/Issues/448.cs @@ -9,7 +9,7 @@ using BlindWrite5 = Aaru.DiscImages.BlindWrite5; public class _448 : OpticalMediaImageTest { public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue448"); - public override IMediaImage _plugin => new BlindWrite5(); + public override IMediaImage Plugin => new BlindWrite5(); public override OpticalImageTestExpected[] Tests => new[] { @@ -19,8 +19,8 @@ public class _448 : OpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 255, SectorSize = 2048, - LongMD5 = "1bea7f781be0fb3b878de96e965c53a0", - SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c", + LongMd5 = "1bea7f781be0fb3b878de96e965c53a0", + SubchannelMd5 = "01fef9f42fe53e6256ba713ad237dc8c", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Issues/542/SimsEP.cs b/Aaru.Tests/Issues/542/SimsEP.cs index 6c65ae4ac..a7e2619d5 100644 --- a/Aaru.Tests/Issues/542/SimsEP.cs +++ b/Aaru.Tests/Issues/542/SimsEP.cs @@ -5,6 +5,7 @@ namespace Aaru.Tests.Issues._542; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.IO; /* https://github.com/aaru-dps/Aaru/issues/542 @@ -14,6 +15,7 @@ using System.IO; * When extracting an image of a SafeDisc protected CD, most files aren't properly extracted. */ +[SuppressMessage("ReSharper", "InconsistentNaming")] public class SimsEP : FsExtractHashIssueTest { protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "exp"); diff --git a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs index 047a21a32..3ef8094e7 100644 --- a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs +++ b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs @@ -5,6 +5,7 @@ namespace Aaru.Tests.Issues._590; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.IO; /* https://github.com/aaru-dps/Aaru/issues/590 @@ -14,6 +15,7 @@ using System.IO; * Other images seemingly affected by the same bug */ +[SuppressMessage("ReSharper", "InconsistentNaming")] public class asus_driver_gpu_tweak_v1231_2014 : FsExtractHashIssueTest { protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", diff --git a/Aaru.Tests/Issues/590/m5a99fx.cs b/Aaru.Tests/Issues/590/m5a99fx.cs index 5830bef11..01ab434be 100644 --- a/Aaru.Tests/Issues/590/m5a99fx.cs +++ b/Aaru.Tests/Issues/590/m5a99fx.cs @@ -5,6 +5,7 @@ namespace Aaru.Tests.Issues._590; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.IO; /* https://github.com/aaru-dps/Aaru/issues/590 @@ -14,6 +15,7 @@ using System.IO; * When extracting the files from a specific image, Aaru hangs without crashing. */ +[SuppressMessage("ReSharper", "InconsistentNaming")] public class m5a99fx : FsExtractHashIssueTest { protected override string DataFolder => diff --git a/Aaru.Tests/Issues/590/win3.cs b/Aaru.Tests/Issues/590/win3.cs index b0697aa61..ba82bd7f4 100644 --- a/Aaru.Tests/Issues/590/win3.cs +++ b/Aaru.Tests/Issues/590/win3.cs @@ -5,6 +5,7 @@ namespace Aaru.Tests.Issues._590; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.IO; /* https://github.com/aaru-dps/Aaru/issues/590 @@ -14,6 +15,7 @@ using System.IO; * When extracting the files from a specific image, Aaru hangs without crashing. */ +[SuppressMessage("ReSharper", "InconsistentNaming")] public class win3 : FsExtractHashIssueTest { protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "win3"); diff --git a/Aaru.Tests/Issues/623.cs b/Aaru.Tests/Issues/623.cs index 2d0580908..38fcce06f 100644 --- a/Aaru.Tests/Issues/623.cs +++ b/Aaru.Tests/Issues/623.cs @@ -20,8 +20,8 @@ public class _623 : WritableOpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 255, SectorSize = 2048, - LongMD5 = "1bea7f781be0fb3b878de96e965c53a0", - SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c", + LongMd5 = "1bea7f781be0fb3b878de96e965c53a0", + SubchannelMd5 = "01fef9f42fe53e6256ba713ad237dc8c", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Issues/624.cs b/Aaru.Tests/Issues/624.cs index fd4f223af..89268d9ed 100644 --- a/Aaru.Tests/Issues/624.cs +++ b/Aaru.Tests/Issues/624.cs @@ -20,8 +20,8 @@ public class _624 : WritableOpticalMediaImageTest MediaType = MediaType.CD, Sectors = 255, SectorSize = 2048, - LongMD5 = "1bea7f781be0fb3b878de96e965c53a0", - SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c", + LongMd5 = "1bea7f781be0fb3b878de96e965c53a0", + SubchannelMd5 = "01fef9f42fe53e6256ba713ad237dc8c", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Issues/625.cs b/Aaru.Tests/Issues/625.cs index 8e5e94b7d..e6ca84738 100644 --- a/Aaru.Tests/Issues/625.cs +++ b/Aaru.Tests/Issues/625.cs @@ -20,8 +20,8 @@ public class _625 : WritableOpticalMediaImageTest MediaType = MediaType.CDROM, Sectors = 255, SectorSize = 2048, - LongMD5 = "1bea7f781be0fb3b878de96e965c53a0", - SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c", + LongMd5 = "1bea7f781be0fb3b878de96e965c53a0", + SubchannelMd5 = "01fef9f42fe53e6256ba713ad237dc8c", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/Issues/FsExtractHashIssueTest.cs b/Aaru.Tests/Issues/FsExtractHashIssueTest.cs index a44e72564..e6071d12c 100644 --- a/Aaru.Tests/Issues/FsExtractHashIssueTest.cs +++ b/Aaru.Tests/Issues/FsExtractHashIssueTest.cs @@ -239,7 +239,7 @@ public abstract class FsExtractHashIssueTest string calculatedMd5 = Md5Context.Data(outBuf, out _); - Assert.AreEqual(fileData.MD5, calculatedMd5, $"Invalid checksum for file {path + "/" + entry}"); + Assert.AreEqual(fileData.Md5, calculatedMd5, $"Invalid checksum for file {path + "/" + entry}"); } } } \ No newline at end of file diff --git a/Aaru.Tests/Structs.cs b/Aaru.Tests/Structs.cs index 77adec52e..49080638e 100644 --- a/Aaru.Tests/Structs.cs +++ b/Aaru.Tests/Structs.cs @@ -48,7 +48,7 @@ public class FileSystemTest : MediaInfoTest public class BlockImageTestExpected : MediaInfoTest { - public string MD5; + public string Md5; public BlockPartitionVolumes[] Partitions; } @@ -65,8 +65,8 @@ public class TrackInfoTestExpected public class OpticalImageTestExpected : BlockImageTestExpected { - public string LongMD5; - public string SubchannelMD5; + public string LongMd5; + public string SubchannelMd5; public TrackInfoTestExpected[] Tracks; } @@ -98,7 +98,7 @@ public class FileData public Dictionary Children { get; set; } public FileEntryInfo Info { get; set; } public string LinkTarget { get; set; } - public string MD5 { get; set; } + public string Md5 { get; set; } public Dictionary XattrsWithMd5 { get; set; } } diff --git a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs index 9af2e663a..2cbd7d0b6 100644 --- a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs +++ b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs @@ -20,9 +20,9 @@ public class FromAaru : WritableOpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs index 6987e9872..9d167fcec 100644 --- a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs +++ b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs @@ -20,9 +20,9 @@ public class FromAaru : WritableOpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs index cae0a7cfe..fa6989def 100644 --- a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs +++ b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs @@ -20,9 +20,9 @@ public class FromAaru : WritableOpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs index 6ef3a44f2..4e9179a25 100644 --- a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs +++ b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs @@ -20,9 +20,9 @@ public class FromAaru : WritableOpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs index ba6deda87..454120098 100644 --- a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs +++ b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs @@ -20,9 +20,9 @@ public class FromAaru : WritableOpticalMediaImageTest MediaType = MediaType.CDR, Sectors = 51168, SectorSize = 2048, - MD5 = "e2e19cf38891e67a0829d01842b4052e", - LongMD5 = "b31f2d228dd564c88ad851b12b43c01d", - SubchannelMD5 = "989c696ee5bb336b4ad30474da573925", + Md5 = "e2e19cf38891e67a0829d01842b4052e", + LongMd5 = "b31f2d228dd564c88ad851b12b43c01d", + SubchannelMd5 = "989c696ee5bb336b4ad30474da573925", Tracks = new[] { new TrackInfoTestExpected diff --git a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs index 7ac09c16c..4fddbfbce 100644 --- a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs +++ b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs @@ -586,7 +586,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest } } - Assert.AreEqual(@long ? test.LongMD5 : test.MD5, ctx.End(), + Assert.AreEqual(@long ? test.LongMd5 : test.Md5, ctx.End(), $"{(@long ? "Long hash (output)" : "Hash (output)")}: {testFile}"); } @@ -626,7 +626,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest } } - Assert.AreEqual(test.SubchannelMD5, ctx.End(), $"Subchannel hash (output): {testFile}"); + Assert.AreEqual(test.SubchannelMd5, ctx.End(), $"Subchannel hash (output): {testFile}"); } }); }