modinfo file finder does not throw when main modinfo file is invalid.

Author: AnakinRaW

src/EawModinfo.Tests/ModinfoFileFinderTests.cs

@@ -23,12 +23,15 @@ public void FindModinfoFiles_InvalidArgs_Throws()
 
     public ModinfoFileFinderTests()
     {
-        CreateScenario_MainModinfoOnly();
-        CreateScenario_MainModinfoOnly_WithCaseInsensitiveName();
-        CreateScenario_WithNoValidModinfoFiles();
-        CreateScenario_WithMainModinfoAndVariant();
-        CreateScenario_WithOnlyVariants();
-        CreateScenario_WithMainModinfoAndVariantAndInvalidFiles();
+        CreateScenario1_MainModinfoOnly();
+        CreateScenario2_MainModinfoOnly_WithCaseInsensitiveName();
+        CreateScenario3_WithNoValidModinfoFiles();
+        CreateScenario4_WithMainModinfoAndVariant();
+        CreateScenario5_WithOnlyVariants();
+        CreateScenario6_CreateWithMainModinfoAndVariantAndOtherFiles();
+        CreateScenario7_WithInvalidMainModinfo();
+        CreateScenario8_WithMainModinfoAndInvalidVariant();
+        CreateScenario9_WithInvalidMainModinfoAndValidVariant();
     }
 
     [Theory]
@@ -38,6 +41,9 @@ public ModinfoFileFinderTests()
     [InlineData(4, true, 1)]
     [InlineData(5, false, 2)]
     [InlineData(6, true, 1)]
+    [InlineData(7, true, 0)]
+    [InlineData(8, true, 1)]
+    [InlineData(9, true, 1)]
     public void FindModinfoFiles_TestAll(int scenario, bool hasMain, int numberVariants)
     {
         var scenarioPath = _fileSystem.DirectoryInfo.New(_scenarioPaths[scenario]);
@@ -57,7 +63,20 @@ public void FindModinfoFiles_TestMerge(int scenario)
         Assert.NotNull(all.Variants.ElementAt(0).GetModinfo().Version);
     }
 
-    private void CreateScenario_MainModinfoOnly()
+    [Theory]
+    [InlineData(7)]
+    [InlineData(9)]
+    public void FindModinfoFiles_InvalidMain_CannotGetModinfo(int scenario)
+    {
+        var scenarioPath = _fileSystem.DirectoryInfo.New(_scenarioPaths[scenario]);
+        var all = ModinfoFileFinder.FindModinfoFiles(scenarioPath);
+
+        Assert.False(all.MainModinfo!.TryGetModinfo(out _));
+        foreach (var modinfoVariantFile in all.Variants) 
+            Assert.False(modinfoVariantFile.TryGetModinfo(out _));
+    }
+
+    private void CreateScenario1_MainModinfoOnly()
     {
         CreateScenario(1, () =>
         {
@@ -73,7 +92,7 @@ private void CreateScenario_MainModinfoOnly()
         });
     }
 
-    private void CreateScenario_MainModinfoOnly_WithCaseInsensitiveName()
+    private void CreateScenario2_MainModinfoOnly_WithCaseInsensitiveName()
     {
         CreateScenario(2, () =>
         {
@@ -89,7 +108,7 @@ private void CreateScenario_MainModinfoOnly_WithCaseInsensitiveName()
         });
     }
 
-    private void CreateScenario_WithNoValidModinfoFiles()
+    private void CreateScenario3_WithNoValidModinfoFiles()
     {
         CreateScenario(3, () =>
         {
@@ -101,7 +120,7 @@ private void CreateScenario_WithNoValidModinfoFiles()
         });
     }
 
-    private void CreateScenario_WithMainModinfoAndVariant()
+    private void CreateScenario4_WithMainModinfoAndVariant()
     {
         CreateScenario(4, () =>
         {
@@ -127,7 +146,31 @@ private void CreateScenario_WithMainModinfoAndVariant()
         });
     }
 
-    private void CreateScenario_WithMainModinfoAndVariantAndInvalidFiles()
+    private void CreateScenario5_WithOnlyVariants()
+    {
+        CreateScenario(5, () =>
+        {
+            const string path = "scenario5";
+            const string variant1FileName = "1-modinfo.json";
+            const string variant2FileName = "2-modinfo.json";
+            var filePath1 = _fileSystem.Path.Combine(path, variant1FileName);
+            var filePath2 = _fileSystem.Path.Combine(path, variant2FileName);
+
+            const string data1 = @"{
+	""name"": ""Addon-1""
+}";
+
+            const string data2 = @"{
+	""name"": ""Addon-2""
+}";
+
+            _fileSystem.AddFile(filePath1, new MockFileData(data1));
+            _fileSystem.AddFile(filePath2, new MockFileData(data2));
+            return path;
+        });
+    }
+
+    private void CreateScenario6_CreateWithMainModinfoAndVariantAndOtherFiles()
     {
         CreateScenario(6, () =>
         {
@@ -156,26 +199,65 @@ private void CreateScenario_WithMainModinfoAndVariantAndInvalidFiles()
         });
     }
 
