cvs: pear /PHPUnit package.xml /PHPUnit/Extensions/Logger XML.php /PHPUnit/TextUI ResultPrinter.php TestRunner.php

sebastian Sun Jan 18 03:36:38 2004 EDT Modified files: /pear/PHPUnit package.xml /pear/PHPUnit/Extensions/Logger XML.php /pear/PHPUnit/TextUI ResultPrinter.php TestRunner.php Log: Make dependencies on Benchmark/Time and XML/Tree optional. Index: pear/PHPUnit/package.xml diff -u pear/PHPUnit/package.xml:1.56 pear/PHPUnit/package.xml:1.57 --- pear/PHPUnit/package.xml:1.56 Sun Jan 4 05:54:56 2004 +++ pear/PHPUnit/package.xml Sun Jan 18 03:36:36 2004 @@ -122,10 +122,10 @@ </filelist> <deps> <dep type="php" rel="ge" version="5" /> - <dep type="pkg" rel="has">Benchmark</dep> - <dep optional="yes" type="pkg" rel="has">Log</dep> - <dep optional="yes" type="pkg" rel="has">Xdebug_CodeCoverage</dep> - <dep optional="yes" type="pkg" rel="has">XML_Tree</dep> + <dep type="ext" rel="has" optional="yes">xml</dep> + <dep type="pkg" rel="has" optional="yes">Benchmark</dep> + <dep type="pkg" rel="has" optional="yes">Log</dep> + <dep type="pkg" rel="has" optional="yes">XML_Tree</dep> </deps> </release> </package> Index: pear/PHPUnit/Extensions/Logger/XML.php diff -u pear/PHPUnit/Extensions/Logger/XML.php:1.9 pear/PHPUnit/Extensions/Logger/XML.php:1.10 --- pear/PHPUnit/Extensions/Logger/XML.php:1.9 Tue Jan 6 16:11:02 2004 +++ pear/PHPUnit/Extensions/Logger/XML.php Sun Jan 18 03:36:37 2004 @@ -12,14 +12,14 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: XML.php,v 1.9 2004/01/06 21:11:02 sebastian Exp $ +// $Id: XML.php,v 1.10 2004/01/18 08:36:37 sebastian Exp $ // require_once 'PHPUnit/Framework/TestFailure.php'; require_once 'PHPUnit/Framework/TestListener.php'; require_once 'PHPUnit/Framework/TestResult.php'; -require_once 'XML/Tree.php'; +@include_once 'XML/Tree.php'; /** * A TestListener that generates an XML-based logfile Index: pear/PHPUnit/TextUI/ResultPrinter.php diff -u pear/PHPUnit/TextUI/ResultPrinter.php:1.18 pear/PHPUnit/TextUI/ResultPrinter.php:1.19 --- pear/PHPUnit/TextUI/ResultPrinter.php:1.18 Sun Jan 4 05:43:28 2004 +++ pear/PHPUnit/TextUI/ResultPrinter.php Sun Jan 18 03:36:38 2004 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: ResultPrinter.php,v 1.18 2004/01/04 10:43:28 sebastian Exp $ +// $Id: ResultPrinter.php,v 1.19 2004/01/18 08:36:38 sebastian Exp $ // require_once 'PHPUnit/Framework/TestFailure.php'; @@ -69,15 +69,15 @@ } // }}} - // {{{ public function printResult(PHPUnit_Framework_TestResult $result, $runTime) + // {{{ public function printResult(PHPUnit_Framework_TestResult $result, $timeElapsed) /** * @param PHPUnit_Framework_TestResult $result * @param float $runTime * @access public */ - public function printResult(PHPUnit_Framework_TestResult $result, $runTime) { - $this->printHeader($runTime); + public function printResult(PHPUnit_Framework_TestResult $result, $timeElapsed) { + $this->printHeader($timeElapsed); $this->printErrors($result); $this->printFailures($result); $this->printFooter($result); @@ -196,20 +196,22 @@ } // }}} - // {{{ protected function printHeader($runTime) + // {{{ protected function printHeader($timeElapsed) /** - * @param float $runTime + * @param float $timeElapsed * @access protected */ - protected function printHeader($runTime) { - $this->write( - sprintf( - "\n\nTime: %s\n", + protected function printHeader($timeElapsed) { + if ($timeElapsed) { + $this->write( + sprintf( + "\n\nTime: %s\n", - $runTime - ) - ); + $timeElapsed + ) + ); + } } // }}} Index: pear/PHPUnit/TextUI/TestRunner.php diff -u pear/PHPUnit/TextUI/TestRunner.php:1.9 pear/PHPUnit/TextUI/TestRunner.php:1.10 --- pear/PHPUnit/TextUI/TestRunner.php:1.9 Sun Jan 4 11:44:09 2004 +++ pear/PHPUnit/TextUI/TestRunner.php Sun Jan 18 03:36:38 2004 @@ -12,14 +12,13 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: TestRunner.php,v 1.9 2004/01/04 16:44:09 sebastian Exp $ +// $Id: TestRunner.php,v 1.10 2004/01/18 08:36:38 sebastian Exp $ // if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_TestRunner::main'); } -require_once 'Benchmark/Timer.php'; require_once 'Console/Getopt.php'; require_once 'PHPUnit/Extensions/Logger/XML.php'; require_once 'PHPUnit/Framework/Test.php'; @@ -27,7 +26,7 @@ require_once 'PHPUnit/Runner/BaseTestRunner.php'; require_once 'PHPUnit/Runner/Version.php'; require_once 'PHPUnit/TextUI/ResultPrinter.php'; -@include_once 'Xdebug/CodeCoverage.php'; +@include_once 'Benchmark/Timer.php'; /** * A TestRunner for the Command Line Interface (CLI) @@ -203,7 +202,10 @@ public function doRun(PHPUnit_Framework_Test $suite, $txtLogfile = false, $xmlLogfile = false, $wait = false) { $result = $this->createTestResult(); - $timer = new Benchmark_Timer; + + if (class_exists('Benchmark_Timer')) { + $timer = new Benchmark_Timer; + } $result->addListener($this->printer); @@ -211,17 +213,27 @@ // XXX: NOT YET IMPLEMENTED } - if ($xmlLogfile && + if (class_exists('XML_Tree') && + $xmlLogfile && $xmlLogfileFP = fopen($xmlLogfile, 'w')) { $result->addListener(new PHPUnit_Extensions_Logger_XML($xmlLogfileFP)); } - $timer->start(); + if (isset($timer)) { + $timer->start(); + } + $suite->run($result); - $timer->stop(); - $this->pause($wait); - $this->printer->printResult($result, $timer->timeElapsed()); + if (isset($timer)) { + $timer->stop(); + $timeElapsed = $timer->timeElapsed(); + } else { + $timeElapsed = false; + } + + $this->pause($wait); + $this->printer->printResult($result, $timeElapsed); return $result; }