aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Final cleanup of DiscImageChef.Tests.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-24 04:58:06 +00:00
parent 7f3b1dfbb7
commit 498ec65ed9
28 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Tests/Filesystems/AFFS.cs
View File

@@ -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
{

2
DiscImageChef.Tests/Filesystems/AFS.cs
View File

@@ -97,7 +97,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class AfsMbr
{

6
DiscImageChef.Tests/Filesystems/AOFS.cs
View File

@@ -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
{

2
DiscImageChef.Tests/Filesystems/BeFS.cs
View File

@@ -142,6 +142,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class BeFsGpt
{
@@ -192,6 +193,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class BeFsMbr
{

1
DiscImageChef.Tests/Filesystems/COHERENT.cs
View File

@@ -92,6 +92,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class CoherentMbr
{

1
DiscImageChef.Tests/Filesystems/DTFS.cs
View File

@@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class DtfsMbr
{

1
DiscImageChef.Tests/Filesystems/EAFS.cs
View File

@@ -97,6 +97,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class EafsMbr
{

3
DiscImageChef.Tests/Filesystems/FAT12.cs
View File

@@ -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
{

5
DiscImageChef.Tests/Filesystems/FAT16.cs
View File

@@ -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
{

2
DiscImageChef.Tests/Filesystems/FAT32.cs
View File

@@ -89,6 +89,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class Fat32Gpt
{
@@ -142,6 +143,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class Fat32Mbr
{

7
DiscImageChef.Tests/Filesystems/HFS.cs
View File

@@ -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
{

2
DiscImageChef.Tests/Filesystems/HFSPlus.cs
View File

@@ -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

5
DiscImageChef.Tests/Filesystems/HFSX.cs
View File

@@ -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
}
}
}
}

1
DiscImageChef.Tests/Filesystems/HTFS.cs
View File

@@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class HtfsMbr
{

3
DiscImageChef.Tests/Filesystems/ISO9660.cs
View File

@@ -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",

3
DiscImageChef.Tests/Filesystems/LisaFS.cs
View File

@@ -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",

3
DiscImageChef.Tests/Filesystems/MFS.cs
View File

@@ -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};

5
DiscImageChef.Tests/Filesystems/MINIX.cs
View File

@@ -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
{

1
DiscImageChef.Tests/Filesystems/NTFS.cs
View File

@@ -89,6 +89,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class NtfsMbr
{

2
DiscImageChef.Tests/Filesystems/QNX4.cs
View File

@@ -81,7 +81,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class Qnx4Mbr
{

2
DiscImageChef.Tests/Filesystems/SFS.cs
View File

@@ -86,6 +86,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class SfsMbrRdb
{
@@ -136,6 +137,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class SfsRdb
{

2
DiscImageChef.Tests/Filesystems/SysV.cs
View File

@@ -98,6 +98,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class SysVMbr
{
@@ -151,6 +152,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class SysVRdb
{

6
DiscImageChef.Tests/Filesystems/UFS.cs
View File

@@ -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
{

2
DiscImageChef.Tests/Filesystems/UNIXBFS.cs
View File

@@ -90,6 +90,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class UnixbfsMbr
{
@@ -137,6 +138,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class UnixbfsRdb
{

1
DiscImageChef.Tests/Filesystems/XENIX.cs
View File

@@ -93,6 +93,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class XenixMbr
{

2
DiscImageChef.Tests/Filesystems/exFAT.cs
View File

@@ -86,6 +86,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class ExFatGpt
{
@@ -136,6 +137,7 @@ namespace DiscImageChef.Tests.Filesystems
}
}
}
[TestFixture]
public class ExFatMbr
{

3
DiscImageChef.Tests/Filters/PCExchange.cs
View File

@@ -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);
}

20
DiscImageChef.Tests/Partitions/MBR.cs
View File

@@ -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[]