From 86a5197c128bb12709703710e2662c3374958953 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 19 Jul 2017 05:19:10 +0100 Subject: [PATCH] Adjusted test parameters. --- DiscImageChef.Tests/Filesystems/AFFS.cs | 2 +- DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs | 6 +++--- DiscImageChef.Tests/Filesystems/AFFS_MBR.cs | 4 ++-- DiscImageChef.Tests/Filesystems/AFFS_RDB.cs | 12 ++++++------ DiscImageChef.Tests/Filesystems/AOFS.cs | 2 +- DiscImageChef.Tests/Filesystems/AOFS_MBR.cs | 2 +- DiscImageChef.Tests/Filesystems/AOFS_RDB.cs | 6 +++--- DiscImageChef.Tests/Filesystems/FAT12.cs | 2 +- DiscImageChef.Tests/Partitions/GPT.cs | 18 +++++++++--------- DiscImageChef.Tests/Partitions/RDB.cs | 16 ++++++++-------- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/DiscImageChef.Tests/Filesystems/AFFS.cs b/DiscImageChef.Tests/Filesystems/AFFS.cs index 9a3288c5d..591944d05 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null, null, + "A5D9FAE2", "A5DA0CC9", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs b/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs index fe7c5b8f7..5e3f33366 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS2_RDB.cs @@ -63,11 +63,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 1022080, + 511040, }; readonly int[] clustersize = { - 512, + 1024, }; readonly string[] volumename = { @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null, + "611D85E5", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs b/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs index 56a0e6d52..fc8d8b09a 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS_MBR.cs @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null,null, + "A582DCA4","A582BC91", }; [Test] @@ -96,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0x2D") + if(partitions[j].PartitionType == "0x2D" || partitions[j].PartitionType == "0x2E") { part = j; break; diff --git a/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs b/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs index 4ff00542b..49483aabb 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS_RDB.cs @@ -66,13 +66,13 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 1020064,1020064,407232,407232, - 1020064,1020064,1020064, + 510032,510032,407232,407232, + 511040,511040,511040, }; readonly int[] clustersize = { - 512,512,512,512, - 512,512,512, + 1024,1024,512,512, + 1024,1024,1024, }; readonly string[] volumename = { @@ -81,8 +81,8 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null,null,null,null, - null,null,null, + "A56D0F5C","A56D049C","A58307A9","A58304BE", + "A56CC7EE","A56CDDC4","A56CC133", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/AOFS.cs b/DiscImageChef.Tests/Filesystems/AOFS.cs index 71c8b9e0e..99d63c2e8 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null, null, + "A5D9FE71", "A5D9F14F", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs b/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs index 1910a3c67..19d45d811 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS_MBR.cs @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null,null, + "A582C90C","A582CE0D", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs b/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs index cd988dcad..6ce4ff271 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS_RDB.cs @@ -63,11 +63,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 1020064,1020064,407232,407232, + 510032,510032,407232,407232, }; readonly int[] clustersize = { - 512,512,512,512, + 1024,1024,512,512, }; readonly string[] volumename = { @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - null,null,null,null, + "A56D13BB","A56D0415","A582F3A0","A5830B06", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs index 4cfce5bb2..5ed396283 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12.cs @@ -1272,7 +1272,7 @@ namespace DiscImageChef.Tests.Filesystems // NetBSD 1.6 "VOLUMELABEL","VOLUMELABEL", // NeXTStep 3.3 - "VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","VOLUME LABE", // OpenStep for Mach 4.0 "VOLUMELABEL","VOLUMELABEL", // OpenStep for Mach 4.2 diff --git a/DiscImageChef.Tests/Partitions/GPT.cs b/DiscImageChef.Tests/Partitions/GPT.cs index 10e8338bb..e2c1dd24f 100644 --- a/DiscImageChef.Tests/Partitions/GPT.cs +++ b/DiscImageChef.Tests/Partitions/GPT.cs @@ -57,26 +57,26 @@ namespace DiscImageChef.Tests.Partitions readonly Partition[][] wanted = { // Linux new []{ - new Partition{ PartitionDescription = null, PartitionLength = 10485760, PartitionName = null, PartitionType = "EFI System", PartitionStart = 1048576, PartitionSectors = 20480, + new Partition{ PartitionDescription = null, PartitionLength = 10485760, PartitionName = "EFI System", PartitionType = "EFI System", PartitionStart = 1048576, PartitionSectors = 20480, PartitionSequence = 0, PartitionStartSector = 2048 }, - new Partition{ PartitionDescription = null, PartitionLength = 15728640, PartitionName = null, PartitionType = "Microsoft Basic data", PartitionStart = 11534336, PartitionSectors = 30720, + new Partition{ PartitionDescription = null, PartitionLength = 15728640, PartitionName = "Microsoft basic data", PartitionType = "Microsoft Basic data", PartitionStart = 11534336, PartitionSectors = 30720, PartitionSequence = 1, PartitionStartSector = 22528 }, - new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = null, PartitionType = "Apple Label", PartitionStart = 27262976, PartitionSectors = 40960, + new Partition{ PartitionDescription = null, PartitionLength = 20971520, PartitionName = "Apple label", PartitionType = "Apple Label", PartitionStart = 27262976, PartitionSectors = 40960, PartitionSequence = 2, PartitionStartSector = 53248 }, - new Partition{ PartitionDescription = null, PartitionLength = 26214400, PartitionName = null, PartitionType = "Solaris /usr or Apple ZFS", PartitionStart = 48234496, PartitionSectors = 51200, + new Partition{ PartitionDescription = null, PartitionLength = 26214400, PartitionName = "Solaris /usr & Mac ZFS", PartitionType = "Solaris /usr or Apple ZFS", PartitionStart = 48234496, PartitionSectors = 51200, PartitionSequence = 3, PartitionStartSector = 94208 }, - new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = null, PartitionType = "FreeBSD ZFS", PartitionStart = 74448896, PartitionSectors = 61440, + new Partition{ PartitionDescription = null, PartitionLength = 31457280, PartitionName = "FreeBSD ZFS", PartitionType = "FreeBSD ZFS", PartitionStart = 74448896, PartitionSectors = 61440, PartitionSequence = 4, PartitionStartSector = 145408 }, - new Partition{ PartitionDescription = null, PartitionLength = 28294656, PartitionName = null, PartitionType = "HP-UX Data", PartitionStart = 105906176, PartitionSectors = 55263, + new Partition{ PartitionDescription = null, PartitionLength = 28294656, PartitionName = "HP-UX data", PartitionType = "HP-UX Data", PartitionStart = 105906176, PartitionSectors = 55263, PartitionSequence = 5, PartitionStartSector = 206848 }, }, // Parted new []{ - new Partition{ PartitionDescription = null, PartitionLength = 42991616, PartitionName = null, PartitionType = "Apple HFS", PartitionStart = 1048576, PartitionSectors = 83968, + new Partition{ PartitionDescription = null, PartitionLength = 42991616, PartitionName = "", PartitionType = "Apple HFS", PartitionStart = 1048576, PartitionSectors = 83968, PartitionSequence = 0, PartitionStartSector = 2048 }, - new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = null, PartitionType = "Linux filesystem", PartitionStart = 44040192, PartitionSectors = 102400, + new Partition{ PartitionDescription = null, PartitionLength = 52428800, PartitionName = "", PartitionType = "Linux filesystem", PartitionStart = 44040192, PartitionSectors = 102400, PartitionSequence = 1, PartitionStartSector = 86016 }, - new Partition{ PartitionDescription = null, PartitionLength = 36700160, PartitionName = null, PartitionType = "Microsoft Basic data", PartitionStart = 96468992, PartitionSectors = 71680, + new Partition{ PartitionDescription = null, PartitionLength = 36700160, PartitionName = "", PartitionType = "Microsoft Basic data", PartitionStart = 96468992, PartitionSectors = 71680, PartitionSequence = 2, PartitionStartSector = 188416 }, }, }; diff --git a/DiscImageChef.Tests/Partitions/RDB.cs b/DiscImageChef.Tests/Partitions/RDB.cs index 732268bab..b4708db27 100644 --- a/DiscImageChef.Tests/Partitions/RDB.cs +++ b/DiscImageChef.Tests/Partitions/RDB.cs @@ -74,24 +74,24 @@ namespace DiscImageChef.Tests.Partitions new []{ new Partition{ PartitionDescription = null, PartitionLength = 91455488, PartitionName = "DH1", PartitionType = "\"DOS\\1\"", PartitionStart = 1048576, PartitionSectors = 178624, PartitionSequence = 0, PartitionStartSector = 2048 }, - new Partition{ PartitionDescription = null, PartitionLength = 92504064, PartitionName = "DH1", PartitionType = "\"DOS\\3\"", PartitionStart = 76546048, PartitionSectors = 149504, + new Partition{ PartitionDescription = null, PartitionLength = 76546048, PartitionName = "DH2", PartitionType = "\"DOS\\3\"", PartitionStart = 92504064, PartitionSectors = 149504, PartitionSequence = 1, PartitionStartSector = 180672 }, - new Partition{ PartitionDescription = null, PartitionLength = 169050112, PartitionName = "DH1", PartitionType = "\"DOS\\3\"", PartitionStart = 78741504, PartitionSectors = 153792, + new Partition{ PartitionDescription = null, PartitionLength = 78741504, PartitionName = "DH3", PartitionType = "\"DOS\\3\"", PartitionStart = 169050112, PartitionSectors = 153792, PartitionSequence = 2, PartitionStartSector = 330176 }, - new Partition{ PartitionDescription = null, PartitionLength = 247791616, PartitionName = "DH1", PartitionType = "\"DOS\\7\"", PartitionStart = 78020608, PartitionSectors = 152384, + new Partition{ PartitionDescription = null, PartitionLength = 78020608, PartitionName = "DH4", PartitionType = "\"DOS\\7\"", PartitionStart = 247791616, PartitionSectors = 152384, PartitionSequence = 3, PartitionStartSector = 483968 }, - new Partition{ PartitionDescription = null, PartitionLength = 325812224, PartitionName = "DH1", PartitionType = "\"SFS\\0\"", PartitionStart = 85000192, PartitionSectors = 166016, + new Partition{ PartitionDescription = null, PartitionLength = 85000192, PartitionName = "DH5", PartitionType = "\"SFS\\0\"", PartitionStart = 325812224, PartitionSectors = 166016, PartitionSequence = 4, PartitionStartSector = 636352 }, - new Partition{ PartitionDescription = null, PartitionLength = 410812416, PartitionName = "DH1", PartitionType = "\"SFS\\2\"", PartitionStart = 113541120, PartitionSectors = 221760, + new Partition{ PartitionDescription = null, PartitionLength = 113541120, PartitionName = "DH6", PartitionType = "\"SFS\\2\"", PartitionStart = 410812416, PartitionSectors = 221760, PartitionSequence = 5, PartitionStartSector = 802368 }, }, - // AmigaOS 4.0 + // Parted new []{ - new Partition{ PartitionDescription = null, PartitionLength = 8225280, PartitionName = "primary", PartitionType = "\"\\0\"", PartitionStart = 8225280, PartitionSectors = 16065, + new Partition{ PartitionDescription = null, PartitionLength = 8225280, PartitionName = "primary", PartitionType = "\"\0\0\0\\0\"", PartitionStart = 8225280, PartitionSectors = 16065, PartitionSequence = 0, PartitionStartSector = 16065 }, new Partition{ PartitionDescription = null, PartitionLength = 24675840, PartitionName = "name", PartitionType = "\"FAT\\1\"", PartitionStart = 16450560, PartitionSectors = 48195, PartitionSequence = 1, PartitionStartSector = 32130 }, - new Partition{ PartitionDescription = null, PartitionLength = 90478080, PartitionName = "partition", PartitionType = "\"\\0\"", PartitionStart = 41126400, PartitionSectors = 176715, + new Partition{ PartitionDescription = null, PartitionLength = 90478080, PartitionName = "partition", PartitionType = "\"\0\0\0\\0\"", PartitionStart = 41126400, PartitionSectors = 176715, PartitionSequence = 2, PartitionStartSector = 80325 }, }, };