mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Code cleanup.
This commit is contained in:
@@ -49,35 +49,35 @@ namespace DiscImageChef.Tests.Partitions
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 38797312,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 1048576,
|
||||
Length = 75776,
|
||||
Sequence = 0,
|
||||
Start = 2048
|
||||
Size = 38797312,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 1048576,
|
||||
Length = 75776,
|
||||
Sequence = 0,
|
||||
Start = 2048
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 19922944,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 40894464,
|
||||
Length = 38912,
|
||||
Sequence = 1,
|
||||
Start = 79872
|
||||
Size = 19922944,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 40894464,
|
||||
Length = 38912,
|
||||
Sequence = 1,
|
||||
Start = 79872
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 48234496,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 61865984,
|
||||
Length = 94208,
|
||||
Sequence = 2,
|
||||
Start = 120832
|
||||
Size = 48234496,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 61865984,
|
||||
Length = 94208,
|
||||
Sequence = 2,
|
||||
Start = 120832
|
||||
}
|
||||
},
|
||||
// NetBSD 1.6
|
||||
@@ -86,68 +86,68 @@ namespace DiscImageChef.Tests.Partitions
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 10453504,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20417,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
Size = 10453504,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20417,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 209715200,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 409600,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
Size = 209715200,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 409600,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 805306368,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 221405184,
|
||||
Length = 1572864,
|
||||
Sequence = 2,
|
||||
Start = 432432
|
||||
Size = 805306368,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 221405184,
|
||||
Length = 1572864,
|
||||
Sequence = 2,
|
||||
Start = 432432
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 747656192,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 1027031040,
|
||||
Length = 1460266,
|
||||
Sequence = 3,
|
||||
Start = 2005920
|
||||
Size = 747656192,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 1027031040,
|
||||
Length = 1460266,
|
||||
Sequence = 3,
|
||||
Start = 2005920
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 268435456,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1774854144,
|
||||
Length = 524288,
|
||||
Sequence = 4,
|
||||
Start = 3466512
|
||||
Size = 268435456,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1774854144,
|
||||
Length = 524288,
|
||||
Sequence = 4,
|
||||
Start = 3466512
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 103743488,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 2043740160,
|
||||
Length = 202624,
|
||||
Sequence = 5,
|
||||
Start = 3991680
|
||||
Size = 103743488,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 2043740160,
|
||||
Length = 202624,
|
||||
Sequence = 5,
|
||||
Start = 3991680
|
||||
}
|
||||
},
|
||||
// NetBSD 6.1.5
|
||||
@@ -156,114 +156,114 @@ namespace DiscImageChef.Tests.Partitions
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 10485760,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20480,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
Size = 10485760,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20480,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 104857600,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 204800,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
Size = 104857600,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 204800,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 209715200,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 116637696,
|
||||
Length = 409600,
|
||||
Sequence = 2,
|
||||
Start = 227808
|
||||
Size = 209715200,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 116637696,
|
||||
Length = 409600,
|
||||
Sequence = 2,
|
||||
Start = 227808
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 40771584,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 326688768,
|
||||
Length = 79632,
|
||||
Sequence = 3,
|
||||
Start = 638064
|
||||
Size = 40771584,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 326688768,
|
||||
Length = 79632,
|
||||
Sequence = 3,
|
||||
Start = 638064
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 419430400,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 367460352,
|
||||
Length = 819200,
|
||||
Sequence = 4,
|
||||
Start = 717696
|
||||
Size = 419430400,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 367460352,
|
||||
Length = 819200,
|
||||
Sequence = 4,
|
||||
Start = 717696
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 471859200,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 787562496,
|
||||
Length = 921600,
|
||||
Sequence = 5,
|
||||
Start = 1538208
|
||||
Size = 471859200,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 787562496,
|
||||
Length = 921600,
|
||||
Sequence = 5,
|
||||
Start = 1538208
|
||||
},
|
||||
// Type conflicts between DragonFly and NetBSD, really is Apple UFS
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 78643200,
|
||||
Name = null,
|
||||
Type = "Hammer",
|
||||
Offset = 1259790336,
|
||||
Length = 153600,
|
||||
Sequence = 6,
|
||||
Start = 2460528
|
||||
Size = 78643200,
|
||||
Name = null,
|
||||
Type = "Hammer",
|
||||
Offset = 1259790336,
|
||||
Length = 153600,
|
||||
Sequence = 6,
|
||||
Start = 2460528
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 99614720,
|
||||
Name = null,
|
||||
Type = "UNIX 7th Edition",
|
||||
Offset = 1338753024,
|
||||
Length = 194560,
|
||||
Sequence = 7,
|
||||
Start = 2614752
|
||||
Size = 99614720,
|
||||
Name = null,
|
||||
Type = "UNIX 7th Edition",
|
||||
Offset = 1338753024,
|
||||
Length = 194560,
|
||||
Sequence = 7,
|
||||
Start = 2614752
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 244318208,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1438875648,
|
||||
Length = 477184,
|
||||
Sequence = 8,
|
||||
Start = 2810304
|
||||
Size = 244318208,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1438875648,
|
||||
Length = 477184,
|
||||
Sequence = 8,
|
||||
Start = 2810304
|
||||
},
|
||||
// Type conflicts, really is Linux ext2
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 463978496,
|
||||
Name = null,
|
||||
Type = "Digital LSM Public Region",
|
||||
Offset = 1683505152,
|
||||
Length = 906208,
|
||||
Sequence = 9,
|
||||
Start = 3288096
|
||||
Size = 463978496,
|
||||
Name = null,
|
||||
Type = "Digital LSM Public Region",
|
||||
Offset = 1683505152,
|
||||
Length = 906208,
|
||||
Sequence = 9,
|
||||
Start = 3288096
|
||||
}
|
||||
},
|
||||
// NetBSD 7.1
|
||||
@@ -272,114 +272,114 @@ namespace DiscImageChef.Tests.Partitions
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 10321920,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20160,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
Size = 10321920,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 516096,
|
||||
Length = 20160,
|
||||
Sequence = 0,
|
||||
Start = 1008
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 104767488,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 204624,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
Size = 104767488,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 11354112,
|
||||
Length = 204624,
|
||||
Sequence = 1,
|
||||
Start = 22176
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 209534976,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 116637696,
|
||||
Length = 409248,
|
||||
Sequence = 2,
|
||||
Start = 227808
|
||||
Size = 209534976,
|
||||
Name = null,
|
||||
Type = "FAT",
|
||||
Offset = 116637696,
|
||||
Length = 409248,
|
||||
Sequence = 2,
|
||||
Start = 227808
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 40255488,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 326688768,
|
||||
Length = 78624,
|
||||
Sequence = 3,
|
||||
Start = 638064
|
||||
Size = 40255488,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 326688768,
|
||||
Length = 78624,
|
||||
Sequence = 3,
|
||||
Start = 638064
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 419069952,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 367460352,
|
||||
Length = 818496,
|
||||
Sequence = 4,
|
||||
Start = 717696
|
||||
Size = 419069952,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 367460352,
|
||||
Length = 818496,
|
||||
Sequence = 4,
|
||||
Start = 717696
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 471711744,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 787562496,
|
||||
Length = 921312,
|
||||
Sequence = 5,
|
||||
Start = 1538208
|
||||
Size = 471711744,
|
||||
Name = null,
|
||||
Type = "4.2BSD Fast File System",
|
||||
Offset = 787562496,
|
||||
Length = 921312,
|
||||
Sequence = 5,
|
||||
Start = 1538208
|
||||
},
|
||||
// Type conflicts between DragonFly and NetBSD, really is Apple UFS
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 78446592,
|
||||
Name = null,
|
||||
Type = "Hammer",
|
||||
Offset = 1259790336,
|
||||
Length = 153216,
|
||||
Sequence = 6,
|
||||
Start = 2460528
|
||||
Size = 78446592,
|
||||
Name = null,
|
||||
Type = "Hammer",
|
||||
Offset = 1259790336,
|
||||
Length = 153216,
|
||||
Sequence = 6,
|
||||
Start = 2460528
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 99606528,
|
||||
Name = null,
|
||||
Type = "UNIX 7th Edition",
|
||||
Offset = 1338753024,
|
||||
Length = 194544,
|
||||
Sequence = 7,
|
||||
Start = 2614752
|
||||
Size = 99606528,
|
||||
Name = null,
|
||||
Type = "UNIX 7th Edition",
|
||||
Offset = 1338753024,
|
||||
Length = 194544,
|
||||
Sequence = 7,
|
||||
Start = 2614752
|
||||
},
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 243597312,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1438875648,
|
||||
Length = 475776,
|
||||
Sequence = 8,
|
||||
Start = 2810304
|
||||
Size = 243597312,
|
||||
Name = null,
|
||||
Type = "4.4LFS",
|
||||
Offset = 1438875648,
|
||||
Length = 475776,
|
||||
Sequence = 8,
|
||||
Start = 2810304
|
||||
},
|
||||
// Type conflicts, really is Linux ext2
|
||||
new Partition
|
||||
{
|
||||
Description = null,
|
||||
Size = 463970304,
|
||||
Name = null,
|
||||
Type = "Digital LSM Public Region",
|
||||
Offset = 1683505152,
|
||||
Length = 906192,
|
||||
Sequence = 9,
|
||||
Start = 3288096
|
||||
Size = 463970304,
|
||||
Name = null,
|
||||
Type = "Digital LSM Public Region",
|
||||
Offset = 1683505152,
|
||||
Length = 906192,
|
||||
Sequence = 9,
|
||||
Start = 3288096
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -389,8 +389,8 @@ namespace DiscImageChef.Tests.Partitions
|
||||
{
|
||||
for(int i = 0; i < testfiles.Length; i++)
|
||||
{
|
||||
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "bsd", testfiles[i]);
|
||||
IFilter filter = new LZip();
|
||||
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "bsd", testfiles[i]);
|
||||
IFilter filter = new LZip();
|
||||
filter.Open(location);
|
||||
IMediaImage image = new Vdi();
|
||||
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
|
||||
@@ -400,13 +400,13 @@ namespace DiscImageChef.Tests.Partitions
|
||||
{
|
||||
// Too chatty
|
||||
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
|
||||
Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user