Calculate percentages for tested traits correctly.

sebastianbergmann · Aug 7, 2012 · 3f68939 · 3f68939
1 parent cfd577b
commit 3f68939
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 9 deletions.
diff --git a/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php b/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
@@ -100,8 +100,8 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file, $tit
     protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE)
     {
         $data = array(
-          'numClasses'                   => $item->getNumClasses(),
-          'numTestedClasses'             => $item->getNumTestedClasses(),
+          'numClasses'                   => $item->getNumClassesAndTraits(),
+          'numTestedClasses'             => $item->getNumTestedClassesAndTraits(),
           'numMethods'                   => $item->getNumMethods(),
           'numTestedMethods'             => $item->getNumTestedMethods(),
           'linesExecutedPercent'         => $item->getLineExecutedPercent(FALSE),
@@ -110,8 +110,8 @@ protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE
           'numExecutableLines'           => $item->getNumExecutableLines(),
           'testedMethodsPercent'         => $item->getTestedMethodsPercent(FALSE),
           'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
-          'testedClassesPercent'         => $item->getTestedClassesPercent(FALSE),
-          'testedClassesPercentAsString' => $item->getTestedClassesPercent()
+          'testedClassesPercent'         => $item->getTestedClassesAndTraitsPercent(FALSE),
+          'testedClassesPercentAsString' => $item->getTestedClassesAndTraitsPercent()
         );
 
         if ($total) {

diff --git a/PHP/CodeCoverage/Report/HTML/Renderer/File.php b/PHP/CodeCoverage/Report/HTML/Renderer/File.php
@@ -159,8 +159,8 @@ protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
           array(
             'itemClass'                    => 'coverDirectory',
             'name'                         => 'Total',
-            'numClasses'                   => $node->getNumClasses() + $node->getNumTraits(),
-            'numTestedClasses'             => $node->getNumTestedClasses() + $node->getNumTestedTraits(),
+            'numClasses'                   => $node->getNumClassesAndTraits(),
+            'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
             'numMethods'                   => $node->getNumMethods(),
             'numTestedMethods'             => $node->getNumTestedMethods(),
             'linesExecutedPercent'         => $node->getLineExecutedPercent(FALSE),

diff --git a/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
@@ -53,7 +53,7 @@
           <td class="tableHead">&nbsp;</td>
           <td class="tableHead" colspan="3">Lines</td>
           <td class="tableHead" colspan="3">Functions / Methods</td>
-          <td class="tableHead" colspan="3">Classes</td>
+          <td class="tableHead" colspan="3">Classes / Traits</td>
         </tr>
 {items}
       </table>

diff --git a/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
@@ -49,7 +49,7 @@
         </tr>
         <tr>
           <td class="tableHead">&nbsp;</td>
-          <td class="tableHead" colspan="3">Classes</td>
+          <td class="tableHead" colspan="3">Classes / Traits</td>
           <td class="tableHead" colspan="4">Functions / Methods</td>
           <td class="tableHead" colspan="3">Lines</td>
         </tr>

diff --git a/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist b/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist
@@ -46,7 +46,7 @@
         </tr>
         <tr>
           <td class="tableHead">&nbsp;</td>
-          <td class="tableHead" colspan="3">Classes</td>
+          <td class="tableHead" colspan="3">Classes / Traits</td>
           <td class="tableHead" colspan="3">Functions / Methods</td>
           <td class="tableHead" colspan="3">Lines</td>
         </tr>

diff --git a/PHP/CodeCoverage/Report/Node.php b/PHP/CodeCoverage/Report/Node.php
@@ -202,6 +202,22 @@ public function getTestedTraitsPercent($asString = TRUE)
         );
     }
 
+    /**
+     * Returns the percentage of traits that has been tested.
+     *
+     * @param  boolean $asString
+     * @return integer
+     * @since  Method available since Release 1.2.0
+     */
+    public function getTestedClassesAndTraitsPercent($asString = TRUE)
+    {
+        return PHP_CodeCoverage_Util::percent(
+          $this->getNumTestedClassesAndTraits(),
+          $this->getNumClassesAndTraits(),
+          $asString
+        );
+    }
+
     /**
      * Returns the percentage of methods that has been tested.
      *
@@ -232,6 +248,28 @@ public function getLineExecutedPercent($asString = TRUE)
         );
     }
 
+    /**
+     * Returns the number of classes and traits.
+     *
+     * @return integer
+     * @since  Method available since Release 1.2.0
+     */
+    public function getNumClassesAndTraits()
+    {
+        return $this->getNumClasses() + $this->getNumTraits();
+    }
+
+    /**
+     * Returns the number of tested classes and traits.
+     *
+     * @return integer
+     * @since  Method available since Release 1.2.0
+     */
+    public function getNumTestedClassesAndTraits()
+    {
+        return $this->getNumTestedClasses() + $this->getNumTestedTraits();
+    }
+
     /**
      * Returns the classes of this node.
      *