Code cleanup.

This commit is contained in:
2018-06-22 08:08:38 +01:00
parent 82f474c7e3
commit 88da8fc019
581 changed files with 22423 additions and 20839 deletions

View File

@@ -49,46 +49,46 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 31457280,
Name = null,
Type = "GEM",
Offset = 512,
Length = 61440,
Sequence = 0,
Start = 1
Size = 31457280,
Name = null,
Type = "GEM",
Offset = 512,
Length = 61440,
Sequence = 0,
Start = 1
},
new Partition
{
Description = null,
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 31457792,
Length = 81920,
Sequence = 1,
Start = 61441
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 31457792,
Length = 81920,
Sequence = 1,
Start = 61441
},
new Partition
{
Description = null,
Size = 56402432,
Name = null,
Type = "LNX",
Offset = 73400832,
Length = 110161,
Sequence = 2,
Start = 143361
Size = 56402432,
Name = null,
Type = "LNX",
Offset = 73400832,
Length = 110161,
Sequence = 2,
Start = 143361
},
new Partition
{
Description = null,
Size = 43212800,
Name = null,
Type = "MAC",
Offset = 129803264,
Length = 84400,
Sequence = 3,
Start = 253522
Size = 43212800,
Name = null,
Type = "MAC",
Offset = 129803264,
Length = 84400,
Sequence = 3,
Start = 253522
}
}
};
@@ -98,8 +98,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "acorn", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "acorn", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -109,13 +109,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]);
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -48,112 +48,112 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 31457280,
Name = null,
Type = "GEM",
Offset = 512,
Length = 61440,
Sequence = 0,
Start = 1
Size = 31457280,
Name = null,
Type = "GEM",
Offset = 512,
Length = 61440,
Sequence = 0,
Start = 1
},
new Partition
{
Description = null,
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 31457792,
Length = 81920,
Sequence = 1,
Start = 61441
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 31457792,
Length = 81920,
Sequence = 1,
Start = 61441
},
new Partition
{
Description = null,
Size = 56402432,
Name = null,
Type = "LNX",
Offset = 73400832,
Length = 110161,
Sequence = 2,
Start = 143361
Size = 56402432,
Name = null,
Type = "LNX",
Offset = 73400832,
Length = 110161,
Sequence = 2,
Start = 143361
},
new Partition
{
Description = null,
Size = 43212800,
Name = null,
Type = "MAC",
Offset = 129803264,
Length = 84400,
Sequence = 3,
Start = 253522
Size = 43212800,
Name = null,
Type = "MAC",
Offset = 129803264,
Length = 84400,
Sequence = 3,
Start = 253522
},
new Partition
{
Description = null,
Size = 57671680,
Name = null,
Type = "MIX",
Offset = 173016064,
Length = 112640,
Sequence = 4,
Start = 337922
Size = 57671680,
Name = null,
Type = "MIX",
Offset = 173016064,
Length = 112640,
Sequence = 4,
Start = 337922
},
new Partition
{
Description = null,
Size = 62914560,
Name = null,
Type = "MNX",
Offset = 230687744,
Length = 122880,
Sequence = 5,
Start = 450562
Size = 62914560,
Name = null,
Type = "MNX",
Offset = 230687744,
Length = 122880,
Sequence = 5,
Start = 450562
},
new Partition
{
Description = null,
Size = 73400320,
Name = null,
Type = "RAW",
Offset = 293602304,
Length = 143360,
Sequence = 6,
Start = 573442
Size = 73400320,
Name = null,
Type = "RAW",
Offset = 293602304,
Length = 143360,
Sequence = 6,
Start = 573442
},
new Partition
{
Description = null,
Size = 78643200,
Name = null,
Type = "SWP",
Offset = 367002624,
Length = 153600,
Sequence = 7,
Start = 716802
Size = 78643200,
Name = null,
Type = "SWP",
Offset = 367002624,
Length = 153600,
Sequence = 7,
Start = 716802
},
new Partition
{
Description = null,
Size = 1048576,
Name = null,
Type = "UNX",
Offset = 445645824,
Length = 2048,
Sequence = 8,
Start = 870402
Size = 1048576,
Name = null,
Type = "UNX",
Offset = 445645824,
Length = 2048,
Sequence = 8,
Start = 870402
},
new Partition
{
Description = null,
Size = 77593600,
Name = null,
Type = "LNX",
Offset = 446694400,
Length = 151550,
Sequence = 9,
Start = 872450
Size = 77593600,
Name = null,
Type = "LNX",
Offset = 446694400,
Length = 151550,
Sequence = 9,
Start = 872450
}
},
// Linux (ICD)
@@ -162,101 +162,101 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 15728640,
Name = null,
Type = "GEM",
Offset = 512,
Length = 30720,
Sequence = 0,
Start = 1
Size = 15728640,
Name = null,
Type = "GEM",
Offset = 512,
Length = 30720,
Sequence = 0,
Start = 1
},
new Partition
{
Description = null,
Size = 20971520,
Name = null,
Type = "UNX",
Offset = 15729152,
Length = 40960,
Sequence = 1,
Start = 30721
Size = 20971520,
Name = null,
Type = "UNX",
Offset = 15729152,
Length = 40960,
Sequence = 1,
Start = 30721
},
new Partition
{
Description = null,
Size = 31457280,
Name = null,
Type = "LNX",
Offset = 36700672,
Length = 61440,
Sequence = 2,
Start = 71681
Size = 31457280,
Name = null,
Type = "LNX",
Offset = 36700672,
Length = 61440,
Sequence = 2,
Start = 71681
},
new Partition
{
Description = null,
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 68157952,
Length = 81920,
Sequence = 3,
Start = 133121
Size = 41943040,
Name = null,
Type = "BGM",
Offset = 68157952,
Length = 81920,
Sequence = 3,
Start = 133121
},
new Partition
{
Description = null,
Size = 52428800,
Name = null,
Type = "MAC",
Offset = 110100992,
Length = 102400,
Sequence = 4,
Start = 215041
Size = 52428800,
Name = null,
Type = "MAC",
Offset = 110100992,
Length = 102400,
Sequence = 4,
Start = 215041
},
new Partition
{
Description = null,
Size = 62914560,
Name = null,
Type = "MIX",
Offset = 162529792,
Length = 122880,
Sequence = 5,
Start = 317441
Size = 62914560,
Name = null,
Type = "MIX",
Offset = 162529792,
Length = 122880,
Sequence = 5,
Start = 317441
},
new Partition
{
Description = null,
Size = 83886080,
Name = null,
Type = "SWP",
Offset = 225444352,
Length = 163840,
Sequence = 6,
Start = 440321
Size = 83886080,
Name = null,
Type = "SWP",
Offset = 225444352,
Length = 163840,
Sequence = 6,
Start = 440321
},
new Partition
{
Description = null,
Size = 103809024,
Name = null,
Type = "MNX",
Offset = 309330432,
Length = 202752,
Sequence = 7,
Start = 604161
Size = 103809024,
Name = null,
Type = "MNX",
Offset = 309330432,
Length = 202752,
Sequence = 7,
Start = 604161
},
new Partition
{
Description = null,
Size = 104857600,
Name = null,
Type = "LNX",
Offset = 413139456,
Length = 204800,
Sequence = 8,
Start = 806913
Size = 104857600,
Name = null,
Type = "LNX",
Offset = 413139456,
Length = 204800,
Sequence = 8,
Start = 806913
}
},
// TOS 1.04
@@ -265,46 +265,46 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 1024,
Length = 14336,
Sequence = 0,
Start = 2
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 1024,
Length = 14336,
Sequence = 0,
Start = 2
},
new Partition
{
Description = null,
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 7341056,
Length = 14336,
Sequence = 1,
Start = 14338
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 7341056,
Length = 14336,
Sequence = 1,
Start = 14338
},
new Partition
{
Description = null,
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 14681088,
Length = 14336,
Sequence = 2,
Start = 28674
Size = 7340032,
Name = null,
Type = "GEM",
Offset = 14681088,
Length = 14336,
Sequence = 2,
Start = 28674
},
new Partition
{
Description = null,
Size = 7339008,
Name = null,
Type = "GEM",
Offset = 22021120,
Length = 14334,
Sequence = 3,
Start = 43010
Size = 7339008,
Name = null,
Type = "GEM",
Offset = 22021120,
Length = 14334,
Sequence = 3,
Start = 43010
}
}
};
@@ -314,8 +314,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "atari", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "atari", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -325,13 +325,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]);
}
}
}

