Browse Source

Merge 35f80c5ce1 into a7924d9bfb

pull/725/merge
ddur 10 years ago
parent
commit
1c7c899830
  1. 3
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs
  2. 3
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs
  3. 3
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs

3
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageClassTreeNode.cs

@ -66,8 +66,6 @@ namespace ICSharpCode.CodeCoverage
// Add methods. // Add methods.
CodeCoveragePropertyCollection properties = new CodeCoveragePropertyCollection(); CodeCoveragePropertyCollection properties = new CodeCoveragePropertyCollection();
foreach (CodeCoverageMethod method in Methods) { foreach (CodeCoverageMethod method in Methods) {
// method name that is generated by compiler, contains "__" (double underscore)
if ( !method.Name.Contains("__") ) {
if (method.IsProperty) { if (method.IsProperty) {
properties.Add(method); properties.Add(method);
} else { } else {
@ -75,7 +73,6 @@ namespace ICSharpCode.CodeCoverage
node.AddTo(this); node.AddTo(this);
} }
} }
}
// Add properties.s // Add properties.s
foreach (CodeCoverageProperty property in properties) { foreach (CodeCoverageProperty property in properties) {

3
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodsTreeNode.cs

@ -41,9 +41,6 @@ namespace ICSharpCode.CodeCoverage
decimal branchCoverage = 0; decimal branchCoverage = 0;
int branchCoverageCount = 0; int branchCoverageCount = 0;
foreach (CodeCoverageMethod method in methods) { foreach (CodeCoverageMethod method in methods) {
if (method.Name.Contains("__")) {
continue;
}
visitedCodeLength += method.GetVisitedCodeLength(); visitedCodeLength += method.GetVisitedCodeLength();
unvisitedCodeLength += method.GetUnvisitedCodeLength(); unvisitedCodeLength += method.GetUnvisitedCodeLength();
if ( method.IsVisited ) { if ( method.IsVisited ) {

3
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageResults.cs

@ -78,7 +78,6 @@ namespace ICSharpCode.CodeCoverage
var classNames = var classNames =
assembly.Elements("Classes").Elements("Class").Where( assembly.Elements("Classes").Elements("Class").Where(
c => c =>
!c.Element("FullName").Value.Contains("__") &&
c.Attribute("skippedDueTo") == null).Select( c.Attribute("skippedDueTo") == null).Select(
c => c.Element("FullName").Value).Distinct().OrderBy(name => name); c => c.Element("FullName").Value).Distinct().OrderBy(name => name);
foreach (string className in classNames) { foreach (string className in classNames) {
@ -130,9 +129,7 @@ namespace ICSharpCode.CodeCoverage
CodeCoverageMethod AddMethod(CodeCoverageModule module, string className, XElement reader) CodeCoverageMethod AddMethod(CodeCoverageModule module, string className, XElement reader)
{ {
var method = new CodeCoverageMethod(className, reader, this); var method = new CodeCoverageMethod(className, reader, this);
if (!method.Name.Contains("__")) {
module.Methods.Add(method); module.Methods.Add(method);
}
return method; return method;
} }

Loading…
Cancel
Save