From 554f0543579aa63fb1b7fb9cfcf55f9f882a2212 Mon Sep 17 00:00:00 2001 From: Oluwatoni Solarin-Sodara Date: Sat, 23 Jun 2018 15:05:02 +0100 Subject: [PATCH 1/2] update the line coverage information --- src/coverlet.core/Coverage.cs | 8 ++++---- src/coverlet.core/CoverageResult.cs | 10 +++------- src/coverlet.core/CoverageSummary.cs | 4 ++-- src/coverlet.core/Reporters/CoberturaReporter.cs | 2 +- src/coverlet.core/Reporters/LcovReporter.cs | 4 ++-- src/coverlet.core/Reporters/OpenCoverReporter.cs | 4 ++-- test/coverlet.core.tests/CoverageSummaryTests.cs | 4 ++-- .../Reporters/CoberturaReporterTests.cs | 4 ++-- .../coverlet.core.tests/Reporters/JsonReporterTests.cs | 4 ++-- .../coverlet.core.tests/Reporters/LcovReporterTests.cs | 4 ++-- .../Reporters/OpenCoverReporterTests.cs | 8 ++++---- 11 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs index 1d065334c..3596be2b8 100644 --- a/src/coverlet.core/Coverage.cs +++ b/src/coverlet.core/Coverage.cs @@ -66,19 +66,19 @@ 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 @@ -86,7 +86,7 @@ public CoverageResult GetCoverageResult() 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 index a9a574ad0..c9fba580c 100644 --- 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 { } + public class Lines : SortedDictionary { } public class Branches : SortedDictionary> { } public class Method { diff --git a/src/coverlet.core/CoverageSummary.cs b/src/coverlet.core/CoverageSummary.cs index 81155c636..1db52af0d 100644 --- 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 index fce3643f6..309c1702a 100644 --- 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 branches)) diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs index 0676d6edc..e83ef71dd 100644 --- 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 index 98653966d..ebd8b1d33 100644 --- 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 index fab5f2763..5ddc583e4 100644 --- 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()); 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 index be7eba83c..b2c0210d4 100644 --- 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 { 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 index 979bc1108..ac0f31428 100644 --- 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 index c30cea209..588405c61 100644 --- 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 { 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 index 3643480f3..c26fc1a92 100644 --- 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 { 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()"; From 4f220f597c964d71d43e1ea5880978b95d838316 Mon Sep 17 00:00:00 2001 From: Oluwatoni Solarin-Sodara Date: Sat, 23 Jun 2018 20:24:46 +0100 Subject: [PATCH 2/2] update the branch coverage information --- src/coverlet.core/Coverage.cs | 31 ++++++------------- src/coverlet.core/CoverageResult.cs | 5 ++- src/coverlet.core/CoverageSummary.cs | 14 ++------- .../Reporters/CoberturaReporter.cs | 6 ++-- src/coverlet.core/Reporters/LcovReporter.cs | 5 ++- .../Reporters/OpenCoverReporter.cs | 27 +++++++--------- .../CoverageSummaryTests.cs | 5 ++- .../Reporters/CoberturaReporterTests.cs | 12 ++++--- .../Reporters/JsonReporterTests.cs | 5 +++ .../Reporters/LcovReporterTests.cs | 11 ++++--- .../Reporters/OpenCoverReporterTests.cs | 17 +++++----- 11 files changed, 66 insertions(+), 72 deletions(-) diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs index 3596be2b8..f41755fbe 100644 --- a/src/coverlet.core/Coverage.cs +++ b/src/coverlet.core/Coverage.cs @@ -99,26 +99,15 @@ public CoverageResult GetCoverageResult() { if (methods.TryGetValue(branch.Method, out Method method)) { - if (method.Branches.TryGetValue(branch.Number, out List branchInfo)) - { - documents[doc.Path][branch.Class][branch.Method].Branches[branch.Number].Add(new BranchInfo - { Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } - ); - } - else - { - documents[doc.Path][branch.Class][branch.Method].Branches.Add(branch.Number, new List()); - documents[doc.Path][branch.Class][branch.Method].Branches[branch.Number].Add(new BranchInfo - { Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } - ); - } + method.Branches.Add(new BranchInfo + { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } + ); } else { documents[doc.Path][branch.Class].Add(branch.Method, new Method()); - documents[doc.Path][branch.Class][branch.Method].Branches.Add(branch.Number, new List()); - documents[doc.Path][branch.Class][branch.Method].Branches[branch.Number].Add(new BranchInfo - { Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } + documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo + { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } ); } } @@ -126,9 +115,8 @@ public CoverageResult GetCoverageResult() { documents[doc.Path].Add(branch.Class, new Methods()); documents[doc.Path][branch.Class].Add(branch.Method, new Method()); - documents[doc.Path][branch.Class][branch.Method].Branches.Add(branch.Number, new List()); - documents[doc.Path][branch.Class][branch.Method].Branches[branch.Number].Add(new BranchInfo - { Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } + documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo + { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } ); } } @@ -137,9 +125,8 @@ public CoverageResult GetCoverageResult() documents.Add(doc.Path, new Classes()); documents[doc.Path].Add(branch.Class, new Methods()); documents[doc.Path][branch.Class].Add(branch.Method, new Method()); - documents[doc.Path][branch.Class][branch.Method].Branches.Add(branch.Number, new List()); - documents[doc.Path][branch.Class][branch.Method].Branches[branch.Number].Add(new BranchInfo - { Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } + documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo + { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal } ); } } diff --git a/src/coverlet.core/CoverageResult.cs b/src/coverlet.core/CoverageResult.cs index c9fba580c..dc70d9c79 100644 --- a/src/coverlet.core/CoverageResult.cs +++ b/src/coverlet.core/CoverageResult.cs @@ -7,6 +7,7 @@ namespace Coverlet.Core { public class BranchInfo { + public int Line { get; set; } public int Offset { get; set; } public int EndOffset { get; set; } public int Path { get; set; } @@ -15,7 +16,9 @@ public class BranchInfo } public class Lines : SortedDictionary { } - public class Branches : SortedDictionary> { } + + public class Branches : List { } + public class Method { internal Method() diff --git a/src/coverlet.core/CoverageSummary.cs b/src/coverlet.core/CoverageSummary.cs index 1db52af0d..36b29c12e 100644 --- a/src/coverlet.core/CoverageSummary.cs +++ b/src/coverlet.core/CoverageSummary.cs @@ -62,19 +62,11 @@ public CoverageDetails CalculateLineCoverage(Modules modules) return details; } - public CoverageDetails CalculateBranchCoverage(List branchInfo) + public CoverageDetails CalculateBranchCoverage(IList branches) { var details = new CoverageDetails(); - details.Covered = branchInfo.Count(bi => bi.Hits > 0); - details.Total = branchInfo.Count; - return details; - } - - public CoverageDetails CalculateBranchCoverage(Branches branches) - { - var details = new CoverageDetails(); - details.Covered = branches.Sum(b => b.Value.Where(bi => bi.Hits > 0).Count()); - details.Total = branches.Sum(b => b.Value.Count()); + details.Covered = branches.Count(bi => bi.Hits > 0); + details.Total = branches.Count; return details; } diff --git a/src/coverlet.core/Reporters/CoberturaReporter.cs b/src/coverlet.core/Reporters/CoberturaReporter.cs index 309c1702a..e2f1772b0 100644 --- a/src/coverlet.core/Reporters/CoberturaReporter.cs +++ b/src/coverlet.core/Reporters/CoberturaReporter.cs @@ -71,13 +71,15 @@ public string Report(CoverageResult result) XElement lines = new XElement("lines"); foreach (var ln in meth.Value.Lines) { + bool isBranchPoint = meth.Value.Branches.Any(b => b.Line == ln.Key); XElement line = new XElement("line"); line.Add(new XAttribute("number", ln.Key.ToString())); line.Add(new XAttribute("hits", ln.Value.ToString())); - line.Add(new XAttribute("branch", meth.Value.Branches.ContainsKey(ln.Key).ToString())); + line.Add(new XAttribute("branch", isBranchPoint.ToString())); - if (meth.Value.Branches.TryGetValue(ln.Key, out List branches)) + if (isBranchPoint) { + var branches = meth.Value.Branches.Where(b => b.Line == ln.Key).ToList(); var branchInfoCoverage = summary.CalculateBranchCoverage(branches); line.Add(new XAttribute("condition-coverage", $"{branchInfoCoverage.Percent*100}% ({branchInfoCoverage.Covered}/{branchInfoCoverage.Total})")); XElement conditions = new XElement("conditions"); diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs index e83ef71dd..0def9057d 100644 --- a/src/coverlet.core/Reporters/LcovReporter.cs +++ b/src/coverlet.core/Reporters/LcovReporter.cs @@ -38,10 +38,9 @@ public string Report(CoverageResult result) foreach (var line in method.Value.Lines) lcov.Add($"DA:{line.Key},{line.Value}"); - foreach (var branchs in method.Value.Branches) + foreach (var branch in method.Value.Branches) { - foreach (var branch in branchs.Value) - lcov.Add($"BRDA:{branchs.Key},{branch.Offset},{branch.Path},{branch.Hits}"); + lcov.Add($"BRDA:{branch.Line},{branch.Offset},{branch.Path},{branch.Hits}"); } } } diff --git a/src/coverlet.core/Reporters/OpenCoverReporter.cs b/src/coverlet.core/Reporters/OpenCoverReporter.cs index ebd8b1d33..1464fc152 100644 --- a/src/coverlet.core/Reporters/OpenCoverReporter.cs +++ b/src/coverlet.core/Reporters/OpenCoverReporter.cs @@ -131,22 +131,19 @@ public string Report(CoverageResult result) k++; } - foreach (var branches in meth.Value.Branches) + foreach (var branche in meth.Value.Branches) { - foreach (var branch in branches.Value) - { - XElement branchPoint = new XElement("BranchPoint"); - branchPoint.Add(new XAttribute("vc", branch.Hits.ToString())); - branchPoint.Add(new XAttribute("upsid", branches.Key.ToString())); - branchPoint.Add(new XAttribute("ordinal", branch.Ordinal.ToString())); - branchPoint.Add(new XAttribute("path", branch.Path.ToString())); - branchPoint.Add(new XAttribute("offset", branch.Offset.ToString())); - branchPoint.Add(new XAttribute("offsetend", branch.EndOffset.ToString())); - branchPoint.Add(new XAttribute("sl", branches.Key.ToString())); - branchPoint.Add(new XAttribute("fileid", i.ToString())); - branchPoints.Add(branchPoint); - kBr++; - } + XElement branchPoint = new XElement("BranchPoint"); + branchPoint.Add(new XAttribute("vc", branche.Hits.ToString())); + branchPoint.Add(new XAttribute("upsid", branche.Line.ToString())); + branchPoint.Add(new XAttribute("ordinal", branche.Ordinal.ToString())); + branchPoint.Add(new XAttribute("path", branche.Path.ToString())); + branchPoint.Add(new XAttribute("offset", branche.Offset.ToString())); + branchPoint.Add(new XAttribute("offsetend", branche.EndOffset.ToString())); + branchPoint.Add(new XAttribute("sl", branche.Line.ToString())); + branchPoint.Add(new XAttribute("fileid", i.ToString())); + branchPoints.Add(branchPoint); + kBr++; } numMethods++; diff --git a/test/coverlet.core.tests/CoverageSummaryTests.cs b/test/coverlet.core.tests/CoverageSummaryTests.cs index 5ddc583e4..04cd2e78f 100644 --- a/test/coverlet.core.tests/CoverageSummaryTests.cs +++ b/test/coverlet.core.tests/CoverageSummaryTests.cs @@ -18,9 +18,8 @@ public CoverageSummaryTests() lines.Add(1, 1); lines.Add(2, 0); Branches branches = new Branches(); - branches.Add(1, new List()); - branches[1].Add(new BranchInfo { Hits = 1, Offset = 1, Path = 0, Ordinal = 1 }); - branches[1].Add(new BranchInfo { Hits = 1, Offset = 1, Path = 1, Ordinal = 2 }); + branches.Add(new BranchInfo { Line = 1, Hits = 1, Offset = 1, Path = 0, Ordinal = 1 }); + branches.Add(new BranchInfo { Line = 1, Hits = 1, Offset = 1, Path = 1, Ordinal = 2 }); Methods methods = new Methods(); var methodString = "System.Void Coverlet.Core.Tests.CoverageSummaryTests::TestCalculateSummary()"; diff --git a/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs b/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs index b2c0210d4..92b5d4f02 100644 --- a/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs +++ b/test/coverlet.core.tests/Reporters/CoberturaReporterTests.cs @@ -11,23 +11,27 @@ public void TestReport() { CoverageResult result = new CoverageResult(); result.Identifier = Guid.NewGuid().ToString(); + Lines lines = new Lines(); lines.Add(1, 1); lines.Add(2, 0); + Branches branches = new Branches(); - branches.Add(1, new List { - new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }, - new BranchInfo{ Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 } - }); + branches.Add(new BranchInfo { Line = 1, Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }); + branches.Add(new BranchInfo { Line = 1, Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 }); + Methods methods = new Methods(); var methodString = "System.Void Coverlet.Core.Reporters.Tests.CoberturaReporterTests::TestReport()"; methods.Add(methodString, new Method()); methods[methodString].Lines = lines; methods[methodString].Branches = branches; + Classes classes = new Classes(); classes.Add("Coverlet.Core.Reporters.Tests.CoberturaReporterTests", methods); + Documents documents = new Documents(); documents.Add("doc.cs", classes); + result.Modules = new Modules(); result.Modules.Add("module", documents); diff --git a/test/coverlet.core.tests/Reporters/JsonReporterTests.cs b/test/coverlet.core.tests/Reporters/JsonReporterTests.cs index ac0f31428..5a5ecd5fb 100644 --- a/test/coverlet.core.tests/Reporters/JsonReporterTests.cs +++ b/test/coverlet.core.tests/Reporters/JsonReporterTests.cs @@ -10,17 +10,22 @@ public void TestReport() { CoverageResult result = new CoverageResult(); result.Identifier = Guid.NewGuid().ToString(); + Lines lines = new Lines(); 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()); methods[methodString].Lines = lines; + Classes classes = new Classes(); classes.Add("Coverlet.Core.Reporters.Tests.JsonReporterTests", methods); + Documents documents = new Documents(); documents.Add("doc.cs", classes); + result.Modules = new Modules(); result.Modules.Add("module", documents); diff --git a/test/coverlet.core.tests/Reporters/LcovReporterTests.cs b/test/coverlet.core.tests/Reporters/LcovReporterTests.cs index 588405c61..f5c888bf1 100644 --- a/test/coverlet.core.tests/Reporters/LcovReporterTests.cs +++ b/test/coverlet.core.tests/Reporters/LcovReporterTests.cs @@ -11,21 +11,24 @@ public void TestReport() { CoverageResult result = new CoverageResult(); result.Identifier = Guid.NewGuid().ToString(); + Lines lines = new Lines(); lines.Add(1, 1); lines.Add(2, 0); + Branches branches = new Branches(); - branches.Add(1, new List { - new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }, - new BranchInfo{ Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 } - }); + branches.Add(new BranchInfo { Line = 1, Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }); + branches.Add(new BranchInfo { Line = 1, Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 }); + Methods methods = new Methods(); var methodString = "System.Void Coverlet.Core.Reporters.Tests.LcovReporterTests.TestReport()"; methods.Add(methodString, new Method()); methods[methodString].Lines = lines; methods[methodString].Branches = branches; + Classes classes = new Classes(); classes.Add("Coverlet.Core.Reporters.Tests.LcovReporterTests", methods); + Documents documents = new Documents(); documents.Add("doc.cs", classes); result.Modules = new Modules(); diff --git a/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs b/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs index c26fc1a92..f17452b4b 100644 --- a/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs +++ b/test/coverlet.core.tests/Reporters/OpenCoverReporterTests.cs @@ -11,7 +11,7 @@ public void TestReport() { CoverageResult result = new CoverageResult(); result.Identifier = Guid.NewGuid().ToString(); - + result.Modules = new Modules(); result.Modules.Add("Coverlet.Core.Reporters.Tests", CreateFirstDocuments()); @@ -24,7 +24,7 @@ public void TestFilesHaveUniqueIdsOverMultipleModules() { CoverageResult result = new CoverageResult(); result.Identifier = Guid.NewGuid().ToString(); - + result.Modules = new Modules(); result.Modules.Add("Coverlet.Core.Reporters.Tests", CreateFirstDocuments()); result.Modules.Add("Some.Other.Module", CreateSecondDocuments()); @@ -42,25 +42,28 @@ private static Documents CreateFirstDocuments() Lines lines = new Lines(); lines.Add(1, 1); lines.Add(2, 0); + Branches branches = new Branches(); - branches.Add(1, new List { - new BranchInfo{ Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }, - new BranchInfo{ Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 } - }); + branches.Add(new BranchInfo { Line = 1, Hits = 1, Offset = 23, EndOffset = 24, Path = 0, Ordinal = 1 }); + branches.Add(new BranchInfo { Line = 1, Hits = 0, Offset = 23, EndOffset = 27, Path = 1, Ordinal = 2 }); + Methods methods = new Methods(); var methodString = "System.Void Coverlet.Core.Reporters.Tests.OpenCoverReporterTests.TestReport()"; methods.Add(methodString, new Method()); methods[methodString].Lines = lines; methods[methodString].Branches = branches; + Classes classes = new Classes(); classes.Add("Coverlet.Core.Reporters.Tests.OpenCoverReporterTests", methods); + Documents documents = new Documents(); documents.Add("doc.cs", classes); + return documents; } private static Documents CreateSecondDocuments() - { + { Lines lines = new Lines(); lines.Add(1, 1); lines.Add(2, 0);