Author: Sebastian Bergmann
Date: 2006-08-29 13:58:45 +0200 (Tue, 29 Aug 2006)
New Revision: 3417
Log:
PHPUnit_Util_Filter::addFileToFilter() -> ezcTestRunner::addFileToFilter()
Modified:
trunk/Archive/tests/archive_test_case.php
trunk/Archive/tests/testdata.php
trunk/Base/tests/test_repository/TestClasses/base_test_class.php
trunk/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
trunk/Base/tests/test_repository/autoload_files/basetest_autoload.php
trunk/Base/tests/test_repository/autoload_files/object_autoload.php
trunk/Base/tests/test_repository/object/object.php
trunk/Cache/tests/storage_test.php
trunk/DatabaseSchema/tests/testfiles/broken_schema.php
trunk/ImageConversion/tests/handler_test.php
trunk/ImageConversion/tests/test_case.php
trunk/PersistentObject/tests/data/manual_generator_test.php
trunk/PersistentObject/tests/data/manualgeneratortest.php
trunk/PersistentObject/tests/data/persistent_test_object.php
trunk/PersistentObject/tests/data/persistenttestobject.php
trunk/PersistentObject/tests/managers/data/simpledefinition.php
trunk/PersistentObject/tests/managers/data2/myclass.php
trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php
trunk/Template/tests/compiled/full-14862b79ceaf01443626bd5d564c53e2.php
trunk/Template/tests/custom_blocks/brainfuck.php
trunk/Template/tests/custom_blocks/testblocks.php
trunk/Template/tests/invariant_parse_cursor.php
trunk/UnitTest/src/constraint/image.php
trunk/UnitTest/src/runtests.php
trunk/UnitTest/src/test/case.php
trunk/UnitTest/src/test/database_settings.php
trunk/UnitTest/src/test/image_case.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/Archive/tests/archive_test_case.php
===================================================================
--- trunk/Archive/tests/archive_test_case.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/Archive/tests/archive_test_case.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
abstract class ezcArchiveTestCase extends ezcTestCase
{
Modified: trunk/Archive/tests/testdata.php
===================================================================
--- trunk/Archive/tests/testdata.php 2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Archive/tests/testdata.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class ezcArchiveTestData
{
Modified: trunk/Base/tests/test_repository/TestClasses/base_test_class.php
===================================================================
--- trunk/Base/tests/test_repository/TestClasses/base_test_class.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Base/tests/test_repository/TestClasses/base_test_class.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class trBasetestClass {
}
Modified:
trunk/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
===================================================================
--- trunk/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Base/tests/test_repository/TestClasses/base_test_class_number_two.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class trBasetestClass2 {
}
Modified: trunk/Base/tests/test_repository/autoload_files/basetest_autoload.php
===================================================================
--- trunk/Base/tests/test_repository/autoload_files/basetest_autoload.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Base/tests/test_repository/autoload_files/basetest_autoload.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
return array(
'trBasetestClass' => 'TestClasses/base_test_class.php',
Modified: trunk/Base/tests/test_repository/autoload_files/object_autoload.php
===================================================================
--- trunk/Base/tests/test_repository/autoload_files/object_autoload.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Base/tests/test_repository/autoload_files/object_autoload.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
return array(
'Object' => 'object/object.php',
Modified: trunk/Base/tests/test_repository/object/object.php
===================================================================
--- trunk/Base/tests/test_repository/object/object.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/Base/tests/test_repository/object/object.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class Object{
}
Modified: trunk/Cache/tests/storage_test.php
===================================================================
--- trunk/Cache/tests/storage_test.php 2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Cache/tests/storage_test.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -9,8 +9,7 @@
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
* Abstract base test class for ezcCacheStorage tests.
Modified: trunk/DatabaseSchema/tests/testfiles/broken_schema.php
===================================================================
--- trunk/DatabaseSchema/tests/testfiles/broken_schema.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/DatabaseSchema/tests/testfiles/broken_schema.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
return array();
?>
Modified: trunk/ImageConversion/tests/handler_test.php
===================================================================
--- trunk/ImageConversion/tests/handler_test.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/ImageConversion/tests/handler_test.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -8,8 +8,7 @@
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
* Test suite for ImageHandler class.
Modified: trunk/ImageConversion/tests/test_case.php
===================================================================
--- trunk/ImageConversion/tests/test_case.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/ImageConversion/tests/test_case.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class ezcImageConversionTestCase extends ezcImageTestCase
{
Modified: trunk/PersistentObject/tests/data/manual_generator_test.php
===================================================================
--- trunk/PersistentObject/tests/data/manual_generator_test.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/data/manual_generator_test.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
CREATE TABLE PO_test
Modified: trunk/PersistentObject/tests/data/manualgeneratortest.php
===================================================================
--- trunk/PersistentObject/tests/data/manualgeneratortest.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/data/manualgeneratortest.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/*
* Holds the definition for PersistentTestObject
Modified: trunk/PersistentObject/tests/data/persistent_test_object.php
===================================================================
--- trunk/PersistentObject/tests/data/persistent_test_object.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/data/persistent_test_object.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
CREATE TABLE PO_test
Modified: trunk/PersistentObject/tests/data/persistenttestobject.php
===================================================================
--- trunk/PersistentObject/tests/data/persistenttestobject.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/data/persistenttestobject.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/*
* Holds the definition for PersistentTestObject
Modified: trunk/PersistentObject/tests/managers/data/simpledefinition.php
===================================================================
--- trunk/PersistentObject/tests/managers/data/simpledefinition.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/managers/data/simpledefinition.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
return new ezcPersistentObjectDefinition();
?>
Modified: trunk/PersistentObject/tests/managers/data2/myclass.php
===================================================================
--- trunk/PersistentObject/tests/managers/data2/myclass.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/PersistentObject/tests/managers/data2/myclass.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
$def = new ezcPersistentObjectDefinition();
$def->class = 'MyClass';
Modified: trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php
===================================================================
--- trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php 2006-08-29
11:40:09 UTC (rev 3416)
+++ trunk/PersistentObjectDatabaseSchemaTiein/tests/data.php 2006-08-29
11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
$res["testNoParameters"] = '[34;1meZ components PersistentObject definition
generator[0m[m
[0m[0m[0m[m
Modified:
trunk/Template/tests/compiled/full-14862b79ceaf01443626bd5d564c53e2.php
===================================================================
--- trunk/Template/tests/compiled/full-14862b79ceaf01443626bd5d564c53e2.php
2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/Template/tests/compiled/full-14862b79ceaf01443626bd5d564c53e2.php
2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
// Dummy PHP file for compiled code test
?>
Modified: trunk/Template/tests/custom_blocks/brainfuck.php
===================================================================
--- trunk/Template/tests/custom_blocks/brainfuck.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/Template/tests/custom_blocks/brainfuck.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
* PHP Brainf*ck compiler
Modified: trunk/Template/tests/custom_blocks/testblocks.php
===================================================================
--- trunk/Template/tests/custom_blocks/testblocks.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/Template/tests/custom_blocks/testblocks.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
class TestBlocks implements ezcTemplateCustomBlock, ezcTemplateCustomFunction
{
Modified: trunk/Template/tests/invariant_parse_cursor.php
===================================================================
--- trunk/Template/tests/invariant_parse_cursor.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/Template/tests/invariant_parse_cursor.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -1,6 +1,5 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+ezcTestRunner::addFileToFilter( __FILE__ );
/**
* @copyright Copyright (C) 2005, 2006 eZ systems as. All rights reserved.
Modified: trunk/UnitTest/src/constraint/image.php
===================================================================
--- trunk/UnitTest/src/constraint/image.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/UnitTest/src/constraint/image.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -8,10 +8,8 @@
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-require_once 'PHPUnit/Util/Filter.php';
+ezcTestRunner::addFileToFilter( __FILE__ );
-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 11:40:09 UTC (rev 3416)
+++ trunk/UnitTest/src/runtests.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,8 +1,4 @@
<?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");
@@ -20,5 +16,6 @@
ezcBase::autoload( $className );
}
+ezcTestRunner::addFileToFilter( __FILE__ );
ezcTestRunner::main();
?>
Modified: trunk/UnitTest/src/test/case.php
===================================================================
--- trunk/UnitTest/src/test/case.php 2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/UnitTest/src/test/case.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,8 +1,7 @@
<?php
require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
+ezcTestRunner::addFileToFilter( __FILE__ );
abstract class ezcTestCase extends PHPUnit_Framework_TestCase
{
Modified: trunk/UnitTest/src/test/database_settings.php
===================================================================
--- trunk/UnitTest/src/test/database_settings.php 2006-08-29 11:40:09 UTC
(rev 3416)
+++ trunk/UnitTest/src/test/database_settings.php 2006-08-29 11:58:45 UTC
(rev 3417)
@@ -8,10 +8,8 @@
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-require_once 'PHPUnit/Util/Filter.php';
+ezcTestRunner::addFileToFilter( __FILE__ );
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
-
/**
* This class represents the structure of all the database settings.
*
Modified: trunk/UnitTest/src/test/image_case.php
===================================================================
--- trunk/UnitTest/src/test/image_case.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/UnitTest/src/test/image_case.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -1,8 +1,7 @@
<?php
require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
+ezcTestRunner::addFileToFilter( __FILE__ );
abstract class ezcImageTestCase extends ezcTestCase
{
Modified: trunk/UnitTest/src/test/printer.php
===================================================================
--- trunk/UnitTest/src/test/printer.php 2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/UnitTest/src/test/printer.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,8 +1,7 @@
<?php
require_once 'PHPUnit/TextUI/ResultPrinter.php';
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
+ezcTestRunner::addFileToFilter( __FILE__ );
class ezcTestPrinter extends PHPUnit_TextUI_ResultPrinter
{
Modified: trunk/UnitTest/src/test/runner.php
===================================================================
--- trunk/UnitTest/src/test/runner.php 2006-08-29 11:40:09 UTC (rev 3416)
+++ trunk/UnitTest/src/test/runner.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -2,8 +2,6 @@
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";
@@ -413,5 +411,12 @@
print( "For example: mysql://root:[EMAIL PROTECTED]/unittests\n\n" );
exit();
}
+
+ public static function addFileToFilter( $filename, $group = 'DEFAULT' )
+ {
+ PHPUnit_Util_Filter::addFileToFilter( $filename, $group );
+ }
}
+
+ezcTestRunner::addFileToFilter( __FILE__ );
?>
Modified: trunk/UnitTest/src/test/settings.php
===================================================================
--- trunk/UnitTest/src/test/settings.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/UnitTest/src/test/settings.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -8,10 +8,8 @@
* @license http://ez.no/licenses/new_bsd New BSD License
*/
-require_once 'PHPUnit/Util/Filter.php';
+ezcTestRunner::addFileToFilter( __FILE__ );
-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 11:40:09 UTC (rev 3416)
+++ trunk/UnitTest/src/test/suite.php 2006-08-29 11:58:45 UTC (rev 3417)
@@ -1,22 +1,12 @@
<?php
require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/Util/Filter.php';
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
+ezcTestRunner::addFileToFilter( __FILE__ );
class ezcTestSuite extends PHPUnit_Framework_TestSuite
{
protected static $depth = 0;
- public function __construct( $theClass = '', $name = '' )
- {
- // Remove this file name from the assertion trace.
- // (Displayed when a test fails)
- PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
-
- parent::__construct( $theClass, $name );
- }
-
public function run( PHPUnit_Framework_TestResult $result = NULL )
{
print ( "\n" );
Modified: trunk/UnitTest/src/test_autoload.php
===================================================================
--- trunk/UnitTest/src/test_autoload.php 2006-08-29 11:40:09 UTC (rev
3416)
+++ trunk/UnitTest/src/test_autoload.php 2006-08-29 11:58:45 UTC (rev
3417)
@@ -1,8 +1,4 @@
<?php
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter( __FILE__ );
-
return array (
"ezcTestRunner" => "UnitTest/test/runner.php",
"ezcTestCase" => "UnitTest/test/case.php",
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
