Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit b64e0bb

Browse files
author
Dragan
committed
CodeCoverage: Remove obsolete BranchPoint code
1 parent ab6f792 commit b64e0bb

4 files changed

Lines changed: 15 additions & 30 deletions

File tree

src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
</Reference>
6868
</ItemGroup>
6969
<ItemGroup>
70-
<Compile Include="Src\CodeCoverageBranchPoint.cs" />
7170
<Compile Include="Src\CodeCoverageControl.cs">
7271
<SubType>UserControl</SubType>
7372
</Compile>

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageBranchPoint.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethod.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public CodeCoverageMethod(string className, CodeCoverageMethodElement element)
6363

6464
this.IsVisited = element.IsVisited;
6565
this.BranchCoverage = element.BranchCoverage;
66-
this.BranchCoverageRatio = element.BranchCoverageRatio;
6766
this.SequencePointsCount = element.SequencePointsCount;
6867
this.sequencePoints = element.SequencePoints;
6968
this.FileID = element.FileID;
@@ -78,7 +77,6 @@ public CodeCoverageMethod(string className, CodeCoverageMethodElement element)
7877

7978
public bool IsVisited { get; private set; }
8079
public decimal BranchCoverage { get; private set; }
81-
public Tuple<int,int> BranchCoverageRatio { get; private set; }
8280
public int SequencePointsCount { get; private set; }
8381
public string FileID { get; private set; }
8482

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodElement.cs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,29 @@ namespace ICSharpCode.CodeCoverage
3030
public class CodeCoverageMethodElement
3131
{
3232
XElement element;
33-
CodeCoverageResults parent;
33+
CodeCoverageResults results;
3434

35+
/// <summary>Enables CodeCoverage.Test to compile</summary>
36+
/// <param name="element">XMLElement</param>
3537
public CodeCoverageMethodElement(XElement element)
3638
: this (element, null) {}
37-
public CodeCoverageMethodElement(XElement element, CodeCoverageResults parent)
39+
40+
/// <summary>Create Method Element</summary>
41+
/// <param name="element">XMLElement</param>
42+
/// <param name="results">has .GetFileName(FileID)</param>
43+
public CodeCoverageMethodElement(XElement element, CodeCoverageResults results)
3844
{
39-
this.parent = parent;
45+
this.results = results;
4046
this.element = element;
4147
this.SequencePoints = new List<CodeCoverageSequencePoint>();
42-
this.BranchPoints = new List<CodeCoverageBranchPoint>();
4348
Init();
4449
}
50+
51+
// Primary TextSource cache
4552
private static string cacheFileName = String.Empty;
4653
private static CodeCoverageStringTextSource cacheDocument = null;
4754

55+
// Secondary TextSource cache
4856
private static string cache2FileName = String.Empty;
4957
private static CodeCoverageStringTextSource cache2Document = null;
5058

@@ -59,7 +67,6 @@ public CodeCoverageMethodElement(XElement element, CodeCoverageResults parent)
5967
public bool IsConstructor { get; private set; }
6068
public bool IsStatic { get; private set; }
6169
public List<CodeCoverageSequencePoint> SequencePoints { get; private set; }
62-
public List<CodeCoverageBranchPoint> BranchPoints { get; private set; }
6370
public CodeCoverageSequencePoint BodyStartSP { get; private set; }
6471
public CodeCoverageSequencePoint BodyFinalSP { get; private set; }
6572

@@ -80,8 +87,8 @@ void Init()
8087
this.FileID = GetFileRef();
8188
this.FileName = String.Empty;
8289
if (!String.IsNullOrEmpty(this.FileID)) {
83-
if (parent != null) {
84-
this.FileName = parent.GetFileName(this.FileID);
90+
if (results != null) {
91+
this.FileName = results.GetFileName(this.FileID);
8592
if (cacheFileName != this.FileName) {
8693
cacheFileName = this.FileName;
8794
cacheDocument = GetSource (cacheFileName);
@@ -165,7 +172,7 @@ void GetSequencePoints() {
165172
// SequencePoint from another method/file
166173
// ie: ccrewriten CodeContractClass/CodeContractClassFor
167174
// [or dependency-injected or fody-weaved???]
168-
sp.Document = parent.GetFileName(sp.FileID);
175+
sp.Document = results.GetFileName(sp.FileID);
169176
}
170177
sp.BranchCoverage = (sp.BranchExitsCount == sp.BranchExitsVisit);
171178
sp.Content = String.Empty;

0 commit comments

Comments
 (0)