diff --git a/DiscImageChef.Tests/Filesystems/MINIXv1.cs b/DiscImageChef.Tests/Filesystems/MINIXv1.cs index dd0d4c4c..7c27fe47 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv1.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv1.cs @@ -71,6 +71,10 @@ namespace DiscImageChef.Tests.Filesystems 1024, 1024, 1024, 1024, }; + readonly string[] types = { + "Minix 3 v1", "Minix 3 v1", "Minix 3 v1", "Minix 3 v1", + }; + [Test] public void Test() { @@ -95,7 +99,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, wholePart, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix v1", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs index 6f16cecf..d75a0fa8 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv1_MBR.cs @@ -63,13 +63,17 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 130048,130048, + 65535,50399, }; readonly int[] clustersize = { 1024,1024, }; + readonly string[] types = { + "Minix v1", "Minix 3 v1", + }; + [Test] public void Test() { @@ -87,7 +91,7 @@ namespace DiscImageChef.Tests.Filesystems int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].Type == "0x81") + if(partitions[j].Type == "0x80" || partitions[j].Type == "0x81") { part = j; break; @@ -98,7 +102,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part], out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix V1", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIXv2.cs b/DiscImageChef.Tests/Filesystems/MINIXv2.cs index 6f90c9eb..321ebf11 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv2.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv2.cs @@ -71,6 +71,10 @@ namespace DiscImageChef.Tests.Filesystems 1024, 1024, 1024, 1024, }; + readonly string[] types = { + "Minix 3 v2", "Minix 3 v2", "Minix 3 v2", "Minix 3 v2", + }; + [Test] public void Test() { @@ -95,7 +99,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, wholePart, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix v2", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs index 2efccc8f..f093167f 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv2_MBR.cs @@ -63,13 +63,17 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 1000, + 511055, }; readonly int[] clustersize = { 1024, }; + readonly string[] types = { + "Minix 3 v2", + }; + [Test] public void Test() { @@ -98,7 +102,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part], out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix V2", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIXv3.cs b/DiscImageChef.Tests/Filesystems/MINIXv3.cs index 492e7d37..a3b684b5 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv3.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv3.cs @@ -64,11 +64,15 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 360, 1200, 720, 1440, + 90, 300, 180, 360, }; readonly int[] clustersize = { - 1024, 1024, 1024, 1024, + 4096, 4096, 4096, 4096, + }; + + readonly string[] types = { + "Minix v3", "Minix v3", "Minix v3", "Minix v3", }; [Test] @@ -95,7 +99,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, wholePart, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix v3", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs b/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs index 95aaacb9..783af4ce 100644 --- a/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/MINIXv3_MBR.cs @@ -63,11 +63,15 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 4096, + 523151, }; readonly int[] clustersize = { - 1024, + 4096, + }; + + readonly string[] types = { + "Minix v3", }; [Test] @@ -98,7 +102,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part], out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("Minix V3", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(types[i], fs.XmlFSType.Type, testfiles[i]); } } }