Merge pull request lucaslorentz#18 from lucaslorentz/refactorings

Add method to get instruction line numbers
ido-namely · Feb 9, 2018 · 1bde5e8 · 1bde5e8
2 parents a414897 + 6836702
commit 1bde5e8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/MiniCover/Model/InstrumentedInstruction.cs b/src/MiniCover/Model/InstrumentedInstruction.cs
@@ -1,4 +1,6 @@
-namespace MiniCover.Model
+using System.Collections.Generic;
+
+namespace MiniCover.Model
 {
     public class InstrumentedInstruction
     {
@@ -12,5 +14,13 @@ public class InstrumentedInstruction
         public string Method { get; set; }
         public string MethodFullName { get; set; }
         public string Instruction { get; set; }
+
+        public IEnumerable<int> GetLines()
+        {
+            for (var lineIndex = StartLine; lineIndex <= EndLine; lineIndex++)
+            {
+                yield return lineIndex;
+            }
+        }
     }
 }
diff --git a/src/MiniCover/Reports/BaseReport.cs b/src/MiniCover/Reports/BaseReport.cs
@@ -31,13 +31,13 @@ public virtual int Execute(InstrumentationResult result, float threshold)
             foreach (var kvFile in files)
             {
                 var lines = kvFile.Value.Instructions
-                    .SelectMany(i => Enumerable.Range(i.StartLine, i.EndLine - i.StartLine + 1))
+                    .SelectMany(i => i.GetLines())
                     .Distinct()
                     .Count();
 
-                var hitInstructions = kvFile.Value.Instructions.Where(h => hits.Contains(h.Id)).ToArray();
-                var coveredLines = hitInstructions
-                    .SelectMany(i => Enumerable.Range(i.StartLine, i.EndLine - i.StartLine + 1))
+                var coveredLines = kvFile.Value.Instructions
+                    .Where(h => hits.Contains(h.Id))
+                    .SelectMany(i => i.GetLines())
                     .Distinct()
                     .Count();
 
@@ -48,7 +48,6 @@ public virtual int Execute(InstrumentationResult result, float threshold)
                 var fileColor = coveragePercentage >= threshold ? ConsoleColor.Green : ConsoleColor.Red;
 
                 WriteReport(kvFile, lines, coveredLines, coveragePercentage, fileColor);
-
             }
 
             WriteDetailedReport(result, files, hits);

diff --git a/src/MiniCover/Reports/HtmlReport.cs b/src/MiniCover/Reports/HtmlReport.cs
@@ -57,17 +57,15 @@ protected override void WriteDetailedReport(InstrumentationResult result, IDicti
 
                     var uncoveredLineNumbers = new HashSet<int>();
                     var coveredLineNumbers = new HashSet<int>();
-                    foreach(var i in kvFile.Value.Instructions)
+                    foreach (var i in kvFile.Value.Instructions)
                     {
                         if (hits.Contains(i.Id))
                         {
-                            for (var lineIndex = i.StartLine; lineIndex <= i.EndLine; lineIndex++)
-                                coveredLineNumbers.Add(lineIndex);
+                            coveredLineNumbers.UnionWith(i.GetLines());
                         }
                         else
                         {
-                            for (var lineIndex = i.StartLine; lineIndex <= i.EndLine; lineIndex++)
-                                uncoveredLineNumbers.Add(lineIndex);
+                            uncoveredLineNumbers.UnionWith(i.GetLines());
                         }
                     }