check null value for coverage

coverlet-coverage · Feb 23, 2023 · df81f69 · df81f69
1 parent da9cacf
commit df81f69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/test/coverlet.integration.tests/BaseTest.cs b/test/coverlet.integration.tests/BaseTest.cs
@@ -248,16 +248,16 @@ private protected void AssertCoverage(ClonedTemplateProject clonedTemplateProjec
                 bool coverageChecked = false;
                 foreach (string coverageFile in clonedTemplateProject.GetFiles(filter))
                 {
-#pragma warning disable CS8604 // Possible null reference argument.
-                    JsonConvert.DeserializeObject<Modules>(File.ReadAllText(coverageFile))
-                    .Document("DeepThought.cs")
+                    Modules? coverage = JsonConvert.DeserializeObject<Modules>(File.ReadAllText(coverageFile));
+                    if (coverage != null)
+                    { 
+                    coverage.Document("DeepThought.cs")
                     .Class("Coverlet.Integration.Template.DeepThought")
                     .Method("System.Int32 Coverlet.Integration.Template.DeepThought::AnswerToTheUltimateQuestionOfLifeTheUniverseAndEverything()")
                     .AssertLinesCovered((6, 1), (7, 1), (8, 1));
-#pragma warning restore CS8604 // Possible null reference argument.
                     coverageChecked = true;
+                    }
                 }
-
                 Assert.True(coverageChecked, $"Coverage check fail\n{standardOutput}");
             }
         }

diff --git a/test/coverlet.integration.tests/DeterministicBuild.cs b/test/coverlet.integration.tests/DeterministicBuild.cs
@@ -45,15 +45,16 @@ private protected void AssertCoverage(string standardOutput = "", bool checkDete
                 string reportFilePath = "";
                 foreach (string coverageFile in Directory.GetFiles(_testProjectPath, "coverage.json", SearchOption.AllDirectories))
                 {
-#pragma warning disable CS8604 // Possible null reference argument.
-                    JsonConvert.DeserializeObject<Modules>(File.ReadAllText(coverageFile))
-                    .Document("DeepThought.cs")
+                    Modules? coverage = JsonConvert.DeserializeObject<Modules>(File.ReadAllText(coverageFile));
+                    if (coverage != null)
+                    {
+                    coverage.Document("DeepThought.cs")
                     .Class("Coverlet.Integration.DeterministicBuild.DeepThought")
                     .Method("System.Int32 Coverlet.Integration.DeterministicBuild.DeepThought::AnswerToTheUltimateQuestionOfLifeTheUniverseAndEverything()")
                     .AssertLinesCovered((6, 1), (7, 1), (8, 1));
-#pragma warning restore CS8604 // Possible null reference argument.
                     coverageChecked = true;
                     reportFilePath = coverageFile;
+                    }
                 }
                 Assert.True(coverageChecked, $"Coverage check fail\n{standardOutput}");
                 File.Delete(reportFilePath);