cvs: pear /PHPUnit2/TextUI TestRunner.php
| From: | Sebastian Bergmann | Date: | Sat, 25 Feb 2006 08:30:47 +0000 |
| Subject: | cvs: pear /PHPUnit2/TextUI TestRunner.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-38587@lists.php.net to get a copy of this message | ||
sebastian Sat Feb 25 08:30:47 2006 UTC
Modified files:
/pear/PHPUnit2/TextUI TestRunner.php
Log:
Refactor PHPUnit2_Util_CodeCoverage_Renderer. New HTML Code Coverage renderer based on the layout
of LCOV.
http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/TextUI/TestRunner.php?r1=1.81&r2=1.82&diff_format=u
Index: pear/PHPUnit2/TextUI/TestRunner.php
diff -u pear/PHPUnit2/TextUI/TestRunner.php:1.81 pear/PHPUnit2/TextUI/TestRunner.php:1.82
--- pear/PHPUnit2/TextUI/TestRunner.php:1.81 Sun Feb 19 04:56:45 2006
+++ pear/PHPUnit2/TextUI/TestRunner.php Sat Feb 25 08:30:47 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: TestRunner.php,v 1.81 2006/02/19 04:56:45 sebastian Exp $
+ * @version CVS: $Id: TestRunner.php,v 1.82 2006/02/25 08:30:47 sebastian Exp $
* @link http://pear.php.net/package/PHPUnit2
* @since File available since Release 2.0.0
*/
@@ -147,16 +147,16 @@
*/
protected function start(Array $arguments)
{
- $syntaxCheck = TRUE;
- $coverageDataFile = FALSE;
- $coverageHTMLFile = FALSE;
- $coverageTextFile = FALSE;
- $testdoxHTMLFile = FALSE;
- $testdoxTextFile = FALSE;
- $graphvizLogfile = FALSE;
- $tapLogfile = FALSE;
- $xmlLogfile = FALSE;
- $wait = FALSE;
+ $syntaxCheck = TRUE;
+ $coverageDataFile = FALSE;
+ $coverageHTMLDirectory = FALSE;
+ $coverageTextFile = FALSE;
+ $testdoxHTMLFile = FALSE;
+ $testdoxTextFile = FALSE;
+ $graphvizLogfile = FALSE;
+ $tapLogfile = FALSE;
+ $xmlLogfile = FALSE;
+ $wait = FALSE;
$possibleOptions = array(
'help',
@@ -204,7 +204,7 @@
break;
case '--coverage-html': {
- $coverageHTMLFile = $option[1];
+ $coverageHTMLDirectory = $option[1];
}
break;
@@ -333,7 +333,7 @@
return $this->doRun(
$this->getTest($test, $testFile),
$coverageDataFile,
- $coverageHTMLFile,
+ $coverageHTMLDirectory,
$coverageTextFile,
$testdoxHTMLFile,
$testdoxTextFile,
@@ -363,7 +363,7 @@
* @access public
* @static
*/
- public static function run($test, $coverageDataFile = FALSE, $coverageHTMLFile = FALSE,
$coverageTextFile = FALSE, $testdoxHTMLFile = FALSE, $testdoxTextFile = FALSE, $graphvizLogfile =
FALSE, $tapLogfile = FALSE, $xmlLogfile = FALSE, $wait = FALSE)
+ public static function run($test, $coverageDataFile = FALSE, $coverageHTMLDirectory = FALSE,
$coverageTextFile = FALSE, $testdoxHTMLFile = FALSE, $testdoxTextFile = FALSE, $graphvizLogfile =
FALSE, $tapLogfile = FALSE, $xmlLogfile = FALSE, $wait = FALSE)
{
if ($test instanceof ReflectionClass) {
$test = new PHPUnit2_Framework_TestSuite($test);
@@ -375,7 +375,7 @@
return $aTestRunner->doRun(
$test,
$coverageDataFile,
- $coverageHTMLFile,
+ $coverageHTMLDirectory,
$coverageTextFile,
$testdoxHTMLFile,
$testdoxTextFile,
@@ -422,7 +422,7 @@
/**
* @param PHPUnit2_Framework_Test $suite
* @param mixed $coverageDataFile
- * @param mixed $coverageHTMLFile
+ * @param mixed $coverageHTMLDirectory
* @param mixed $coverageTextFile
* @param mixed $testdoxHTMLFile
* @param mixed $testdoxTextFile
@@ -433,7 +433,7 @@
* @return PHPUnit2_Framework_TestResult
* @access public
*/
- public function doRun(PHPUnit2_Framework_Test $suite, $coverageDataFile = FALSE,
$coverageHTMLFile = FALSE, $coverageTextFile = FALSE, $testdoxHTMLFile = FALSE, $testdoxTextFile =
FALSE, $graphvizLogfile = FALSE, $tapLogfile = FALSE, $xmlLogfile = FALSE, $wait = FALSE)
+ public function doRun(PHPUnit2_Framework_Test $suite, $coverageDataFile = FALSE,
$coverageHTMLDirectory = FALSE, $coverageTextFile = FALSE, $testdoxHTMLFile = FALSE,
$testdoxTextFile = FALSE, $graphvizLogfile = FALSE, $tapLogfile = FALSE, $xmlLogfile = FALSE, $wait
= FALSE)
{
$result = $this->createTestResult();
@@ -486,7 +486,7 @@
}
if ($coverageDataFile !== FALSE ||
- $coverageHTMLFile !== FALSE ||
+ $coverageHTMLDirectory !== FALSE ||
$coverageTextFile !== FALSE) {
$result->collectCodeCoverageInformation(TRUE);
}
@@ -502,7 +502,7 @@
$this->handleCodeCoverageInformation(
$result,
$coverageDataFile,
- $coverageHTMLFile,
+ $coverageHTMLDirectory,
$coverageTextFile
);
@@ -528,12 +528,12 @@
/**
* @param PHPUnit2_Framework_TestResult $result
* @param mixed $coverageDataFile
- * @param mixed $coverageHTMLFile
+ * @param mixed $coverageHTMLDirectory
* @param mixed $coverageTextFile
* @access protected
* @since Method available since Release 2.1.0
*/
- protected function handleCodeCoverageInformation(PHPUnit2_Framework_TestResult $result,
$coverageDataFile, $coverageHTMLFile, $coverageTextFile)
+ protected function handleCodeCoverageInformation(PHPUnit2_Framework_TestResult $result,
$coverageDataFile, $coverageHTMLDirectory, $coverageTextFile)
{
if ($coverageDataFile !== FALSE &&
$fp = fopen($coverageDataFile, 'w')) {
@@ -541,14 +541,14 @@
fclose($fp);
}
- if ($coverageHTMLFile !== FALSE || $coverageTextFile !== FALSE) {
- if ($coverageHTMLFile !== FALSE) {
+ if ($coverageHTMLDirectory !== FALSE || $coverageTextFile !== FALSE) {
+ if ($coverageHTMLDirectory !== FALSE) {
$renderer = PHPUnit2_Util_CodeCoverage_Renderer::factory(
'HTML',
$result->getCodeCoverageInformation()
);
- $renderer->renderToFile($coverageHTMLFile);
+ $renderer->render($coverageHTMLDirectory);
}
if ($coverageTextFile !== FALSE) {
@@ -557,7 +557,7 @@
$result->getCodeCoverageInformation()
);
- $renderer->renderToFile($coverageTextFile);
+ $renderer->render($coverageTextFile);
}
}
}
@@ -583,7 +583,7 @@
if (extension_loaded('xdebug')) {
print " --coverage-data <file> Write Code Coverage data in raw format to
file.\n" .
- " --coverage-html <file> Write Code Coverage data in HTML format to
file.\n" .
+ " --coverage-html <dir> Write Code Coverage data in HTML format to
directory.\n" .
" --coverage-text <file> Write Code Coverage data in text format to
file.\n\n";
}