From d17ae0f63c1e6a662eae5daa96de35bed1bc514a Mon Sep 17 00:00:00 2001 From: Dragan Date: Sun, 1 Sep 2013 09:28:30 +0200 Subject: [PATCH] Code Coverage - Nested classes, Compiler Methods 1) Nested classes were omitted from Code Coverage panel 2) Omit compiler generated methods from Code Coverage panel --- .../Project/Src/CodeCoverageClassTreeNode.cs | 12 +++++++----- .../CodeCoverage/Project/Src/CodeCoverageResults.cs | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs index 920ddfdb3d..88e3daa5ad 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs @@ -51,11 +51,13 @@ namespace ICSharpCode.CodeCoverage // Add methods. CodeCoveragePropertyCollection properties = new CodeCoveragePropertyCollection(); foreach (CodeCoverageMethod method in Methods) { - if (method.IsProperty) { - properties.Add(method); - } else { - CodeCoverageMethodTreeNode node = new CodeCoverageMethodTreeNode(method); - node.AddTo(this); + if ( !method.Name.Contains("<") && !method.Name.Contains("__") ) { + if (method.IsProperty) { + properties.Add(method); + } else { + CodeCoverageMethodTreeNode node = new CodeCoverageMethodTreeNode(method); + node.AddTo(this); + } } } diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs index 8667671902..9a0a5368a8 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs @@ -63,8 +63,9 @@ namespace ICSharpCode.CodeCoverage var classNames = assembly.Elements("Classes").Elements("Class").Where( c => - !c.Element("FullName").Value.Contains("__") && !c.Element("FullName").Value.Contains("<") && - !c.Element("FullName").Value.Contains("/") && c.Attribute("skippedDueTo") == null).Select( + !c.Element("FullName").Value.Contains("__") && + !c.Element("FullName").Value.Contains("<") && + c.Attribute("skippedDueTo") == null).Select( c => c.Element("FullName").Value).Distinct().OrderBy(name => name); foreach (string className in classNames) { AddModule(assembly, className); @@ -95,7 +96,7 @@ namespace ICSharpCode.CodeCoverage .Elements("Methods") .Elements("Method"); foreach (XElement method in methods) { - AddMethod(module, className, method); + AddMethod(module, className.Replace('/','.'), method); } return module; }