View File

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

View File

@@ -48,68 +48,68 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 10485760,
Name = "EFI System",
Type = "EFI System",
Offset = 1048576,
Length = 20480,
Sequence = 0,
Start = 2048
Size = 10485760,
Name = "EFI System",
Type = "EFI System",
Offset = 1048576,
Length = 20480,
Sequence = 0,
Start = 2048
},
new Partition
{
Description = null,
Size = 15728640,
Name = "Microsoft basic data",
Type = "Microsoft Basic data",
Offset = 11534336,
Length = 30720,
Sequence = 1,
Start = 22528
Size = 15728640,
Name = "Microsoft basic data",
Type = "Microsoft Basic data",
Offset = 11534336,
Length = 30720,
Sequence = 1,
Start = 22528
},
new Partition
{
Description = null,
Size = 20971520,
Name = "Apple label",
Type = "Apple Label",
Offset = 27262976,
Length = 40960,
Sequence = 2,
Start = 53248
Size = 20971520,
Name = "Apple label",
Type = "Apple Label",
Offset = 27262976,
Length = 40960,
Sequence = 2,
Start = 53248
},
new Partition
{
Description = null,
Size = 26214400,
Name = "Solaris /usr & Mac ZFS",
Type = "Solaris /usr or Apple ZFS",
Offset = 48234496,
Length = 51200,
Sequence = 3,
Start = 94208
Size = 26214400,
Name = "Solaris /usr & Mac ZFS",
Type = "Solaris /usr or Apple ZFS",
Offset = 48234496,
Length = 51200,
Sequence = 3,
Start = 94208
},
new Partition
{
Description = null,
Size = 31457280,
Name = "FreeBSD ZFS",
Type = "FreeBSD ZFS",
Offset = 74448896,
Length = 61440,
Sequence = 4,
Start = 145408
Size = 31457280,
Name = "FreeBSD ZFS",
Type = "FreeBSD ZFS",
Offset = 74448896,
Length = 61440,
Sequence = 4,
Start = 145408
},
new Partition
{
Description = null,
Size = 28294656,
Name = "HP-UX data",
Type = "HP-UX Data",
Offset = 105906176,
Length = 55263,
Sequence = 5,
Start = 206848
Size = 28294656,
Name = "HP-UX data",
Type = "HP-UX Data",
Offset = 105906176,
Length = 55263,
Sequence = 5,
Start = 206848
}
},
// Parted
@@ -118,35 +118,35 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 42991616,
Name = "",
Type = "Apple HFS",
Offset = 1048576,
Length = 83968,
Sequence = 0,
Start = 2048
Size = 42991616,
Name = "",
Type = "Apple HFS",
Offset = 1048576,
Length = 83968,
Sequence = 0,
Start = 2048
},
new Partition
{
Description = null,
Size = 52428800,
Name = "",
Type = "Linux filesystem",
Offset = 44040192,
Length = 102400,
Sequence = 1,
Start = 86016
Size = 52428800,
Name = "",
Type = "Linux filesystem",
Offset = 44040192,
Length = 102400,
Sequence = 1,
Start = 86016
},
new Partition
{
Description = null,
Size = 36700160,
Name = "",
Type = "Microsoft Basic data",
Offset = 96468992,
Length = 71680,
Sequence = 2,
Start = 188416
Size = 36700160,
Name = "",
Type = "Microsoft Basic data",
Offset = 96468992,
Length = 71680,
Sequence = 2,
Start = 188416
}
}
};
@@ -156,8 +156,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "gpt", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "gpt", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -167,13 +167,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]);
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -48,46 +48,46 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 268369408,
Name = "MINIX",
Type = "MINIX",
Offset = 2064896,
Length = 524159,
Sequence = 0,
Start = 4033
Size = 268369408,
Name = "MINIX",
Type = "MINIX",
Offset = 2064896,
Length = 524159,
Sequence = 0,
Start = 4033
},
new Partition
{
Description = null,
Size = 270434304,
Name = "MINIX",
Type = "MINIX",
Offset = 270434304,
Length = 528192,
Sequence = 1,
Start = 528192
Size = 270434304,
Name = "MINIX",
Type = "MINIX",
Offset = 270434304,
Length = 528192,
Sequence = 1,
Start = 528192
},
new Partition
{
Description = null,
Size = 270434304,
Name = "MINIX",
Type = "MINIX",
Offset = 540868608,
Length = 528192,
Sequence = 2,
Start = 1056384
Size = 270434304,
Name = "MINIX",
Type = "MINIX",
Offset = 540868608,
Length = 528192,
Sequence = 2,
Start = 1056384
},
new Partition
{
Description = null,
Size = 262176768,
Name = "MINIX",
Type = "MINIX",
Offset = 811302912,
Length = 512064,
Sequence = 3,
Start = 1584576
Size = 262176768,
Name = "MINIX",
Type = "MINIX",
Offset = 811302912,
Length = 512064,
Sequence = 3,
Start = 1584576
}
}
};
@@ -97,8 +97,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "minix", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "minix", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -110,11 +110,11 @@ namespace DiscImageChef.Tests.Partitions
//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].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]);
}
}
}

