diff --git a/DiscImageChef.Tests/Filesystems/AFFS.cs b/DiscImageChef.Tests/Filesystems/AFFS.cs index 56dcb10e..7e389b3d 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS.cs @@ -85,7 +85,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AffsMbr { @@ -136,7 +136,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AffsMbrRdb { @@ -187,7 +187,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AffsRdb { diff --git a/DiscImageChef.Tests/Filesystems/AFS.cs b/DiscImageChef.Tests/Filesystems/AFS.cs index 847666ea..b15692c3 100644 --- a/DiscImageChef.Tests/Filesystems/AFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFS.cs @@ -97,7 +97,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AfsMbr { diff --git a/DiscImageChef.Tests/Filesystems/AOFS.cs b/DiscImageChef.Tests/Filesystems/AOFS.cs index a4e247ed..5316ba85 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS.cs @@ -85,7 +85,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AofsMbr { @@ -136,7 +136,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AofsMbrRdb { @@ -187,7 +187,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class AofsRdb { diff --git a/DiscImageChef.Tests/Filesystems/BeFS.cs b/DiscImageChef.Tests/Filesystems/BeFS.cs index d22bdfca..68350749 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS.cs @@ -142,6 +142,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class BeFsGpt { @@ -192,6 +193,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class BeFsMbr { diff --git a/DiscImageChef.Tests/Filesystems/COHERENT.cs b/DiscImageChef.Tests/Filesystems/COHERENT.cs index 2793aaca..2d98112a 100644 --- a/DiscImageChef.Tests/Filesystems/COHERENT.cs +++ b/DiscImageChef.Tests/Filesystems/COHERENT.cs @@ -92,6 +92,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class CoherentMbr { diff --git a/DiscImageChef.Tests/Filesystems/DTFS.cs b/DiscImageChef.Tests/Filesystems/DTFS.cs index 55939cb5..29039664 100644 --- a/DiscImageChef.Tests/Filesystems/DTFS.cs +++ b/DiscImageChef.Tests/Filesystems/DTFS.cs @@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class DtfsMbr { diff --git a/DiscImageChef.Tests/Filesystems/EAFS.cs b/DiscImageChef.Tests/Filesystems/EAFS.cs index 1fbf0763..6800c502 100644 --- a/DiscImageChef.Tests/Filesystems/EAFS.cs +++ b/DiscImageChef.Tests/Filesystems/EAFS.cs @@ -97,6 +97,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class EafsMbr { diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs index acb75ecf..a7b83112 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12.cs @@ -1735,6 +1735,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat12Apm { @@ -1788,6 +1789,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat12Gpt { @@ -1841,6 +1843,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat12Mbr { diff --git a/DiscImageChef.Tests/Filesystems/FAT16.cs b/DiscImageChef.Tests/Filesystems/FAT16.cs index 1995dfcf..979ea8f4 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16.cs @@ -142,6 +142,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat16Apm { @@ -195,6 +196,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat16Atari { @@ -248,6 +250,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat16Gpt { @@ -301,6 +304,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat16Mbr { @@ -415,6 +419,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat16Rdb { diff --git a/DiscImageChef.Tests/Filesystems/FAT32.cs b/DiscImageChef.Tests/Filesystems/FAT32.cs index 9094d7b2..e0f16e66 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32.cs @@ -89,6 +89,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat32Gpt { @@ -142,6 +143,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class Fat32Mbr { diff --git a/DiscImageChef.Tests/Filesystems/HFS.cs b/DiscImageChef.Tests/Filesystems/HFS.cs index 07fe016e..6e3cc6a3 100644 --- a/DiscImageChef.Tests/Filesystems/HFS.cs +++ b/DiscImageChef.Tests/Filesystems/HFS.cs @@ -97,6 +97,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsApm { @@ -188,6 +189,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsCdrom { @@ -244,6 +246,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsMbr { @@ -260,8 +263,7 @@ namespace DiscImageChef.Tests.Filesystems readonly int[] clustersize = {2048, 4096, 4096, 3584, 3584}; - readonly string[] volumename = - {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"}; + readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"}; readonly string[] volumeserial = {null, null, null, null, "81FE805D61458753"}; @@ -298,6 +300,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsRdb { diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus.cs b/DiscImageChef.Tests/Filesystems/HFSPlus.cs index 5241dd90..caf960e2 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus.cs @@ -123,6 +123,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsPlusGpt { @@ -176,6 +177,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + // Mising Darwin 6.0.2 wrapped [TestFixture] public class HfsPlusMbr diff --git a/DiscImageChef.Tests/Filesystems/HFSX.cs b/DiscImageChef.Tests/Filesystems/HFSX.cs index 7e17cace..62067059 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX.cs @@ -97,6 +97,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HfsxGpt { @@ -150,7 +151,8 @@ namespace DiscImageChef.Tests.Filesystems } } } - [TestFixture] + + [TestFixture] public class HfsxMbr { readonly string[] testfiles = @@ -208,5 +210,4 @@ namespace DiscImageChef.Tests.Filesystems } } } - } \ No newline at end of file diff --git a/DiscImageChef.Tests/Filesystems/HTFS.cs b/DiscImageChef.Tests/Filesystems/HTFS.cs index 7c5d578f..83c67fc9 100644 --- a/DiscImageChef.Tests/Filesystems/HTFS.cs +++ b/DiscImageChef.Tests/Filesystems/HTFS.cs @@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class HtfsMbr { diff --git a/DiscImageChef.Tests/Filesystems/ISO9660.cs b/DiscImageChef.Tests/Filesystems/ISO9660.cs index 033467fd..d6952988 100644 --- a/DiscImageChef.Tests/Filesystems/ISO9660.cs +++ b/DiscImageChef.Tests/Filesystems/ISO9660.cs @@ -30,6 +30,7 @@ using System.IO; using DiscImageChef.CommonTypes; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; +using DiscImageChef.Filesystems.ISO9660; using DiscImageChef.Filters; using NUnit.Framework; @@ -126,7 +127,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(mediatypes[i], image.ImageInfo.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.ImageInfo.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.SectorSize, testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.ISO9660.ISO9660(); + Filesystem fs = new ISO9660(); Partition wholePart = new Partition { Name = "Whole device", diff --git a/DiscImageChef.Tests/Filesystems/LisaFS.cs b/DiscImageChef.Tests/Filesystems/LisaFS.cs index c00a7281..e7318f96 100644 --- a/DiscImageChef.Tests/Filesystems/LisaFS.cs +++ b/DiscImageChef.Tests/Filesystems/LisaFS.cs @@ -30,6 +30,7 @@ using System.IO; using DiscImageChef.CommonTypes; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; +using DiscImageChef.Filesystems.LisaFS; using DiscImageChef.Filters; using NUnit.Framework; @@ -91,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(mediatypes[i], image.ImageInfo.MediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.ImageInfo.Sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.SectorSize, testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.LisaFS.LisaFS(); + Filesystem fs = new LisaFS(); Partition wholePart = new Partition { Name = "Whole device", diff --git a/DiscImageChef.Tests/Filesystems/MFS.cs b/DiscImageChef.Tests/Filesystems/MFS.cs index fdbfd9ed..247a1fba 100644 --- a/DiscImageChef.Tests/Filesystems/MFS.cs +++ b/DiscImageChef.Tests/Filesystems/MFS.cs @@ -59,8 +59,7 @@ namespace DiscImageChef.Tests.Filesystems readonly int[] clustersize = {1024, 1024, 1024, 1024, 1024}; - readonly string[] volumename = - {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"}; + readonly string[] volumename = {"Volume label", "Volume label", "Volume label", "Volume label", "Volume label"}; readonly string[] volumeserial = {null, null, null, null, null, null, null}; diff --git a/DiscImageChef.Tests/Filesystems/MINIX.cs b/DiscImageChef.Tests/Filesystems/MINIX.cs index 83338623..389ab80a 100644 --- a/DiscImageChef.Tests/Filesystems/MINIX.cs +++ b/DiscImageChef.Tests/Filesystems/MINIX.cs @@ -86,6 +86,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class MinixV1Mbr { @@ -132,6 +133,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class MinixV2 { @@ -182,6 +184,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class MinixV2Mbr { @@ -228,6 +231,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class MinixV3 { @@ -278,6 +282,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class MinixV3Mbr { diff --git a/DiscImageChef.Tests/Filesystems/NTFS.cs b/DiscImageChef.Tests/Filesystems/NTFS.cs index 274f42e4..55dd4db7 100644 --- a/DiscImageChef.Tests/Filesystems/NTFS.cs +++ b/DiscImageChef.Tests/Filesystems/NTFS.cs @@ -89,6 +89,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class NtfsMbr { diff --git a/DiscImageChef.Tests/Filesystems/QNX4.cs b/DiscImageChef.Tests/Filesystems/QNX4.cs index 999d0eda..3f019a66 100644 --- a/DiscImageChef.Tests/Filesystems/QNX4.cs +++ b/DiscImageChef.Tests/Filesystems/QNX4.cs @@ -81,7 +81,7 @@ namespace DiscImageChef.Tests.Filesystems } } } - + [TestFixture] public class Qnx4Mbr { diff --git a/DiscImageChef.Tests/Filesystems/SFS.cs b/DiscImageChef.Tests/Filesystems/SFS.cs index adefca5e..2f3c9132 100644 --- a/DiscImageChef.Tests/Filesystems/SFS.cs +++ b/DiscImageChef.Tests/Filesystems/SFS.cs @@ -86,6 +86,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class SfsMbrRdb { @@ -136,6 +137,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class SfsRdb { diff --git a/DiscImageChef.Tests/Filesystems/SysV.cs b/DiscImageChef.Tests/Filesystems/SysV.cs index f81c5659..fd48d77c 100644 --- a/DiscImageChef.Tests/Filesystems/SysV.cs +++ b/DiscImageChef.Tests/Filesystems/SysV.cs @@ -98,6 +98,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class SysVMbr { @@ -151,6 +152,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class SysVRdb { diff --git a/DiscImageChef.Tests/Filesystems/UFS.cs b/DiscImageChef.Tests/Filesystems/UFS.cs index d119862d..61e97a66 100644 --- a/DiscImageChef.Tests/Filesystems/UFS.cs +++ b/DiscImageChef.Tests/Filesystems/UFS.cs @@ -96,6 +96,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsApm { @@ -156,6 +157,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsMbr { @@ -251,6 +253,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsNeXt { @@ -307,6 +310,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsNeXtFloppy { @@ -365,6 +369,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsRdb { @@ -417,6 +422,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UfsSuni86 { diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs index b5c6266c..3cb260f9 100644 --- a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs @@ -90,6 +90,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UnixbfsMbr { @@ -137,6 +138,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class UnixbfsRdb { diff --git a/DiscImageChef.Tests/Filesystems/XENIX.cs b/DiscImageChef.Tests/Filesystems/XENIX.cs index 62b3026f..6d82e012 100644 --- a/DiscImageChef.Tests/Filesystems/XENIX.cs +++ b/DiscImageChef.Tests/Filesystems/XENIX.cs @@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class XenixMbr { diff --git a/DiscImageChef.Tests/Filesystems/exFAT.cs b/DiscImageChef.Tests/Filesystems/exFAT.cs index de067362..c99379a5 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT.cs @@ -86,6 +86,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class ExFatGpt { @@ -136,6 +137,7 @@ namespace DiscImageChef.Tests.Filesystems } } } + [TestFixture] public class ExFatMbr { diff --git a/DiscImageChef.Tests/Filters/PCExchange.cs b/DiscImageChef.Tests/Filters/PCExchange.cs index 98717760..efa270ec 100644 --- a/DiscImageChef.Tests/Filters/PCExchange.cs +++ b/DiscImageChef.Tests/Filters/PCExchange.cs @@ -51,8 +51,7 @@ namespace DiscImageChef.Tests.Filters { Md5Context ctx = new Md5Context(); ctx.Init(); - string result = ctx.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"), - out _); + string result = ctx.File(Path.Combine(Consts.TestFilesRoot, "filters", "pcexchange", "FINDER.DAT"), out _); Assert.AreEqual(EXPECTED_FILE, result); } diff --git a/DiscImageChef.Tests/Partitions/MBR.cs b/DiscImageChef.Tests/Partitions/MBR.cs index bcb22c6a..fda74dd3 100644 --- a/DiscImageChef.Tests/Partitions/MBR.cs +++ b/DiscImageChef.Tests/Partitions/MBR.cs @@ -1468,28 +1468,12 @@ namespace DiscImageChef.Tests.Partitions // PC-DOS 3.00 new[] { - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 66465, - Sequence = 0, - Start = 63 - } + new Partition {Description = null, Name = null, Type = "0x01", Length = 66465, Sequence = 0, Start = 63} }, // PC-DOS 3.10 new[] { - new Partition - { - Description = null, - Name = null, - Type = "0x01", - Length = 66465, - Sequence = 0, - Start = 63 - } + new Partition {Description = null, Name = null, Type = "0x01", Length = 66465, Sequence = 0, Start = 63} }, // PC-DOS 3.30 new[]