#582: Removed method coverage usage for line coverage if no coverage is available

Author: danielpalme

src/AngularComponents/src/app/components/coverageinfo/class-row.component.ts

@@ -53,7 +53,7 @@ import { ClassViewModel } from "./viewmodels/class-viewmodel.class";
     {{clazz.totalLines}}
   </ng-container>
 </td>
-<td class="right" [title]="clazz.coverageType + ': ' + clazz.coverageRatioText" *ngIf="lineCoverageAvailable">
+<td class="right" [title]="clazz.coverageRatioText" *ngIf="lineCoverageAvailable">
   <div coverage-history-chart [historicCoverages]="clazz.lineCoverageHistory"
     *ngIf="clazz.lineCoverageHistory.length > 1"
     [ngClass]="{'historiccoverageoffset': clazz.currentHistoricCoverage !== null}"

src/AngularComponents/src/app/components/coverageinfo/data/class.class.ts

@@ -31,16 +31,6 @@ export class Class {
     */
     tl: number = 0;
 
-    /*
-    * The coverageType.
-    */
-    ct: string = "";
-
-    /*
-    * The line coverage determined by method coverage.
-    */
-    cbm: string = "";
-
     /*
     * The coveredBranches.
     */

src/AngularComponents/src/app/components/coverageinfo/viewmodels/class-viewmodel.class.ts

@@ -5,8 +5,6 @@ import { Helper } from "./helper.class";
 
 export class ClassViewModel extends ElementBase {
     reportPath: string = "";
-    _coverageType: string = "";
-    coverageByMethod: string = "";
     lineCoverageHistory: number[] = [];
     branchCoverageHistory: number[] = [];
     methodCoverageHistory: number[] = [];
@@ -27,9 +25,6 @@ export class ClassViewModel extends ElementBase {
             this.coverableLines = clazz.cal;
             this.totalLines = clazz.tl;
 
-            this._coverageType = clazz.ct;
-            this.coverageByMethod = clazz.cbm;
-
             this.coveredBranches = clazz.cb;
             this.totalBranches = clazz.tb;
 
@@ -49,28 +44,12 @@ export class ClassViewModel extends ElementBase {
 
     override get coverage(): number {
         if (this.coverableLines === 0) {
-            if (this.coverageByMethod !== "-") {
-                return parseFloat(this.coverageByMethod);
-            }
-
             return NaN;
         }
 
         return Helper.roundNumber(100 * this.coveredLines / this.coverableLines, 1);
     }
 
-    get coverageType(): string {
-        if (this.coverableLines === 0) {
-            if (this.coverageByMethod !== "-") {
-                return this._coverageType;
-            }
-
-            return "";
-        }
-
-        return this._coverageType;
-    }
-
     visible(filter: string, historicCoverageFilter: string): boolean {
         if (filter !== "" && this.name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
             return false;

src/Readme.txt

@@ -66,6 +66,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.1.17.0
+
+    * Fix: #582: Removed method coverage usage for line coverage if no coverage is available
+
 5.1.16.0
 
     * Fix: #536: Improved support for C code in Visual Studio coverage input format (*.coveragexml)

src/ReportGenerator.Core.Test/Parser/Analysis/ClassTest.cs

@@ -44,33 +44,6 @@ public void AddFile_AddSingleFile_FileIsStored()
             Assert.Single(sut.Files);
         }
 
-        /// <summary>
-        /// A test for Merge
-        /// </summary>
-        [Fact]
-        public void Merge_MergeClassWithCoverageQuota_CoverageQuotaApplied()
-        {
-            var assembly = new Assembly("C:\\test\\TestAssembly.dll");
-            var sut = new Class("Test", assembly);
-            var classToMerge = new Class("Test", assembly)
-            {
-                CoverageQuota = 15
-            };
-
-            sut.Merge(classToMerge);
-
-            Assert.Equal(15, sut.CoverageQuota);
-
-            classToMerge = new Class("Test", assembly)
-            {
-                CoverageQuota = 20
-            };
-
-            sut.Merge(classToMerge);
-
-            Assert.Equal(20, sut.CoverageQuota);
-        }
-
         /// <summary>
         /// A test for Equals
         /// </summary>

src/ReportGenerator.Core/Parser/Analysis/Class.cs

@@ -31,11 +31,6 @@ public class Class
         /// </summary>
         private readonly List<HistoricCoverage> historicCoverages = new List<HistoricCoverage>();
 
-        /// <summary>
-        /// The coverage quota.
-        /// </summary>
-        private decimal? coverageQuota;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Class"/> class.
         /// </summary>
@@ -118,12 +113,6 @@ internal Class(string name, Assembly assembly)
         /// <value>The historic coverage information.</value>
         public IEnumerable<HistoricCoverage> HistoricCoverages => this.historicCoverages;
 
-        /// <summary>
-        /// Gets the coverage type.
-        /// </summary>
-        /// <value>The coverage type.</value>
-        public CoverageType CoverageType => this.files.Count == 0 ? CoverageType.MethodCoverage : CoverageType.LineCoverage;
-
         /// <summary>
         /// Gets the number of covered lines.
         /// </summary>
@@ -143,26 +132,14 @@ internal Class(string name, Assembly assembly)
         public int? TotalLines => this.files.SafeSum(f => f.TotalLines);
 
         /// <summary>
-        /// Gets or sets the coverage quota of the class.
+        /// Gets the coverage quota of the class.
         /// </summary>
         /// <value>The coverage quota.</value>
         public decimal? CoverageQuota
         {
             get
             {
-                if (this.files.Count == 0)
-                {
-                    return this.coverageQuota;
-                }
-                else
-                {
-                    return (this.CoverableLines == 0) ? (decimal?)null : (decimal)Math.Truncate(1000 * (double)this.CoveredLines / (double)this.CoverableLines) / 10;
-                }
-            }
-
-            set
-            {
-                this.coverageQuota = value;
+                return (this.CoverableLines == 0) ? (decimal?)null : (decimal)Math.Truncate(1000 * (double)this.CoveredLines / (double)this.CoverableLines) / 10;
             }
         }
 
@@ -281,15 +258,6 @@ internal void Merge(Class @class)
                 throw new ArgumentNullException(nameof(@class));
             }
 
-            if (this.coverageQuota.HasValue && @class.coverageQuota.HasValue)
-            {
-                this.CoverageQuota = Math.Max(this.coverageQuota.Value, @class.coverageQuota.Value);
-            }
-            else if (@class.coverageQuota.HasValue)
-            {
-                this.CoverageQuota = @class.coverageQuota.Value;
-            }
-
             foreach (var file in @class.files)
             {
                 var existingFile = this.files.FirstOrDefault(f => f.Equals(file));

src/ReportGenerator.Core/Parser/Analysis/CoverageType.cs

@@ -217,8 +217,6 @@ private void ProcessClass(IDictionary<string, XElement[]> assemblyModules, XElem
                     @class.AddFile(ProcessFile(trackedMethods, fileIdsByFilename[file], file, methods));
                 }
 
-                @class.CoverageQuota = GetCoverageQuotaOfClass(methods);
-
                 assembly.AddClass(@class);
             }
         }
@@ -573,24 +571,6 @@ private static string ExtractMethodName(string methodName)
             return fullName;
         }
 
-        /// <summary>
-        /// Gets the coverage quota of a class.
-        /// This method is used to get coverage quota if line coverage is not available.
-        /// </summary>
-        /// <param name="methods">The methods.</param>
-        /// <returns>The coverage quota.</returns>
-        private static decimal? GetCoverageQuotaOfClass(XElement[] methods)
-        {
-            var methodGroups = methods
-                .Where(m => m.Attribute("skippedDueTo") == null && m.Element("FileRef") == null && !m.Element("Name").Value.EndsWith(".ctor()", StringComparison.OrdinalIgnoreCase))
-                .GroupBy(m => m.Element("Name").Value)
-                .ToArray();
-
-            int visitedMethods = methodGroups.Count(g => g.Any(m => m.Attribute("visited").Value == "true"));
-
-            return (methodGroups.Length == 0) ? (decimal?)null : (decimal)Math.Truncate(1000 * (double)visitedMethods / (double)methodGroups.Length) / 10;
-        }
-
         private class FileElement
         {
             /// <summary>

src/ReportGenerator.Core/Parser/OpenCoverParser.cs

@@ -609,10 +609,7 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots
                     this.javaScriptContent.AppendFormat(" \"ucl\": {0},", (@class.CoverableLines - @class.CoveredLines).ToString(CultureInfo.InvariantCulture));
                     this.javaScriptContent.AppendFormat(" \"cal\": {0},", @class.CoverableLines.ToString(CultureInfo.InvariantCulture));
                     this.javaScriptContent.AppendFormat(" \"tl\": {0},", @class.TotalLines.GetValueOrDefault().ToString(CultureInfo.InvariantCulture));
-                    this.javaScriptContent.AppendFormat(" \"ct\": \"{0}\",", @class.CoverageType);
-                    this.javaScriptContent.AppendFormat(
-                        " \"cbm\": {0},",
-                        @class.CoverageType == CoverageType.MethodCoverage && @class.CoverageQuota.HasValue ? @class.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) : "\"-\"");
+
                     this.javaScriptContent.AppendFormat(" \"cb\": {0},", @class.CoveredBranches.GetValueOrDefault().ToString(CultureInfo.InvariantCulture));
                     this.javaScriptContent.AppendFormat(" \"tb\": {0},", @class.TotalBranches.GetValueOrDefault().ToString(CultureInfo.InvariantCulture));
                     this.javaScriptContent.AppendFormat(" \"cm\": {0},", methodCoverageAvailable ? @class.CoveredCodeElements.ToString(CultureInfo.InvariantCulture) : "0");
@@ -1237,7 +1234,7 @@ public void SummaryAssembly(Assembly assembly, bool branchCoverageAvailable, boo
             this.reportTextWriter.Write("<th class=\"right\">{0}</th>", assembly.TotalLines.GetValueOrDefault());
             this.reportTextWriter.Write(
                 "<th title=\"{0}\" class=\"right\">{1}</th>",
-                assembly.CoverageQuota.HasValue ? $"{CoverageType.LineCoverage}: {assembly.CoveredLines}/{assembly.CoverableLines}" : string.Empty,
+                assembly.CoverageQuota.HasValue ? $"{assembly.CoveredLines}/{assembly.CoverableLines}" : string.Empty,
                 assembly.CoverageQuota.HasValue ? assembly.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + "%" : string.Empty);
             this.reportTextWriter.Write("<th>{0}</th>", CreateCoverageTable(assembly.CoverageQuota));
 
@@ -1293,7 +1290,7 @@ public void SummaryClass(Class @class, bool branchCoverageAvailable, bool method
             this.reportTextWriter.Write("<td class=\"right\">{0}</td>", @class.TotalLines.GetValueOrDefault());
             this.reportTextWriter.Write(
                 "<td title=\"{0}\" class=\"right\">{1}</td>",
-                @class.CoverageQuota.HasValue ? $"{@class.CoverageType}: {@class.CoveredLines}/{@class.CoverableLines}" : @class.CoverageType.ToString(),
+                @class.CoverageQuota.HasValue ? $"{@class.CoveredLines}/{@class.CoverableLines}" : string.Empty,
                 @class.CoverageQuota.HasValue ? @class.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + "%" : string.Empty);
             this.reportTextWriter.Write("<td>{0}</td>", CreateCoverageTable(@class.CoverageQuota));
 
@@ -1685,7 +1682,7 @@ private Stream GetCombinedJavascript()
             sb.AppendLine(",");
             sb.AppendFormat("'method': '{0}'", WebUtility.HtmlEncode(ReportResources.Method));
             sb.AppendLine(",");
-            sb.AppendFormat("'lineCoverage': '{0}'", CoverageType.LineCoverage.ToString());
+            sb.AppendFormat("'lineCoverage': '{0}'", WebUtility.HtmlEncode(ReportResources.Coverage));
             sb.AppendLine(",");
             sb.AppendFormat("'noGrouping': '{0}'", WebUtility.HtmlEncode(ReportResources.NoGrouping));
             sb.AppendLine(",");