View File

@@ -49,74 +49,74 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT12",
Length = 19536,
Sequence = 0,
Start = 264
Name = "MS-DOS 3.30",
Type = "FAT12",
Length = 19536,
Sequence = 0,
Start = 264
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT12",
Length = 39336,
Sequence = 1,
Start = 20064
Name = "MS-DOS 3.30",
Type = "FAT12",
Length = 39336,
Sequence = 1,
Start = 20064
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 59136,
Sequence = 2,
Start = 59664
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 59136,
Sequence = 2,
Start = 59664
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 78936,
Sequence = 3,
Start = 119064
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 78936,
Sequence = 3,
Start = 119064
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 118536,
Sequence = 4,
Start = 198264
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 118536,
Sequence = 4,
Start = 198264
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 197736,
Sequence = 5,
Start = 317064
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 197736,
Sequence = 5,
Start = 317064
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 237336,
Sequence = 6,
Start = 515064
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 237336,
Sequence = 6,
Start = 515064
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 245256,
Sequence = 7,
Start = 752664
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 245256,
Sequence = 7,
Start = 752664
}
},
// NEC MS-DOS 3.30 (80Mb HDD)
@@ -125,29 +125,29 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 59136,
Sequence = 0,
Start = 264
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 59136,
Sequence = 0,
Start = 264
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 158136,
Sequence = 1,
Start = 59664
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 158136,
Sequence = 1,
Start = 59664
},
new Partition
{
Description = null,
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 94776,
Sequence = 2,
Start = 218064
Name = "MS-DOS 3.30",
Type = "FAT16",
Length = 94776,
Sequence = 2,
Start = 218064
}
},
// Epson MS-DOS 3.30
@@ -156,74 +156,74 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = "NamenameName",
Type = "FAT12",
Length = 35639,
Sequence = 0,
Start = 264
Name = "NamenameName",
Type = "FAT12",
Length = 35639,
Sequence = 0,
Start = 264
},
new Partition
{
Description = null,
Name = "12BitFAT",
Type = "FAT12",
Length = 59399,
Sequence = 1,
Start = 35904
Name = "12BitFAT",
Type = "FAT12",
Length = 59399,
Sequence = 1,
Start = 35904
},
new Partition
{
Description = null,
Name = "16BitFAT",
Type = "FAT16",
Length = 79199,
Sequence = 2,
Start = 95304
Name = "16BitFAT",
Type = "FAT16",
Length = 79199,
Sequence = 2,
Start = 95304
},
new Partition
{
Description = null,
Name = "PartLblMaxNameXX",
Type = "FAT16",
Length = 118799,
Sequence = 3,
Start = 174504
Name = "PartLblMaxNameXX",
Type = "FAT16",
Length = 118799,
Sequence = 3,
Start = 174504
},
new Partition
{
Description = null,
Name = "BigFAT12",
Type = "FAT12",
Length = 158399,
Sequence = 4,
Start = 293304
Name = "BigFAT12",
Type = "FAT12",
Length = 158399,
Sequence = 4,
Start = 293304
},
new Partition
{
Description = null,
Name = "Lalalalalalalala",
Type = "FAT16",
Length = 197999,
Sequence = 5,
Start = 451704
Name = "Lalalalalalalala",
Type = "FAT16",
Length = 197999,
Sequence = 5,
Start = 451704
},
new Partition
{
Description = null,
Name = "MS-DOS Ver 5.0",
Type = "FAT16",
Length = 237599,
Sequence = 6,
Start = 649704
Name = "MS-DOS Ver 5.0",
Type = "FAT16",
Length = 237599,
Sequence = 6,
Start = 649704
},
new Partition
{
Description = null,
Name = "MS-DOS Ver 5.0",
Type = "FAT16",
Length = 118799,
Sequence = 7,
Start = 887304
Name = "MS-DOS Ver 5.0",
Type = "FAT16",
Length = 118799,
Sequence = 7,
Start = 887304
}
},
// NEC MS-DOS 5.00
@@ -232,74 +232,74 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT12",
Length = 28512,
Sequence = 0,
Start = 264
Name = "MS-DOS 5.00",
Type = "FAT12",
Length = 28512,
Sequence = 0,
Start = 264
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 49104,
Sequence = 1,
Start = 29040
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 49104,
Sequence = 1,
Start = 29040
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 93984,
Sequence = 2,
Start = 78408
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 93984,
Sequence = 2,
Start = 78408
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 122760,
Sequence = 3,
Start = 172656
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 122760,
Sequence = 3,
Start = 172656
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 163680,
Sequence = 4,
Start = 295680
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 163680,
Sequence = 4,
Start = 295680
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 204600,
Sequence = 5,
Start = 459624
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 204600,
Sequence = 5,
Start = 459624
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 204600,
Sequence = 6,
Start = 664488
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 204600,
Sequence = 6,
Start = 664488
},
new Partition
{
Description = null,
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 139128,
Sequence = 7,
Start = 869352
Name = "MS-DOS 5.00",
Type = "FAT16",
Length = 139128,
Sequence = 7,
Start = 869352
}
},
// NEC MS-DOS 6.20
@@ -308,65 +308,65 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 61248,
Sequence = 0,
Start = 264
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 61248,
Sequence = 0,
Start = 264
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 81840,
Sequence = 1,
Start = 61776
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 81840,
Sequence = 1,
Start = 61776
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 122760,
Sequence = 2,
Start = 143880
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 122760,
Sequence = 2,
Start = 143880
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 163680,
Sequence = 3,
Start = 266904
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 163680,
Sequence = 3,
Start = 266904
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT12",
Length = 20328,
Sequence = 4,
Start = 430848
Name = "MS-DOS 6.20",
Type = "FAT12",
Length = 20328,
Sequence = 4,
Start = 430848
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 245520,
Sequence = 5,
Start = 451440
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 245520,
Sequence = 5,
Start = 451440
},
new Partition
{
Description = null,
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 315216,
Sequence = 6,
Start = 697224
Name = "MS-DOS 6.20",
Type = "FAT16",
Length = 315216,
Sequence = 6,
Start = 697224
}
}
};
@@ -376,8 +376,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "pc98", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "pc98", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new T98();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -387,11 +387,11 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, 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].Length, partitions[j].Length, 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].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]);
}
}
}

