From d3927a34d946a45fff317ed4f3f88e7c9d41df7c Mon Sep 17 00:00:00 2001 From: ddur Date: Thu, 10 Dec 2015 23:24:55 +0100 Subject: [PATCH] Reveal compiler generated methods Some user methods (enumerators) are uncovered without compiler generated methods --- .../Project/Src/CodeCoverageClassTreeNode.cs | 13 +++++-------- .../Project/Src/CodeCoverageMethodsTreeNode.cs | 3 --- .../CodeCoverage/Project/Src/CodeCoverageResults.cs | 5 +---- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs index ad70ea1695..0a26162419 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs @@ -66,14 +66,11 @@ namespace ICSharpCode.CodeCoverage // Add methods. CodeCoveragePropertyCollection properties = new CodeCoveragePropertyCollection(); foreach (CodeCoverageMethod method in Methods) { - // method name that is generated by compiler, contains "__" (double underscore) - if ( !method.Name.Contains("__") ) { - if (method.IsProperty) { - properties.Add(method); - } else { - CodeCoverageMethodTreeNode node = new CodeCoverageMethodTreeNode(method); - node.AddTo(this); - } + if (method.IsProperty) { + properties.Add(method); + } else { + CodeCoverageMethodTreeNode node = new CodeCoverageMethodTreeNode(method); + node.AddTo(this); } } diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs index 590fe3f641..f371de8d14 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs @@ -41,9 +41,6 @@ namespace ICSharpCode.CodeCoverage decimal branchCoverage = 0; int branchCoverageCount = 0; foreach (CodeCoverageMethod method in methods) { - if (method.Name.Contains("__")) { - continue; - } visitedCodeLength += method.GetVisitedCodeLength(); unvisitedCodeLength += method.GetUnvisitedCodeLength(); if ( method.IsVisited ) { diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs index e03986a8e6..5fdab6b052 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs @@ -78,7 +78,6 @@ namespace ICSharpCode.CodeCoverage var classNames = assembly.Elements("Classes").Elements("Class").Where( c => - !c.Element("FullName").Value.Contains("__") && c.Attribute("skippedDueTo") == null).Select( c => c.Element("FullName").Value).Distinct().OrderBy(name => name); foreach (string className in classNames) { @@ -130,9 +129,7 @@ namespace ICSharpCode.CodeCoverage CodeCoverageMethod AddMethod(CodeCoverageModule module, string className, XElement reader) { var method = new CodeCoverageMethod(className, reader, this); - if (!method.Name.Contains("__")) { - module.Methods.Add(method); - } + module.Methods.Add(method); return method; }