-    private void CreateScenario_WithOnlyVariants()
+    private void CreateScenario7_WithInvalidMainModinfo()
     {
-        CreateScenario(5, () =>
+        CreateScenario(7, () =>
         {
-            const string path = "scenario5";
-            const string variant1FileName = "1-modinfo.json";
-            const string variant2FileName = "2-modinfo.json";
-            var filePath1 = _fileSystem.Path.Combine(path, variant1FileName);
-            var filePath2 = _fileSystem.Path.Combine(path, variant2FileName);
+            const string path = "scenario7";
+            const string mainFileName = "modinfo.json";
+            var mainFilePath = _fileSystem.Path.Combine(path, mainFileName);
 
-            const string data1 = @"{
-	""name"": ""Addon-1""
+            const string mainFileData = "\0";
+
+            _fileSystem.AddFile(mainFilePath, new MockFileData(mainFileData));
+            
+            return path;
+        });
+    }
+
+    private void CreateScenario8_WithMainModinfoAndInvalidVariant()
+    {
+        CreateScenario(8, () =>
+        {
+            const string path = "scenario8";
+            const string mainFileName = "modinfo.json";
+            const string variantFileName = "variant-modinfo.json";
+            var mainFilePath = _fileSystem.Path.Combine(path, mainFileName);
+            var variantFilePath = _fileSystem.Path.Combine(path, variantFileName);
+
+            const string mainFileData = @"{
+	""name"": ""testmod"",
+	""version"": ""1.0.0""
 }";
 
-            const string data2 = @"{
-	""name"": ""Addon-2""
+            const string variantFileData = "\0";
+
+            _fileSystem.AddFile(mainFilePath, new MockFileData(mainFileData));
+            _fileSystem.AddFile(variantFilePath, new MockFileData(variantFileData));
+            
+            return path;
+        });
+    }
+
+    private void CreateScenario9_WithInvalidMainModinfoAndValidVariant()
+    {
+        CreateScenario(9, () =>
+        {
+            const string path = "scenario9";
+            const string mainFileName = "modinfo.json";
+            const string variantFileName = "variant-modinfo.json";
+            var mainFilePath = _fileSystem.Path.Combine(path, mainFileName);
+            var variantFilePath = _fileSystem.Path.Combine(path, variantFileName);
+
+            const string mainFileData = "\0";
+
+            const string variantFileData = @"{
+	""name"": ""Addon""
 }";
 
-            _fileSystem.AddFile(filePath1, new MockFileData(data1));
-            _fileSystem.AddFile(filePath2, new MockFileData(data2));
+            _fileSystem.AddFile(mainFilePath, new MockFileData(mainFileData));
+            _fileSystem.AddFile(variantFilePath, new MockFileData(variantFileData));
+
             return path;
         });
     }

src/EawModinfo/File/ModinfoFileFinder.cs

@@ -8,12 +8,12 @@
 namespace EawModinfo.File;
 
 /// <summary>
-/// Searches a directory for modinfo files.
+/// Provides a method to searches a directory for modinfo files.
 /// </summary>
 public static class ModinfoFileFinder
 {
     /// <summary>
-    /// Searches the directory specified for all modinfo files according to the modinfo specification in section III.3.
+    /// Searches the directory specified for all modinfo files according to the modinfo specification in section II.3.
     /// </summary>
     /// <param name="directory">The directory to search for modinfo files.</param>
     /// <returns>A collection with all found modinfo files.</returns>
@@ -31,7 +31,7 @@ public static ModinfoFinderCollection FindModinfoFiles(IDirectoryInfo directory)
     private static ModinfoFinderCollection FindCore(IDirectoryInfo directory)
     {
         var mainModinfoFile = FindMainModinfoFileCore(directory);
-        var variantFiles = new List<ModinfoVariantFile>(FindModinfoVariantFilesCore(directory, mainModinfoFile?.GetModinfo()));
+        var variantFiles = new List<ModinfoVariantFile>(FindModinfoVariantFilesCore(directory, mainModinfoFile));
 
         return new ModinfoFinderCollection(directory, mainModinfoFile, variantFiles);
     }
@@ -46,7 +46,7 @@ private static ModinfoFinderCollection FindCore(IDirectoryInfo directory)
         return !modinfo.IsFileValid(out _) ? null : modinfo;
     }
 
-    private static IEnumerable<ModinfoVariantFile> FindModinfoVariantFilesCore(IDirectoryInfo directory, IModinfo? mainModinfoData)
+    private static IEnumerable<ModinfoVariantFile> FindModinfoVariantFilesCore(IDirectoryInfo directory, MainModinfoFile? mainModinfoData)
     {
         var possibleVariants = directory.EnumerateFiles(
             $"*{ModinfoVariantFile.VariantModinfoFileEnding}",