View File

@@ -48,68 +48,68 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 87392256,
Name = "UDH0",
Type = "\"DOS\\0\"",
Offset = 2080768,
Length = 170688,
Sequence = 0,
Start = 4064
Size = 87392256,
Name = "UDH0",
Type = "\"DOS\\0\"",
Offset = 2080768,
Length = 170688,
Sequence = 0,
Start = 4064
},
new Partition
{
Description = null,
Size = 87392256,
Name = "UDH1",
Type = "\"DOS\\2\"",
Offset = 89473024,
Length = 170688,
Sequence = 1,
Start = 174752
Size = 87392256,
Name = "UDH1",
Type = "\"DOS\\2\"",
Offset = 89473024,
Length = 170688,
Sequence = 1,
Start = 174752
},
new Partition
{
Description = null,
Size = 87392256,
Name = "UDH2",
Type = "\"DOS\\1\"",
Offset = 176865280,
Length = 170688,
Sequence = 2,
Start = 345440
Size = 87392256,
Name = "UDH2",
Type = "\"DOS\\1\"",
Offset = 176865280,
Length = 170688,
Sequence = 2,
Start = 345440
},
new Partition
{
Description = null,
Size = 87392256,
Name = "UDH3",
Type = "\"DOS\\3\"",
Offset = 264257536,
Length = 170688,
Sequence = 3,
Start = 516128
Size = 87392256,
Name = "UDH3",
Type = "\"DOS\\3\"",
Offset = 264257536,
Length = 170688,
Sequence = 3,
Start = 516128
},
new Partition
{
Description = null,
Size = 87300096,
Name = "FAT16",
Type = "0x06",
Offset = 351663104,
Length = 170508,
Sequence = 4,
Start = 686842
Size = 87300096,
Name = "FAT16",
Type = "0x06",
Offset = 351663104,
Length = 170508,
Sequence = 4,
Start = 686842
},
new Partition
{
Description = null,
Size = 85311488,
Name = "UDH5",
Type = "\"RES\\86\"",
Offset = 439042048,
Length = 166624,
Sequence = 5,
Start = 857504
Size = 85311488,
Name = "UDH5",
Type = "\"RES\\86\"",
Offset = 439042048,
Length = 166624,
Sequence = 5,
Start = 857504
}
},
// AmigaOS 4.0
@@ -118,68 +118,68 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 91455488,
Name = "DH1",
Type = "\"DOS\\1\"",
Offset = 1048576,
Length = 178624,
Sequence = 0,
Start = 2048
Size = 91455488,
Name = "DH1",
Type = "\"DOS\\1\"",
Offset = 1048576,
Length = 178624,
Sequence = 0,
Start = 2048
},
new Partition
{
Description = null,
Size = 76546048,
Name = "DH2",
Type = "\"DOS\\3\"",
Offset = 92504064,
Length = 149504,
Sequence = 1,
Start = 180672
Size = 76546048,
Name = "DH2",
Type = "\"DOS\\3\"",
Offset = 92504064,
Length = 149504,
Sequence = 1,
Start = 180672
},
new Partition
{
Description = null,
Size = 78741504,
Name = "DH3",
Type = "\"DOS\\3\"",
Offset = 169050112,
Length = 153792,
Sequence = 2,
Start = 330176
Size = 78741504,
Name = "DH3",
Type = "\"DOS\\3\"",
Offset = 169050112,
Length = 153792,
Sequence = 2,
Start = 330176
},
new Partition
{
Description = null,
Size = 78020608,
Name = "DH4",
Type = "\"DOS\\7\"",
Offset = 247791616,
Length = 152384,
Sequence = 3,
Start = 483968
Size = 78020608,
Name = "DH4",
Type = "\"DOS\\7\"",
Offset = 247791616,
Length = 152384,
Sequence = 3,
Start = 483968
},
new Partition
{
Description = null,
Size = 85000192,
Name = "DH5",
Type = "\"SFS\\0\"",
Offset = 325812224,
Length = 166016,
Sequence = 4,
Start = 636352
Size = 85000192,
Name = "DH5",
Type = "\"SFS\\0\"",
Offset = 325812224,
Length = 166016,
Sequence = 4,
Start = 636352
},
new Partition
{
Description = null,
Size = 113541120,
Name = "DH6",
Type = "\"SFS\\2\"",
Offset = 410812416,
Length = 221760,
Sequence = 5,
Start = 802368
Size = 113541120,
Name = "DH6",
Type = "\"SFS\\2\"",
Offset = 410812416,
Length = 221760,
Sequence = 5,
Start = 802368
}
},
// Parted
@@ -188,35 +188,35 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Size = 8225280,
Name = "primary",
Type = "\"\0\0\0\\0\"",
Offset = 8225280,
Length = 16065,
Sequence = 0,
Start = 16065
Size = 8225280,
Name = "primary",
Type = "\"\0\0\0\\0\"",
Offset = 8225280,
Length = 16065,
Sequence = 0,
Start = 16065
},
new Partition
{
Description = null,
Size = 24675840,
Name = "name",
Type = "\"FAT\\1\"",
Offset = 16450560,
Length = 48195,
Sequence = 1,
Start = 32130
Size = 24675840,
Name = "name",
Type = "\"FAT\\1\"",
Offset = 16450560,
Length = 48195,
Sequence = 1,
Start = 32130
},
new Partition
{
Description = null,
Size = 90478080,
Name = "partition",
Type = "\"\0\0\0\\0\"",
Offset = 41126400,
Length = 176715,
Sequence = 2,
Start = 80325
Size = 90478080,
Name = "partition",
Type = "\"\0\0\0\\0\"",
Offset = 41126400,
Length = 176715,
Sequence = 2,
Start = 80325
}
}
};
@@ -226,8 +226,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "rdb", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "rdb", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -237,13 +237,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]);
}
}
}

