update the line coverage information

tonerdo · tonerdo · commit 554f0543579a · 2018-06-23T15:05:02.000+01:00
diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs
@@ -66,27 +66,27 @@ public CoverageResult GetCoverageResult()
                             {
                                 if (methods.TryGetValue(line.Method, out Method method))
                                 {
-                                    documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, new LineInfo { Hits = line.Hits });
+                                    documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);
                                 }
                                 else
                                 {
                                     documents[doc.Path][line.Class].Add(line.Method, new Method());
-                                    documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number,  new LineInfo { Hits = line.Hits });
+                                    documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);
                                 }
                             }
                             else
                             {
                                 documents[doc.Path].Add(line.Class, new Methods());
                                 documents[doc.Path][line.Class].Add(line.Method, new Method());
-                                documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number,  new LineInfo { Hits = line.Hits });
+                                documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);
                             }
                         }
                         else
                         {
                             documents.Add(doc.Path, new Classes());
                             documents[doc.Path].Add(line.Class, new Methods());
                             documents[doc.Path][line.Class].Add(line.Method, new Method());
-                            documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number,  new LineInfo { Hits = line.Hits });
+                            documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);
                         }
                     }
 
diff --git a/src/coverlet.core/CoverageResult.cs b/src/coverlet.core/CoverageResult.cs
@@ -5,20 +5,16 @@
 
 namespace Coverlet.Core
 {
-    public class LineInfo
-    {
-        public int Hits { get; set; }
-    }
-
-    public class BranchInfo : LineInfo
+    public class BranchInfo
     {
         public int Offset { get; set; }
         public int EndOffset { get; set; }
         public int Path { get; set; }
         public uint Ordinal { get; set; }
+        public int Hits { get; set; }
     }
 
-    public class Lines : SortedDictionary<int, LineInfo> { }
+    public class Lines : SortedDictionary<int, int> { }
     public class Branches : SortedDictionary<int, List<BranchInfo>> { }
     public class Method
     {
diff --git a/src/coverlet.core/CoverageSummary.cs b/src/coverlet.core/CoverageSummary.cs
@@ -9,7 +9,7 @@ public class CoverageSummary
         public CoverageDetails CalculateLineCoverage(Lines lines)
         {
             var details = new CoverageDetails();
-            details.Covered = lines.Where(l => l.Value.Hits > 0).Count();
+            details.Covered = lines.Where(l => l.Value > 0).Count();
             details.Total = lines.Count;
             return details;
         }
@@ -129,7 +129,7 @@ public CoverageDetails CalculateBranchCoverage(Modules modules)
         public CoverageDetails CalculateMethodCoverage(Lines lines)
         {
             var details = new CoverageDetails();
-            details.Covered = lines.Any(l => l.Value.Hits > 0) ? 1 : 0;
+            details.Covered = lines.Any(l => l.Value > 0) ? 1 : 0;
             details.Total = 1;
             return details;
         }
diff --git a/src/coverlet.core/Reporters/CoberturaReporter.cs b/src/coverlet.core/Reporters/CoberturaReporter.cs
@@ -73,7 +73,7 @@ public string Report(CoverageResult result)
                             {
                                 XElement line = new XElement("line");
                                 line.Add(new XAttribute("number", ln.Key.ToString()));
-                                line.Add(new XAttribute("hits", ln.Value.Hits.ToString()));
+                                line.Add(new XAttribute("hits", ln.Value.ToString()));
                                 line.Add(new XAttribute("branch", meth.Value.Branches.ContainsKey(ln.Key).ToString()));
 
                                 if (meth.Value.Branches.TryGetValue(ln.Key, out List<BranchInfo> branches))
diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs
@@ -33,10 +33,10 @@ public string Report(CoverageResult result)
                                 continue;
 
                             lcov.Add($"FN:{method.Value.Lines.First().Key - 1},{method.Key}");
-                            lcov.Add($"FNDA:{method.Value.Lines.First().Value.Hits},{method.Key}");
+                            lcov.Add($"FNDA:{method.Value.Lines.First().Value},{method.Key}");
 
                             foreach (var line in method.Value.Lines)
-                                lcov.Add($"DA:{line.Key},{line.Value.Hits}");
+                                lcov.Add($"DA:{line.Key},{line.Value}");
 
                             foreach (var branchs in method.Value.Branches)
                             {
diff --git a/src/coverlet.core/Reporters/OpenCoverReporter.cs b/src/coverlet.core/Reporters/OpenCoverReporter.cs
@@ -110,7 +110,7 @@ public string Report(CoverageResult result)
                             foreach (var lines in meth.Value.Lines)
                             {
                                 XElement sequencePoint = new XElement("SequencePoint");
-                                sequencePoint.Add(new XAttribute("vc", lines.Value.Hits.ToString()));
+                                sequencePoint.Add(new XAttribute("vc", lines.Value.ToString()));
                                 sequencePoint.Add(new XAttribute("upsid", lines.Key.ToString()));
                                 sequencePoint.Add(new XAttribute("ordinal", k.ToString()));
                                 sequencePoint.Add(new XAttribute("sl", lines.Key.ToString()));
@@ -122,7 +122,7 @@ public string Report(CoverageResult result)
                                 sequencePoint.Add(new XAttribute("fileid", i.ToString()));
                                 sequencePoints.Add(sequencePoint);
 
-                                if (lines.Value.Hits > 0)
+                                if (lines.Value > 0)
                                 {
                                     classVisited = true;
                                     methodVisited = true;
diff --git a/test/coverlet.core.tests/CoverageSummaryTests.cs b/test/coverlet.core.tests/CoverageSummaryTests.cs
@@ -15,8 +15,8 @@ public class CoverageSummaryTests
         public CoverageSummaryTests()
         {
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
             Branches branches = new Branches();
             branches.Add(1, new List<BranchInfo>());
             branches[1].Add(new BranchInfo { Hits = 1, Offset = 1, Path = 0, Ordinal = 1 });
diff --git a/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs b/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs
@@ -12,8 +12,8 @@ public void TestReport()
             CoverageResult result = new CoverageResult();
             result.Identifier = Guid.NewGuid().ToString();
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
             Branches branches = new Branches();
             branches.Add(1, new List<BranchInfo> {
                 new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 },
diff --git a/test/coverlet.core.tests/Reporters/JsonReporterTests.cs b/test/coverlet.core.tests/Reporters/JsonReporterTests.cs
@@ -11,8 +11,8 @@ public void TestReport()
             CoverageResult result = new CoverageResult();
             result.Identifier = Guid.NewGuid().ToString();
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
             Methods methods = new Methods();
             var methodString = "System.Void Coverlet.Core.Reporters.Tests.JsonReporterTests.TestReport()";
             methods.Add(methodString, new Method());
diff --git a/test/coverlet.core.tests/Reporters/LcovReporterTests.cs b/test/coverlet.core.tests/Reporters/LcovReporterTests.cs
@@ -12,8 +12,8 @@ public void TestReport()
             CoverageResult result = new CoverageResult();
             result.Identifier = Guid.NewGuid().ToString();
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
             Branches branches = new Branches();
             branches.Add(1, new List<BranchInfo> {
                 new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 },
diff --git a/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs b/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs
@@ -40,8 +40,8 @@ public void TestFilesHaveUniqueIdsOverMultipleModules()
         private static Documents CreateFirstDocuments()
         {
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
             Branches branches = new Branches();
             branches.Add(1, new List<BranchInfo> {
                 new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 },
@@ -62,8 +62,8 @@ private static Documents CreateFirstDocuments()
         private static Documents CreateSecondDocuments()
         {            
             Lines lines = new Lines();
-            lines.Add(1, new LineInfo { Hits = 1 });
-            lines.Add(2, new LineInfo { Hits = 0 });
+            lines.Add(1, 1);
+            lines.Add(2, 0);
 
             Methods methods = new Methods();
             var methodString = "System.Void Some.Other.Module.TestClass.TestMethod()";

Original file line number	Diff line number	Diff line change
`@@ -66,27 +66,27 @@ public CoverageResult GetCoverageResult()`
`66`	`66`	`{`
`67`	`67`	`if (methods.TryGetValue(line.Method, out Method method))`
`68`	`68`	`{`
`69`		`- documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, new LineInfo { Hits = line.Hits });`
	`69`	`+ documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);`
`70`	`70`	`}`
`71`	`71`	`else`
`72`	`72`	`{`
`73`	`73`	`documents[doc.Path][line.Class].Add(line.Method, new Method());`
`74`		`- documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, new LineInfo { Hits = line.Hits });`
	`74`	`+ documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`else`
`78`	`78`	`{`
`79`	`79`	`documents[doc.Path].Add(line.Class, new Methods());`
`80`	`80`	`documents[doc.Path][line.Class].Add(line.Method, new Method());`
`81`		`- documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, new LineInfo { Hits = line.Hits });`
	`81`	`+ documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`else`
`85`	`85`	`{`
`86`	`86`	`documents.Add(doc.Path, new Classes());`
`87`	`87`	`documents[doc.Path].Add(line.Class, new Methods());`
`88`	`88`	`documents[doc.Path][line.Class].Add(line.Method, new Method());`
`89`		`- documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, new LineInfo { Hits = line.Hits });`
	`89`	`+ documents[doc.Path][line.Class][line.Method].Lines.Add(line.Number, line.Hits);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,16 @@`
`5`	`5`
`6`	`6`	`namespace Coverlet.Core`
`7`	`7`	`{`
`8`		`- public class LineInfo`
`9`		`- {`
`10`		`- public int Hits { get; set; }`
`11`		`- }`
`12`		`-`
`13`		`- public class BranchInfo : LineInfo`
	`8`	`+ public class BranchInfo`
`14`	`9`	`{`
`15`	`10`	`public int Offset { get; set; }`
`16`	`11`	`public int EndOffset { get; set; }`
`17`	`12`	`public int Path { get; set; }`
`18`	`13`	`public uint Ordinal { get; set; }`
	`14`	`+ public int Hits { get; set; }`
`19`	`15`	`}`
`20`	`16`
`21`		`- public class Lines : SortedDictionary<int, LineInfo> { }`
	`17`	`+ public class Lines : SortedDictionary<int, int> { }`
`22`	`18`	`public class Branches : SortedDictionary<int, List<BranchInfo>> { }`
`23`	`19`	`public class Method`
`24`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class CoverageSummary`
`9`	`9`	`public CoverageDetails CalculateLineCoverage(Lines lines)`
`10`	`10`	`{`
`11`	`11`	`var details = new CoverageDetails();`
`12`		`- details.Covered = lines.Where(l => l.Value.Hits > 0).Count();`
	`12`	`+ details.Covered = lines.Where(l => l.Value > 0).Count();`
`13`	`13`	`details.Total = lines.Count;`
`14`	`14`	`return details;`
`15`	`15`	`}`
`@@ -129,7 +129,7 @@ public CoverageDetails CalculateBranchCoverage(Modules modules)`
`129`	`129`	`public CoverageDetails CalculateMethodCoverage(Lines lines)`
`130`	`130`	`{`
`131`	`131`	`var details = new CoverageDetails();`
`132`		`- details.Covered = lines.Any(l => l.Value.Hits > 0) ? 1 : 0;`
	`132`	`+ details.Covered = lines.Any(l => l.Value > 0) ? 1 : 0;`
`133`	`133`	`details.Total = 1;`
`134`	`134`	`return details;`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public string Report(CoverageResult result)`
`73`	`73`	`{`
`74`	`74`	`XElement line = new XElement("line");`
`75`	`75`	`line.Add(new XAttribute("number", ln.Key.ToString()));`
`76`		`- line.Add(new XAttribute("hits", ln.Value.Hits.ToString()));`
	`76`	`+ line.Add(new XAttribute("hits", ln.Value.ToString()));`
`77`	`77`	`line.Add(new XAttribute("branch", meth.Value.Branches.ContainsKey(ln.Key).ToString()));`
`78`	`78`
`79`	`79`	`if (meth.Value.Branches.TryGetValue(ln.Key, out List<BranchInfo> branches))`