cvs: pear /PHPUnit2/Util/CodeCoverage Renderer.php /PHPUnit2/Util/CodeCoverage/Renderer Text.php

sebastian Sat Feb 25 08:30:38 2006 UTC Modified files: /pear/PHPUnit2/Util/CodeCoverage Renderer.php /pear/PHPUnit2/Util/CodeCoverage/Renderer Text.php Log: Refactor PHPUnit2_Util_CodeCoverage_Renderer. http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer.php?r1=1.19&r2=1.20&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer.php diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer.php:1.19 pear/PHPUnit2/Util/CodeCoverage/Renderer.php:1.20 --- pear/PHPUnit2/Util/CodeCoverage/Renderer.php:1.19 Wed Jan 4 07:04:52 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer.php Sat Feb 25 08:30:37 2006 @@ -41,7 +41,7 @@ * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id: Renderer.php,v 1.19 2006/01/04 07:04:52 sebastian Exp $ + * @version CVS: $Id: Renderer.php,v 1.20 2006/02/25 08:30:37 sebastian Exp $ * @link http://pear.php.net/package/PHPUnit2 * @since File available since Release 2.3.0 */ @@ -98,50 +98,6 @@ } /** - * Visualizes the result array of - * PHPUnit2_Framework_TestResult::getCodeCoverageInformation(). - * - * @return string - * @access public - * @final - */ - public final function render() - { - $buffer = $this->header(); - - foreach ($this->getSummary() as $sourceFile => $executedLines) { - if (file_exists($sourceFile)) { - $buffer .= $this->startSourceFile($sourceFile); - $buffer .= $this->renderSourceFile(file($sourceFile), $executedLines); - $buffer .= $this->endSourceFile($sourceFile); - } - } - - return $buffer . $this->footer(); - } - - /** - * Visualizes the result array of - * PHPUnit2_Framework_TestResult::getCodeCoverageInformation() - * and writes it to a file. - * - * @param string $filename - * @access public - * @since Method available since Release 2.2.0 - */ - public function renderToFile($filename) - { - if ($fp = fopen($filename, 'w')) { - fputs( - $fp, - $this->render() - ); - - fclose($fp); - } - } - - /** * Returns summarized Code Coverage data. * * Format of the result array: @@ -183,49 +139,14 @@ } /** - * @return string - * @access protected - * @since Method available since Release 2.1.1 - */ - protected function header() - { - } - - /** - * @return string - * @access protected - * @since Method available since Release 2.1.1 - */ - protected function footer() - { - } - - /** - * @param string $sourceFile - * @return string - * @access protected - */ - protected function startSourceFile($sourceFile) - { - } - - /** - * @param string $sourceFile - * @return string - * @access protected - */ - protected function endSourceFile($sourceFile) - { - } - - /** - * @param array $codeLines - * @param array $executedLines - * @return string - * @access protected + * Visualizes the result array of + * PHPUnit2_Framework_TestResult::getCodeCoverageInformation(). + * + * @param string $target + * @access public * @abstract */ - abstract protected function renderSourceFile(Array $codeLines, Array $executedLines); + abstract public function render($target); } PHPUnit2_Util_Classloader::import( http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php?r1=1.14&r2=1.15&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php:1.14 pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php:1.15 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php:1.14 Wed Jan 4 07:04:53 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/Text.php Sat Feb 25 08:30:38 2006 @@ -41,20 +41,13 @@ * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id: Text.php,v 1.14 2006/01/04 07:04:53 sebastian Exp $ + * @version CVS: $Id: Text.php,v 1.15 2006/02/25 08:30:38 sebastian Exp $ * @link http://pear.php.net/package/PHPUnit2 * @since File available since Release 2.3.0 */ -require_once 'PHPUnit2/Util/Classloader.php'; require_once 'PHPUnit2/Util/Filter.php'; -PHPUnit2_Util_Classloader::import( - array( - 'PHPUnit2_Util_CodeCoverage_Renderer', - ) -); - PHPUnit2_Util_Filter::addFileToFilter(__FILE__); /** @@ -72,6 +65,39 @@ class PHPUnit2_Util_CodeCoverage_Renderer_Text extends PHPUnit2_Util_CodeCoverage_Renderer { /** + * Visualizes the result array of + * PHPUnit2_Framework_TestResult::getCodeCoverageInformation() + * and writes it to a file. + * + * @return string + * @access public + * @since Method available since Release 3.0.0 + */ + public function render($target) + { + $buffer = $this->header(); + + foreach ($this->getSummary() as $sourceFile => $executedLines) { + if (file_exists($sourceFile)) { + $buffer .= $this->startSourceFile($sourceFile); + $buffer .= $this->renderSourceFile(file($sourceFile), $executedLines); + $buffer .= $this->endSourceFile($sourceFile); + } + } + + $buffer .= $this->footer(); + + if ($fp = fopen($filename, 'w')) { + fputs( + $fp, + $buffer + ); + + fclose($fp); + } + } + + /** * @param string $sourceFile * @return string * @access protected