View File

@@ -48,128 +48,128 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = null,
Type = "XFS",
Length = 40961,
Sequence = 0,
Start = 16065
Name = null,
Type = "XFS",
Length = 40961,
Sequence = 0,
Start = 16065
},
new Partition
{
Description = null,
Name = null,
Type = "Linux RAID",
Length = 61441,
Sequence = 1,
Start = 64260
Name = null,
Type = "Linux RAID",
Length = 61441,
Sequence = 1,
Start = 64260
},
new Partition
{
Description = null,
Name = null,
Type = "Track replacements",
Length = 81921,
Sequence = 2,
Start = 128520
Name = null,
Type = "Track replacements",
Length = 81921,
Sequence = 2,
Start = 128520
},
new Partition
{
Description = null,
Name = null,
Type = "Sector replacements",
Length = 92161,
Sequence = 3,
Start = 224910
Name = null,
Type = "Sector replacements",
Length = 92161,
Sequence = 3,
Start = 224910
},
new Partition
{
Description = null,
Name = null,
Type = "Raw data (swap)",
Length = 102401,
Sequence = 4,
Start = 321300
Name = null,
Type = "Raw data (swap)",
Length = 102401,
Sequence = 4,
Start = 321300
},
new Partition
{
Description = null,
Name = null,
Type = "4.2BSD Fast File System",
Length = 30721,
Sequence = 5,
Start = 433755
Name = null,
Type = "4.2BSD Fast File System",
Length = 30721,
Sequence = 5,
Start = 433755
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX System V",
Length = 71681,
Sequence = 6,
Start = 465885
Name = null,
Type = "UNIX System V",
Length = 71681,
Sequence = 6,
Start = 465885
},
new Partition
{
Description = null,
Name = null,
Type = "EFS",
Length = 10241,
Sequence = 7,
Start = 546210
Name = null,
Type = "EFS",
Length = 10241,
Sequence = 7,
Start = 546210
},
new Partition
{
Description = null,
Name = null,
Type = "Logical volume",
Length = 122881,
Sequence = 8,
Start = 562275
Name = null,
Type = "Logical volume",
Length = 122881,
Sequence = 8,
Start = 562275
},
new Partition
{
Description = null,
Name = null,
Type = "Raw logical volume",
Length = 133121,
Sequence = 9,
Start = 690795
Name = null,
Type = "Raw logical volume",
Length = 133121,
Sequence = 9,
Start = 690795
},
new Partition
{
Description = null,
Name = null,
Type = "XFS log device",
Length = 51201,
Sequence = 10,
Start = 835380
Name = null,
Type = "XFS log device",
Length = 51201,
Sequence = 10,
Start = 835380
},
new Partition
{
Description = null,
Name = null,
Type = "Linux swap",
Length = 30721,
Sequence = 11,
Start = 899640
Name = null,
Type = "Linux swap",
Length = 30721,
Sequence = 11,
Start = 899640
},
new Partition
{
Description = null,
Name = null,
Type = "SGI XVM",
Length = 6145,
Sequence = 12,
Start = 931770
Name = null,
Type = "SGI XVM",
Length = 6145,
Sequence = 12,
Start = 931770
},
new Partition
{
Description = null,
Name = null,
Type = "Linux",
Length = 64260,
Sequence = 13,
Start = 947835
Name = null,
Type = "Linux",
Length = 64260,
Sequence = 13,
Start = 947835
}
},
// GNU Parted
@@ -178,38 +178,38 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = null,
Type = "Raw data (swap)",
Length = 22528,
Sequence = 0,
Start = 6144
Name = null,
Type = "Raw data (swap)",
Length = 22528,
Sequence = 0,
Start = 6144
},
new Partition
{
Description = null,
Name = null,
Type = "Raw data (swap)",
Length = 67584,
Sequence = 1,
Start = 30720
Name = null,
Type = "Raw data (swap)",
Length = 67584,
Sequence = 1,
Start = 30720
},
new Partition
{
Description = null,
Name = null,
Type = "Raw data (swap)",
Length = 94208,
Sequence = 2,
Start = 100352
Name = null,
Type = "Raw data (swap)",
Length = 94208,
Sequence = 2,
Start = 100352
},
new Partition
{
Description = null,
Name = null,
Type = "XFS",
Length = 36864,
Sequence = 3,
Start = 196608
Name = null,
Type = "XFS",
Length = 36864,
Sequence = 3,
Start = 196608
}
}
};
@@ -219,8 +219,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "sgi", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "sgi", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -232,11 +232,11 @@ namespace DiscImageChef.Tests.Partitions
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
Assert.AreEqual(wanted[i][j].Length * 512, 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].Start * 512, 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].Type, partitions[j].Type, testfiles[i]);
Assert.AreEqual(wanted[i][j].Start * 512, 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]);
}
}
}

