Author: Sebastian Bergmann Date: 2006-08-29 13:40:09 +0200 (Tue, 29 Aug 2006) New Revision: 3416
Log: Consistently use PHPUnit_Util_Filter::addFileToFilter(). Modified: trunk/UnitTest/src/constraint/image.php trunk/UnitTest/src/runtests.php trunk/UnitTest/src/test/database_settings.php trunk/UnitTest/src/test/printer.php trunk/UnitTest/src/test/runner.php trunk/UnitTest/src/test/settings.php trunk/UnitTest/src/test/suite.php trunk/UnitTest/src/test_autoload.php Modified: trunk/UnitTest/src/constraint/image.php =================================================================== --- trunk/UnitTest/src/constraint/image.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/constraint/image.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -7,6 +7,11 @@ * @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved. * @license http://ez.no/licenses/new_bsd New BSD License */ + +require_once 'PHPUnit/Util/Filter.php'; + +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + /** * Class to test if images are similar * Modified: trunk/UnitTest/src/runtests.php =================================================================== --- trunk/UnitTest/src/runtests.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/runtests.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -1,4 +1,8 @@ <?php +require_once 'PHPUnit/Util/Filter.php'; + +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + // All errors must be reported error_reporting( E_ALL | E_STRICT ); require_once("Base/src/base.php"); @@ -16,9 +20,5 @@ ezcBase::autoload( $className ); } -// Remove this file name from the assertion trace. -require_once 'PHPUnit/Util/Filter.php'; -PHPUnit_Util_Filter::addFileToFilter(__FILE__); - ezcTestRunner::main(); ?> Modified: trunk/UnitTest/src/test/database_settings.php =================================================================== --- trunk/UnitTest/src/test/database_settings.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test/database_settings.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -1,5 +1,4 @@ <?php - /** * File containing the ezcTestDatabaseSettings class * @@ -8,6 +7,11 @@ * @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved. * @license http://ez.no/licenses/new_bsd New BSD License */ + +require_once 'PHPUnit/Util/Filter.php'; + +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + /** * This class represents the structure of all the database settings. * @@ -36,5 +40,4 @@ public $database; } - ?> Modified: trunk/UnitTest/src/test/printer.php =================================================================== --- trunk/UnitTest/src/test/printer.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test/printer.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -1,6 +1,9 @@ <?php require_once 'PHPUnit/TextUI/ResultPrinter.php'; +require_once 'PHPUnit/Util/Filter.php'; +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + class ezcTestPrinter extends PHPUnit_TextUI_ResultPrinter { /** Modified: trunk/UnitTest/src/test/runner.php =================================================================== --- trunk/UnitTest/src/test/runner.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test/runner.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -2,6 +2,8 @@ require_once 'PHPUnit/TextUI/TestRunner.php'; require_once 'PHPUnit/Util/Filter.php'; +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + class ezcTestRunner extends PHPUnit_TextUI_TestRunner { const SUITE_FILENAME = "tests/suite.php"; @@ -11,10 +13,6 @@ // Call this method only once? $printer = new ezcTestPrinter(); $this->setPrinter( $printer ); - - // Remove this file name from the assertion trace. - // (Displayed when a test fails) - PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); } /** Modified: trunk/UnitTest/src/test/settings.php =================================================================== --- trunk/UnitTest/src/test/settings.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test/settings.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -7,6 +7,11 @@ * @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved. * @license http://ez.no/licenses/new_bsd New BSD License */ + +require_once 'PHPUnit/Util/Filter.php'; + +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + /** * This object stores the settings from the TestRunner. Every TestCase can get * the instance of this object, and access the settings. Modified: trunk/UnitTest/src/test/suite.php =================================================================== --- trunk/UnitTest/src/test/suite.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test/suite.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -1,6 +1,9 @@ <?php require_once 'PHPUnit/Framework/TestSuite.php'; +require_once 'PHPUnit/Util/Filter.php'; +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); + class ezcTestSuite extends PHPUnit_Framework_TestSuite { protected static $depth = 0; @@ -14,7 +17,6 @@ parent::__construct( $theClass, $name ); } - public function run( PHPUnit_Framework_TestResult $result = NULL ) { print ( "\n" ); @@ -29,6 +31,5 @@ ezcTestSuite::$depth--; } - } ?> Modified: trunk/UnitTest/src/test_autoload.php =================================================================== --- trunk/UnitTest/src/test_autoload.php 2006-08-29 09:44:13 UTC (rev 3415) +++ trunk/UnitTest/src/test_autoload.php 2006-08-29 11:40:09 UTC (rev 3416) @@ -1,5 +1,7 @@ <?php +require_once 'PHPUnit/Util/Filter.php'; +PHPUnit_Util_Filter::addFileToFilter( __FILE__ ); return array ( "ezcTestRunner" => "UnitTest/test/runner.php", @@ -13,7 +15,4 @@ "ezcTestSettings" => "UnitTest/test/settings.php", "ezcTestDatabaseSettings" => "UnitTest/test/database_settings.php" ); - - - ?> -- svn-components mailing list [email protected] http://lists.ez.no/mailman/listinfo/svn-components
