Corrected expected values.

2025-12-16 19:24:27 +00:00 · 2017-07-10 23:24:48 +01:00
parent 73aa763c3e
commit 147b08389c
6 changed files with 55 additions and 53 deletions
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
@@ -50,9 +50,10 @@ namespace DiscImageChef.Tests.Filesystems
    [TestFixture]
    public class HFSPlus_APM
    {
+        // Missing Darwin 1.4.1
        readonly string[] testfiles = {
            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz","darwin_1.3.1.vdi.lz","darwin_1.3.1_wrapped.vdi.lz",
-            "darwin_1.4.1.vdi.lz","darwin_1.4.1_wrapped.vdi.lz","darwin_6.0.2.vdi.lz","darwin_6.0.2_wrapped.vdi.lz",
+            "darwin_1.4.1_wrapped.vdi.lz","darwin_6.0.2.vdi.lz","darwin_6.0.2_wrapped.vdi.lz",
            "darwin_8.0.1_journal.vdi.lz","darwin_8.0.1.vdi.lz","darwin_8.0.1_wrapped.vdi.lz","macos_8.1.vdi.lz",
            "macos_9.0.4.vdi.lz","macos_9.1.vdi.lz","macos_9.2.1.vdi.lz","macos_9.2.2.vdi.lz",
            "macosx_10.2.vdi.lz","macosx_10.3_journal.vdi.lz","macosx_10.3.vdi.lz","macosx_10.4_journal.vdi.lz",
@@ -61,7 +62,7 @@ namespace DiscImageChef.Tests.Filesystems

        readonly ulong[] sectors = {
            409600, 614400, 819200, 614400,
-            819200, 614400, 819200, 614400,
+            614400, 819200, 614400,
            1228800, 819200, 614400, 4194304,
            4194304, 4194304,4194304,4194304,
            4194304, 2097152, 4194304, 2097152,
@@ -70,7 +71,7 @@ namespace DiscImageChef.Tests.Filesystems

        readonly uint[] sectorsize = {
            512, 512, 512, 512,
-            512, 512, 512, 512,
+            512, 512, 512,
            512, 512, 512, 512,
            512, 512, 512, 512,
            512, 512, 512, 512,
@@ -78,17 +79,17 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly long[] clusters = {
-            51190, 76790, 51190, 76790,
-            51190, 76790, 51190, 76790,
-            51190, 76790, 51190, 76790,
-            51190, 76790, 51190, 76790,
-            51190, 76790, 51190, 76790,
-            51190,
+            51190, 76790, 102392, 76774,
+            76774, 102392, 76774,
+            153592, 102392, 76774, 524152,
+            524088, 524088, 524088, 524088,
+            524008, 261884, 491240, 261884,
+            491240,
        };

        readonly int[] clustersize = {
            4096, 4096, 4096, 4096,
-            4096, 4096, 4096, 4096,
+            4096, 4096, 4096,
            4096, 4096, 4096, 4096,
            4096, 4096, 4096, 4096,
            4096, 4096, 4096, 4096,
@@ -97,7 +98,7 @@ namespace DiscImageChef.Tests.Filesystems

        readonly string[] volumename = {
            null, null, null, null,
-            null, null, null, null,
+            null, null, null,
            null, null, null, null,
            null, null, null, null,
            null, null, null, null,
@@ -105,19 +106,19 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN",
+            "FA94762D086A18A9","33D4A309C8E7BD10",null,null,
+            null,null,null,
+            "4D5140EB8F14A385","0D592249833E2DC4","AA616146576BD9BC",null,
+            null,null,null,null,
+            "EFA132FFFAC1ADA6","009D570FFCF8F20B","17F6F33AB313EE32","AD5690C093F66FCF",
+            "A7D63854DF76DDE6",
        };

        readonly string[] oemid = {
-            "10.0","HFSJ","10.0","HFSJ",
-            "10.0","HFSJ","10.0","HFSJ",
-            "10.0","HFSJ","10.0","HFSJ",
-            "10.0","HFSJ","10.0","HFSJ",
+            "10.0","HFSJ","10.0","10.0",
+            "10.0","10.0","10.0",
+            "10.0","10.0","10.0","8.10",
+            "8.10","8.10","8.10","8.10",
            "10.0","HFSJ","10.0","HFSJ",
            "10.0",
        };
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
@@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN",
+            "D8C68470046E67BE","FD3CB598F3C6294A",
        };

        readonly string[] oemid = {
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
@@ -47,62 +47,63 @@ using NUnit.Framework;

 namespace DiscImageChef.Tests.Filesystems
 {
+    // Mising Darwin 6.0.2 wrapped
    [TestFixture]
    public class HFSPlus_MBR
    {
        readonly string[] testfiles = {
            "macosx_10.11.vdi.lz", "macosx_10.11_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz",
            "darwin_1.3.1.vdi.lz","darwin_1.3.1_wrapped.vdi.lz","darwin_1.4.1.vdi.lz","darwin_1.4.1_wrapped.vdi.lz",
-            "darwin_6.0.2.vdi.lz","darwin_6.0.2_wrapped.vdi.lz","darwin_8.0.1_journal.vdi.lz","darwin_8.0.1.vdi.lz",
+            "darwin_6.0.2.vdi.lz","darwin_8.0.1_journal.vdi.lz","darwin_8.0.1.vdi.lz",
            "darwin_8.0.1_wrapped.vdi.lz",
        };

        readonly ulong[] sectors = {
            303104, 352256, 262144, 262144,
-            303104, 352256, 262144, 262144,
-            303104, 352256, 262144, 262144,
-            303104,
+            819200, 614400, 819200, 614400,
+            819200, 1228800, 819200,
+            614400,
        };

        readonly uint[] sectorsize = {
            512, 512, 512, 512,
            512, 512, 512, 512,
-            512, 512, 512, 512,
+            512, 512, 512,
            512, 
        };

        readonly long[] clusters = {
            37878, 44021, 32512, 32512,
-            37878, 44021, 32512, 32512,
-            37878, 44021, 32512, 32512,
-            37878,
+            102178, 76708, 102178, 76708,
+            102178, 153592, 102392,
+            76774,
        };

        readonly int[] clustersize = {
            4096, 4096, 4096, 4096,
            4096, 4096, 4096, 4096,
-            4096, 4096, 4096, 4096,
+            4096, 4096, 4096,
            4096,
        };

        readonly string[] volumename = {
            null, null, null, null,
            null, null, null, null,
-            null, null, null, null,
+            null, null, null,
            null,
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000",
-            "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000",
-            "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000",
-            "UNKNOWN",
+            "C84F550907D13F50","016599F88029F73D",null,null,
+            null,null,null,null,
+            null,"F92964F9B3F64ABB","A8FAC484A0A2B177",
+            "D5D5BF1346AD2B8D",
        };

        readonly string[] oemid = {
            "10.0","HFSJ","10.0","10.0",
-            "10.0","HFSJ","10.0","10.0",
-            "10.0","HFSJ","10.0","10.0",
+            "10.0","10.0","10.0","10.0",
+            "10.0","10.0","10.0",
            "10.0",
        };

--- a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
@@ -56,8 +56,8 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly ulong[] sectors = {
-            819200, 1228800, 819200, 1228800,
-            819200, 1228800,
+            819200, 1228800, 1638400, 1433600,
+            4194304, 1024000,
        };

        readonly uint[] sectorsize = {
@@ -66,8 +66,8 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly long[] clusters = {
-            102390, 153590,102390, 153590,
-            102390, 153590,
+            102390, 153590, 204792, 179192,
+            491290, 127770,
        };

        readonly int[] clustersize = {
@@ -81,13 +81,13 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN","UNKNOWN","UNKNOWN",
-            "UNKNOWN","UNKNOWN",
+            "CC2D56884950D9AE","7AF1175D8EA7A072","BB4ABD7E7E2FF5AF","E2F212D815EF77B5",
+            "5A8C646A5D77EB16","258C51A750F6A485",
        };

        readonly string[] oemid = {
-            "10.0","HFSJ","10.0","HFSJ",
-            "10.0","HFSJ",
+            "10.0","HFSJ","10.0","10.0",
+            "HFSJ","10.0",
        };

        [Test]
--- a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
@@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN",
+            "328343989312AE9F","FB98504073464C5C",
        };

        readonly string[] oemid = {
@@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems
        {
            for(int i = 0; i < testfiles.Length; i++)
            {
-                string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_apm", testfiles[i]);
+                string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_gpt", testfiles[i]);
                Filter filter = new LZip();
                filter.Open(location);
                ImagePlugin image = new VDI();
--- a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
@@ -57,7 +57,7 @@ namespace DiscImageChef.Tests.Filesystems

        readonly ulong[] sectors = {
            393216, 409600, 262144, 262144,
-            262144, 262144,
+            1638400, 1433600,
        };

        readonly uint[] sectorsize = {
@@ -66,8 +66,8 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly long[] clusters = {
-            102390, 153590, 32512, 32512,
-            32512, 32512,
+            49140, 51187, 32512, 32512,
+            204792, 179192,
        };

        readonly int[] clustersize = {
@@ -81,8 +81,8 @@ namespace DiscImageChef.Tests.Filesystems
        };

        readonly string[] volumeserial = {
-            "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000",
-            "UNKNOWN","UNKNOWN",
+            "C2BCCCE6DE5BC98D","AC54CD78C75CC30F",null,null,
+            "7559DD01BCFADD9A","AEA39CFBBF14C0FF",
        };

        readonly string[] oemid = {