merge PR #26 Support multiple cobertura files

PR: Support multiple cobertura files

.github/workflows/ci-build.yml

@@ -26,4 +26,4 @@ jobs:
       run: dotnet build src/CodeCoverageSummary.sln --configuration Release --no-restore
 
     - name: Test with sample file
-      run: dotnet src/CodeCoverageSummary/bin/Release/net5.0/CodeCoverageSummary.dll src/coverage.cobertura.xml --badge true
+      run: dotnet src/CodeCoverageSummary/bin/Release/net5.0/CodeCoverageSummary.dll --files src/coverage.cobertura.xml --badge true

action.yml

@@ -6,7 +6,7 @@ branding:
   color: purple
 inputs:
   filename:
-    description: 'Code coverage file to analyse.'
+    description: 'A comma separated list of code coverage files to analyse.'
     required: true
   badge:
     description: 'Include a Line Rate coverage badge in the output using shields.io - true / false (default).'
@@ -44,6 +44,7 @@ runs:
   using: 'docker'
   image: 'docker://ghcr.io/irongut/codecoveragesummary:v1.1.0'
   args:
+    - '--files'
     - ${{ inputs.filename }}
     - '--badge'
     - ${{ inputs.badge }}

src/CodeCoverageSummary/CodeSummary.cs

@@ -31,9 +31,6 @@ namespace CodeCoverageSummary
 
         public List<CodeCoverage> Packages { get; set; }
 
-        public CodeSummary()
+        public CodeSummary() => Packages = new();
-        {
-            Packages = new List<CodeCoverage>();
-        }
     }
 }

src/CodeCoverageSummary/CommandLineOptions.cs

@@ -1,12 +1,13 @@
 using CommandLine;
 using System;
+using System.Collections.Generic;
 
 namespace CodeCoverageSummary
 {
     public class CommandLineOptions
     {
-        [Value(index: 0, Required = true, HelpText = "Code coverage file to analyse.")]
+        [Option(longName: "files", Separator = ',', Required = true, HelpText = "A comma separated list of code coverage files to analyse.")]
-        public string Filename { get; set; }
+        public IEnumerable<string> Files { get; set; }
 
         [Option(longName: "badge", Required = false, HelpText = "Include a Line Rate coverage badge in the output using shields.io - true or false.", Default = "false")]
         public string BadgeString { get; set; }

src/CodeCoverageSummary/Program.cs

@@ -19,18 +19,29 @@ namespace CodeCoverageSummary
                                  {
                                      try
                                      {
-                                         if (!File.Exists(o.Filename))
+                                         // check files exist
+                                         foreach (var file in o.Files)
                                          {
-                                             Console.WriteLine("Error: Code coverage file not found.");
+                                             if (!File.Exists(file))
-                                             return -2; // error
+                                             {
+                                                 Console.WriteLine($"Error: Code coverage file not found - {file}.");
+                                                 return -2; // error
+                                             }
                                          }
 
                                          // parse code coverage file
-                                         Console.WriteLine($"Code Coverage File: {o.Filename}");
+                                         CodeSummary summary = new();
-                                         CodeSummary summary = ParseTestResults(o.Filename);
+                                         foreach (var file in o.Files)
-                                         if (summary == null)
                                          {
-                                             Console.WriteLine("Error: Parsing code coverage file.");
+                                             Console.WriteLine($"Code Coverage File: {file}");
+                                             summary = ParseTestResults(file, summary);
+                                         }
+                                         summary.LineRate /= o.Files.Count();
+                                         summary.BranchRate /= o.Files.Count();
+
+                                         if (summary.Packages.Count == 0)
+                                         {
+                                             Console.WriteLine("Error: Parsing code coverage file, no packages found.");
                                              return -2; // error
                                          }
                                          else
@@ -103,9 +114,8 @@ namespace CodeCoverageSummary
                                  _ => -1); // invalid arguments
         }
 
-        private static CodeSummary ParseTestResults(string filename)
+        private static CodeSummary ParseTestResults(string filename, CodeSummary summary)
         {
-            CodeSummary summary = new();
             try
             {
                 string rss = File.ReadAllText(filename);
@@ -118,34 +128,32 @@ namespace CodeCoverageSummary
                 var lineR = from item in coverage.Attributes()
                             where item.Name == "line-rate"
                             select item;
-                summary.LineRate = double.Parse(lineR.First().Value);
+                summary.LineRate += double.Parse(lineR.First().Value);
 
                 var linesCovered = from item in coverage.Attributes()
                                    where item.Name == "lines-covered"
                                    select item;
-                summary.LinesCovered = int.Parse(linesCovered.First().Value);
+                summary.LinesCovered += int.Parse(linesCovered.First().Value);
 
                 var linesValid = from item in coverage.Attributes()
                                  where item.Name == "lines-valid"
                                  select item;
-                summary.LinesValid = int.Parse(linesValid.First().Value);
+                summary.LinesValid += int.Parse(linesValid.First().Value);
 
                 var branchR = from item in coverage.Attributes()
                               where item.Name == "branch-rate"
                               select item;
-                summary.BranchRate = double.Parse(branchR.First().Value);
+                summary.BranchRate += double.Parse(branchR.First().Value);
 
                 var branchesCovered = from item in coverage.Attributes()
                                       where item.Name == "branches-covered"
                                       select item;
-                summary.BranchesCovered = int.Parse(branchesCovered.First().Value);
+                summary.BranchesCovered += int.Parse(branchesCovered.First().Value);
 
                 var branchesValid = from item in coverage.Attributes()
                                     where item.Name == "branches-valid"
                                     select item;
-                summary.BranchesValid = int.Parse(branchesValid.First().Value);
+                summary.BranchesValid += int.Parse(branchesValid.First().Value);
-
-                summary.Complexity = 0;
 
                 // test coverage for individual packages
                 var packages = from item in coverage.Descendants("package")

src/CodeCoverageSummary/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "CodeCoverageSummary": {
       "commandName": "Project",
-      "commandLineArgs": "../../../../coverage.cobertura.xml --format=md --badge true --thresholds=\"85 90\" --fail true"
+      "commandLineArgs": "--files ../../../../coverage.cobertura.xml,../../../../coverage.cobertura.xml --format=text --badge true --thresholds=\"85 90\" --fail true"
     },
     "Docker": {
       "commandName": "Docker",