View File

@@ -49,65 +49,65 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = null,
Type = "Linux",
Length = 204800,
Sequence = 0,
Start = 0
Name = null,
Type = "Linux",
Length = 204800,
Sequence = 0,
Start = 0
},
new Partition
{
Description = null,
Name = null,
Type = "Sun boot",
Length = 102400,
Sequence = 1,
Start = 208845
Name = null,
Type = "Sun boot",
Length = 102400,
Sequence = 1,
Start = 208845
},
new Partition
{
Description = null,
Name = null,
Type = "Sun /",
Length = 102400,
Sequence = 2,
Start = 321300
Name = null,
Type = "Sun /",
Length = 102400,
Sequence = 2,
Start = 321300
},
new Partition
{
Description = null,
Name = null,
Type = "Sun /home",
Length = 102400,
Sequence = 3,
Start = 433755
Name = null,
Type = "Sun /home",
Length = 102400,
Sequence = 3,
Start = 433755
},
new Partition
{
Description = null,
Name = null,
Type = "Sun swap",
Length = 153600,
Sequence = 4,
Start = 546210
Name = null,
Type = "Sun swap",
Length = 153600,
Sequence = 4,
Start = 546210
},
new Partition
{
Description = null,
Name = null,
Type = "Sun /usr",
Length = 208845,
Sequence = 5,
Start = 706860
Name = null,
Type = "Sun /usr",
Length = 208845,
Sequence = 5,
Start = 706860
},
new Partition
{
Description = null,
Name = null,
Type = "Linux swap",
Length = 96390,
Sequence = 6,
Start = 915705
Name = null,
Type = "Linux swap",
Length = 96390,
Sequence = 6,
Start = 915705
}
},
// GNU Parted
@@ -116,29 +116,29 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = null,
Type = "Linux",
Length = 49152,
Sequence = 0,
Start = 0
Name = null,
Type = "Linux",
Length = 49152,
Sequence = 0,
Start = 0
},
new Partition
{
Description = null,
Name = null,
Type = "Linux",
Length = 80325,
Sequence = 1,
Start = 64260
Name = null,
Type = "Linux",
Length = 80325,
Sequence = 1,
Start = 64260
},
new Partition
{
Description = null,
Name = null,
Type = "Linux",
Length = 96390,
Sequence = 2,
Start = 144585
Name = null,
Type = "Linux",
Length = 96390,
Sequence = 2,
Start = 144585
}
}
};
@@ -148,8 +148,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "sun", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "sun", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -161,11 +161,11 @@ namespace DiscImageChef.Tests.Partitions
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
Assert.AreEqual(wanted[i][j].Length * 512, 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].Start * 512, 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].Type, partitions[j].Type, testfiles[i]);
Assert.AreEqual(wanted[i][j].Start * 512, 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]);
}
}
}

