Refactor: Simplify field names.

This commit is contained in:
2017-07-19 16:37:11 +01:00
parent 711d19fd04
commit 16434f2788
170 changed files with 1816 additions and 1811 deletions

View File

@@ -57,58 +57,58 @@ namespace DiscImageChef.Tests.Partitions
readonly Partition[][] wanted = {
// Linux (AHDI)
new []{
new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "GEM", PartitionStart = 512, PartitionSectors = 61440,
PartitionSequence = 0, PartitionStartSector = 1 },
new Partition{ PartitionDescription = null, PartitionLength = 41943040, PartitionName = null, PartitionType = "BGM", PartitionStart = 31457792, PartitionSectors = 81920,
PartitionSequence = 1, PartitionStartSector = 61441 },
new Partition{ PartitionDescription = null, PartitionLength = 56402432, PartitionName = null, PartitionType = "LNX", PartitionStart = 73400832, PartitionSectors = 110161,
PartitionSequence = 2, PartitionStartSector = 143361 },
new Partition{ PartitionDescription = null, PartitionLength = 43212800, PartitionName = null, PartitionType = "MAC", PartitionStart = 129803264, PartitionSectors = 84400,
PartitionSequence = 3, PartitionStartSector = 253522 },
new Partition{ PartitionDescription = null, PartitionLength = 57671680, PartitionName = null, PartitionType = "MIX", PartitionStart = 173016064, PartitionSectors = 112640,
PartitionSequence = 4, PartitionStartSector = 337922 },
new Partition{ PartitionDescription = null, PartitionLength = 62914560, PartitionName = null, PartitionType = "MNX", PartitionStart = 230687744, PartitionSectors = 122880,
PartitionSequence = 5, PartitionStartSector = 450562 },
new Partition{ PartitionDescription = null, PartitionLength = 73400320, PartitionName = null, PartitionType = "RAW", PartitionStart = 293602304, PartitionSectors = 143360,
PartitionSequence = 6, PartitionStartSector = 573442 },
new Partition{ PartitionDescription = null, PartitionLength = 78643200, PartitionName = null, PartitionType = "SWP", PartitionStart = 367002624, PartitionSectors = 153600,
PartitionSequence = 7, PartitionStartSector = 716802 },
new Partition{ PartitionDescription = null, PartitionLength = 1048576, PartitionName = null, PartitionType = "UNX", PartitionStart = 445645824, PartitionSectors = 2048,
PartitionSequence = 8, PartitionStartSector = 870402 },
new Partition{ PartitionDescription = null, PartitionLength = 77593600, PartitionName = null, PartitionType = "LNX", PartitionStart = 446694400, PartitionSectors = 151550,
PartitionSequence = 9, PartitionStartSector = 872450 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
},
// Linux (ICD)
new []{
new Partition{ PartitionDescription = null, PartitionLength = 15728640, PartitionName = null, PartitionType = "GEM", PartitionStart = 512, PartitionSectors = 30720,
PartitionSequence = 0, PartitionStartSector = 1 },
new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = null, PartitionType = "UNX", PartitionStart = 15729152, PartitionSectors = 40960,
PartitionSequence = 1, PartitionStartSector = 30721 },
new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "LNX", PartitionStart = 36700672, PartitionSectors = 61440,
PartitionSequence = 2, PartitionStartSector = 71681 },
new Partition{ PartitionDescription = null, PartitionLength = 41943040, PartitionName = null, PartitionType = "BGM", PartitionStart = 68157952, PartitionSectors = 81920,
PartitionSequence = 3, PartitionStartSector = 133121 },
new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = null, PartitionType = "MAC", PartitionStart = 110100992, PartitionSectors = 102400,
PartitionSequence = 4, PartitionStartSector = 215041 },
new Partition{ PartitionDescription = null, PartitionLength = 62914560, PartitionName = null, PartitionType = "MIX", PartitionStart = 162529792, PartitionSectors = 122880,
PartitionSequence = 5, PartitionStartSector = 317441 },
new Partition{ PartitionDescription = null, PartitionLength = 83886080, PartitionName = null, PartitionType = "SWP", PartitionStart = 225444352, PartitionSectors = 163840,
PartitionSequence = 6, PartitionStartSector = 440321 },
new Partition{ PartitionDescription = null, PartitionLength = 103809024, PartitionName = null, PartitionType = "MNX", PartitionStart = 309330432, PartitionSectors = 202752,
PartitionSequence = 7, PartitionStartSector = 604161 },
new Partition{ PartitionDescription = null, PartitionLength = 104857600, PartitionName = null, PartitionType = "LNX", PartitionStart = 413139456, PartitionSectors = 204800,
PartitionSequence = 8, PartitionStartSector = 806913 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, Size = 104857600, Name = null, Type = "LNX", Offset = 413139456, Length = 204800,
Sequence = 8, Start = 806913 },
},
// TOS 1.04
new []{
new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 1024, PartitionSectors = 14336,
PartitionSequence = 0, PartitionStartSector = 2 },
new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 7341056, PartitionSectors = 14336,
PartitionSequence = 1, PartitionStartSector = 14338 },
new Partition{ PartitionDescription = null, PartitionLength = 7340032, PartitionName = null, PartitionType = "GEM", PartitionStart = 14681088, PartitionSectors = 14336,
PartitionSequence = 2, PartitionStartSector = 28674 },
new Partition{ PartitionDescription = null, PartitionLength = 7339008, PartitionName = null, PartitionType = "GEM", PartitionStart = 22021120, PartitionSectors = 14334,
PartitionSequence = 3, PartitionStartSector = 43010 },
new Partition{ Description = null, 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 },
new Partition{ Description = null, 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 },
},
};
@@ -129,13 +129,13 @@ namespace DiscImageChef.Tests.Partitions
{
// Too chatty
//Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, 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]);
}
}
}