cvs: pear /PHPUnit2 package.xml /PHPUnit2/Framework TestCase.php /PHPUnit2/TextUI TestRunner.php

sebastian Tue Apr 5 07:23:44 2005 EDT Modified files: /pear/PHPUnit2 package.xml /pear/PHPUnit2/Framework TestCase.php /pear/PHPUnit2/TextUI TestRunner.php Log: No longer collect Coverage information by default. http://cvs.php.net/diff.php/pear/PHPUnit2/package.xml?r1=1.89&r2=1.90&ty=u Index: pear/PHPUnit2/package.xml diff -u pear/PHPUnit2/package.xml:1.89 pear/PHPUnit2/package.xml:1.90 --- pear/PHPUnit2/package.xml:1.89 Tue Apr 5 05:05:26 2005 +++ pear/PHPUnit2/package.xml Tue Apr 5 07:23:41 2005 @@ -24,6 +24,8 @@ * PHPUnit2_Util_Skeleton now generates stubs for the setUp() and tearDown() methods. +* PHPUnit2_Framework_TestCase no longer collects Code Coverage information by default (when the Xdebug extension is available). PHPUnit2_Framework_TestCase::$generateCodeCoverageInformation has to be set to TRUE to collect Code Coverage information. + * Moved tests outside of installation directory. ! PHP 5.1.0 (or greater) is now required. http://cvs.php.net/diff.php/pear/PHPUnit2/Framework/TestCase.php?r1=1.22&r2=1.23&ty=u Index: pear/PHPUnit2/Framework/TestCase.php diff -u pear/PHPUnit2/Framework/TestCase.php:1.22 pear/PHPUnit2/Framework/TestCase.php:1.23 --- pear/PHPUnit2/Framework/TestCase.php:1.22 Fri Feb 4 05:01:35 2005 +++ pear/PHPUnit2/Framework/TestCase.php Tue Apr 5 07:23:43 2005 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: TestCase.php,v 1.22 2005/02/04 10:01:35 sebastian Exp $ +// $Id: TestCase.php,v 1.23 2005/04/05 11:23:43 sebastian Exp $ // require_once 'PHPUnit2/Framework/Assert.php'; @@ -77,6 +77,16 @@ * @abstract */ abstract class PHPUnit2_Framework_TestCase extends PHPUnit2_Framework_Assert implements PHPUnit2_Framework_Test { + // {{{ Class Variables + + /** + * @var boolean + * @access public + * @static + */ + public static $generateCodeCoverageInformation = FALSE; + + // }}} // {{{ Instance Variables /** @@ -252,13 +262,15 @@ PHPUnit2_Util_Filter::addFileToFilter($class->getFileName()); - if (extension_loaded('xdebug')) { + $useXdebug = (extension_loaded('xdebug') && self::$generateCodeCoverageInformation); + + if ($useXdebug) { xdebug_start_code_coverage(XDEBUG_CC_UNUSED); } $method->invoke($this); - if (extension_loaded('xdebug')) { + if ($useXdebug) { $this->codeCoverageInformation = PHPUnit2_Util_Filter::getFilteredCodeCoverage( xdebug_get_code_coverage() ); http://cvs.php.net/diff.php/pear/PHPUnit2/TextUI/TestRunner.php?r1=1.50&r2=1.51&ty=u Index: pear/PHPUnit2/TextUI/TestRunner.php diff -u pear/PHPUnit2/TextUI/TestRunner.php:1.50 pear/PHPUnit2/TextUI/TestRunner.php:1.51 --- pear/PHPUnit2/TextUI/TestRunner.php:1.50 Fri Feb 25 01:58:09 2005 +++ pear/PHPUnit2/TextUI/TestRunner.php Tue Apr 5 07:23:43 2005 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: TestRunner.php,v 1.50 2005/02/25 06:58:09 sebastian Exp $ +// $Id: TestRunner.php,v 1.51 2005/04/05 11:23:43 sebastian Exp $ // if (!defined('PHPUnit2_MAIN_METHOD')) { @@ -408,6 +408,12 @@ ); } + if ($coverageDataFile !== FALSE || + $coverageHTMLFile !== FALSE || + $coverageTextFile !== FALSE) { + PHPUnit2_Framework_TestCase::$generateCodeCoverageInformation = TRUE; + } + $timer->start(); $suite->run($result); $timer->stop();