View File

@@ -48,146 +48,146 @@ namespace DiscImageChef.Tests.Partitions
new Partition
{
Description = null,
Name = null,
Type = "UNIX: Boot",
Length = 34,
Sequence = 0,
Start = 1
Name = null,
Type = "UNIX: Boot",
Length = 34,
Sequence = 0,
Start = 1
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: Whole disk",
Length = 1023119,
Sequence = 1,
Start = 1
Name = null,
Type = "UNIX: Whole disk",
Length = 1023119,
Sequence = 1,
Start = 1
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: Stand",
Length = 253,
Sequence = 2,
Start = 63
Name = null,
Type = "UNIX: Stand",
Length = 253,
Sequence = 2,
Start = 63
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 3,
Start = 378
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 3,
Start = 378
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 4,
Start = 79002
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 4,
Start = 79002
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 5,
Start = 157626
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 5,
Start = 157626
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 6,
Start = 236250
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 6,
Start = 236250
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 7,
Start = 314874
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 7,
Start = 314874
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 8,
Start = 393498
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 8,
Start = 393498
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 9,
Start = 472122
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 9,
Start = 472122
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 10,
Start = 550746
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 10,
Start = 550746
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 11,
Start = 629370
Name = null,
Type = "UNIX: /usr",
Length = 78624,
Sequence = 11,
Start = 629370
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 76608,
Sequence = 12,
Start = 707994
Name = null,
Type = "UNIX: /usr",
Length = 76608,
Sequence = 12,
Start = 707994
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 77616,
Sequence = 13,
Start = 784602
Name = null,
Type = "UNIX: /usr",
Length = 77616,
Sequence = 13,
Start = 784602
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 75600,
Sequence = 14,
Start = 862218
Name = null,
Type = "UNIX: /usr",
Length = 75600,
Sequence = 14,
Start = 862218
},
new Partition
{
Description = null,
Name = null,
Type = "UNIX: /usr",
Length = 84672,
Sequence = 15,
Start = 937818
Name = null,
Type = "UNIX: /usr",
Length = 84672,
Sequence = 15,
Start = 937818
}
}
};
@@ -197,8 +197,8 @@ namespace DiscImageChef.Tests.Partitions
{
for(int i = 0; i < testfiles.Length; i++)
{
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "vtoc", testfiles[i]);
IFilter filter = new LZip();
string location = Path.Combine(Consts.TestFilesRoot, "partitions", "vtoc", testfiles[i]);
IFilter filter = new LZip();
filter.Open(location);
IMediaImage image = new Vdi();
Assert.AreEqual(true, image.Open(filter), testfiles[i]);
@@ -210,11 +210,11 @@ namespace DiscImageChef.Tests.Partitions
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
Assert.AreEqual(wanted[i][j].Length * 512, 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].Start * 512, 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].Type, partitions[j].Type, testfiles[i]);
Assert.AreEqual(wanted[i][j].Start * 512, 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]);
}
}
}