Use path coverage as baseline for CRAP where available, and branch coverage for marking whether a method/class/function is covered

Author: dvdoug

src/Node/File.php

@@ -441,95 +441,90 @@ private function calculateStatistics(): void
 
         foreach ($this->traits as &$trait) {
             foreach ($trait['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                            $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
+                $methodLineCoverage   = $method['executableLines'] ? ($method['executedLines'] / $method['executableLines']) * 100 : 100;
+                $methodBranchCoverage = $method['executableBranches'] ? ($method['executedBranches'] / $method['executableBranches']) * 100 : 0;
+                $methodPathCoverage   = $method['executablePaths'] ? ($method['executedPaths'] / $method['executablePaths']) * 100 : 0;
+
+                $method['coverage'] = $methodBranchCoverage ?: $methodLineCoverage;
 
                 $method['crap'] = $this->crap(
                     $method['ccn'],
-                    $method['coverage']
+                    $methodPathCoverage ?: $methodLineCoverage
                 );
 
                 $trait['ccn'] += $method['ccn'];
             }
 
             unset($method);
 
-            if ($trait['executableLines'] > 0) {
-                $trait['coverage'] = ($trait['executedLines'] /
-                        $trait['executableLines']) * 100;
+            $traitLineCoverage   = $trait['executableLines'] ? ($trait['executedLines'] / $trait['executableLines']) * 100 : 100;
+            $traitBranchCoverage = $trait['executableBranches'] ? ($trait['executedBranches'] / $trait['executableBranches']) * 100 : 0;
+            $traitPathCoverage   = $trait['executablePaths'] ? ($trait['executedPaths'] / $trait['executablePaths']) * 100 : 0;
 
-                if ($trait['coverage'] === 100) {
-                    $this->numTestedClasses++;
-                }
-            } else {
-                $trait['coverage'] = 100;
+            $trait['coverage'] = $traitBranchCoverage ?: $traitLineCoverage;
+
+            if ($trait['executableLines'] > 0 && $trait['coverage'] === 100) {
+                $this->numTestedClasses++;
             }
 
             $trait['crap'] = $this->crap(
                 $trait['ccn'],
-                $trait['coverage']
+                $traitPathCoverage ?: $traitLineCoverage
             );
         }
 
         unset($trait);
 
         foreach ($this->classes as &$class) {
             foreach ($class['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                            $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
+                $methodLineCoverage   = $method['executableLines'] ? ($method['executedLines'] / $method['executableLines']) * 100 : 100;
+                $methodBranchCoverage = $method['executableBranches'] ? ($method['executedBranches'] / $method['executableBranches']) * 100 : 0;
+                $methodPathCoverage   = $method['executablePaths'] ? ($method['executedPaths'] / $method['executablePaths']) * 100 : 0;
+
+                $method['coverage'] = $methodBranchCoverage ?: $methodLineCoverage;
 
                 $method['crap'] = $this->crap(
                     $method['ccn'],
-                    $method['coverage']
+                    $methodPathCoverage ?: $methodLineCoverage
                 );
 
                 $class['ccn'] += $method['ccn'];
             }
 
             unset($method);
 
-            if ($class['executableLines'] > 0) {
-                $class['coverage'] = ($class['executedLines'] /
-                        $class['executableLines']) * 100;
+            $classLineCoverage   = $class['executableLines'] ? ($class['executedLines'] / $class['executableLines']) * 100 : 100;
+            $classBranchCoverage = $class['executableBranches'] ? ($class['executedBranches'] / $class['executableBranches']) * 100 : 0;
+            $classPathCoverage   = $class['executablePaths'] ? ($class['executedPaths'] / $class['executablePaths']) * 100 : 0;
 
-                if ($class['coverage'] === 100) {
-                    $this->numTestedClasses++;
-                }
-            } else {
-                $class['coverage'] = 100;
+            $class['coverage'] = $classBranchCoverage ?: $classLineCoverage;
+
+            if ($class['executableLines'] > 0 && $class['coverage'] === 100) {
+                $this->numTestedClasses++;
             }
 
             $class['crap'] = $this->crap(
                 $class['ccn'],
-                $class['coverage']
+                $classPathCoverage ?: $classLineCoverage
             );
         }
 
         unset($class);
 
         foreach ($this->functions as &$function) {
-            if ($function['executableLines'] > 0) {
-                $function['coverage'] = ($function['executedLines'] /
-                        $function['executableLines']) * 100;
-            } else {
-                $function['coverage'] = 100;
-            }
+            $functionLineCoverage   = $function['executableLines'] ? ($function['executedLines'] / $function['executableLines']) * 100 : 100;
+            $functionBranchCoverage = $function['executableBranches'] ? ($function['executedBranches'] / $function['executableBranches']) * 100 : 0;
+            $functionPathCoverage   = $function['executablePaths'] ? ($function['executedPaths'] / $function['executablePaths']) * 100 : 0;
+
+            $function['coverage'] = $functionBranchCoverage ?: $functionLineCoverage;
 
             if ($function['coverage'] === 100) {
                 $this->numTestedFunctions++;
             }
 
             $function['crap'] = $this->crap(
                 $function['ccn'],
-                $function['coverage']
+                $functionPathCoverage ?: $functionLineCoverage
             );
         }
     }

tests/_files/Report/HTML/PathCoverageForBankAccount/BankAccount.php.html

@@ -106,7 +106,7 @@
 </td>
        <td class="warning small"><div align="right">75.00%</div></td>
        <td class="warning small"><div align="right">3&nbsp;/&nbsp;4</div></td>
-       <td class="warning small">8.12</td>
+       <td class="warning small">6.60</td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="60.00" aria-valuemin="0" aria-valuemax="100" style="width: 60.00%">
            <span class="sr-only">60.00% covered (warning)</span>

tests/_files/Report/HTML/PathCoverageForBankAccount/dashboard.html

@@ -57,7 +57,7 @@ <h3>Insufficient Coverage</h3>
         </tr>
        </thead>
        <tbody>
-       <tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">50%</td></tr>
+       <tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">42%</td></tr>
 
        </tbody>
       </table>
@@ -74,7 +74,7 @@ <h3>Project Risks</h3>
         </tr>
        </thead>
        <tbody>
-       <tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">8</td></tr>
+       <tr><td><a href="BankAccount.php.html#2">BankAccount</a></td><td class="text-right">6</td></tr>
 
        </tbody>
       </table>
@@ -158,7 +158,7 @@ <h3>Project Risks</h3>
       .yAxis.tickFormat(d3.format('d'));
 
     d3.select('#classCoverageDistribution svg')
-      .datum(getCoverageDistributionData([0,0,0,0,0,0,1,0,0,0,0,0], "Class Coverage"))
+      .datum(getCoverageDistributionData([0,0,0,0,0,1,0,0,0,0,0,0], "Class Coverage"))
       .transition().duration(500).call(chart);
 
     nv.utils.windowResize(chart.update);
@@ -226,7 +226,7 @@ <h3>Project Risks</h3>
     chart.yAxis.axisLabel('Cyclomatic Complexity');
 
     d3.select('#classComplexity svg')
-      .datum(getComplexityData([[50,5,"<a href=\"BankAccount.php.html#2\">BankAccount<\/a>"]], 'Class Complexity'))
+      .datum(getComplexityData([[42.857142857143,5,"<a href=\"BankAccount.php.html#2\">BankAccount<\/a>"]], 'Class Complexity'))
       .transition()
       .duration(500)
       .call(chart);