For as long as I have been involved in this project I have been saying that the custom test runner is an unnecessary level of indirection that does not add any real benefit over the out-of-the-box test runner of PHPUnit. At least not anymore.
In its current state, the test suite does not work with PHPUnit 3.6 because the custom test runner uses internal APIs of PHPUnit and PHP_CodeCoverage that have changed. We should seize this "opportunity" to refactor the test suite and get rid off the custom test runner. This will not only prevent the necessity of large test suite refactoring when a new version of PHPUnit comes out but also provides instant and effortless access to new PHPUnit features. Today I started to work on this. Already I am able to run the Workflow* test suites with the out-of-the-box test runner of PHPUnit 3.6. The configuration of the database connection is handled via the phpunit.xml configuration file. Unfortunately we are still using a legacy version control system for the Zeta Components project that does not allow the easy and instant creation of branches. This is why I will refrain from committing my work to the repository for now. Please find attached a patch that shows what I am currently working on. I hope to find the time over the next couple of days-weeks to add the test suites of each component to the XML configuration file. Some test suites (Database, Template, ...) will require modifications so this is not as simple as I make it sound. -- Sebastian Bergmann Co-Founder and Principal Consultant http://sebastian-bergmann.de/ http://thePHP.cc/
Index: WorkflowDatabaseTiein/tests/suite.php =================================================================== --- WorkflowDatabaseTiein/tests/suite.php (revision 1175712) +++ WorkflowDatabaseTiein/tests/suite.php (working copy) @@ -1,52 +0,0 @@ -<?php -/** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package WorkflowDatabaseTiein - * @subpackage Tests - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ - -require_once 'definition_test.php'; -require_once 'execution_test.php'; -require_once 'options_test.php'; - -/** - * @package WorkflowDatabaseTiein - * @subpackage Tests - */ -class ezcWorkflowDatabaseTieinSuite extends PHPUnit_Framework_TestSuite -{ - public function __construct() - { - parent::__construct(); - $this->setName( 'WorkflowDatabaseTiein' ); - - $this->addTest( ezcWorkflowDatabaseTieinDefinitionTest::suite() ); - $this->addTest( ezcWorkflowDatabaseTieinExecutionTest::suite() ); - $this->addTest( ezcWorkflowDatabaseTieinOptionsTest::suite() ); - } - - public static function suite() - { - return new ezcWorkflowDatabaseTieinSuite; - } -} -?> Index: WorkflowDatabaseTiein/tests/case.php =================================================================== --- WorkflowDatabaseTiein/tests/case.php (revision 1175712) +++ WorkflowDatabaseTiein/tests/case.php (working copy) @@ -41,7 +41,7 @@ try { - $this->db = ezcDbInstance::get(); + $this->db = ezcDbFactory::create( ZETA_TESTSUITE_DSN ); $this->cleanupTables( $this->db ); Index: phpunit.xml.dist =================================================================== --- phpunit.xml.dist (revision 0) +++ phpunit.xml.dist (revision 0) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<phpunit bootstrap="bootstrap.php" + verbose="true" + backupGlobals="true" + backupStaticAttributes="false" + convertErrorsToExceptions="true" + convertNoticesToExceptions="false" + convertWarningsToExceptions="false"> + <testsuites> + <testsuite name="Zeta Components"> + <testsuite name="Workflow"> + <directory suffix="_test.php">Workflow/tests</directory> + </testsuite> + + <testsuite name="WorkflowDatabaseTiein"> + <directory suffix="_test.php">WorkflowDatabaseTiein/tests</directory> + </testsuite> + + <testsuite name="WorkflowEventLogTiein"> + <directory suffix="_test.php">WorkflowEventLogTiein/tests</directory> + </testsuite> + + <testsuite name="WorkflowSignalSlotTiein"> + <directory suffix="_test.php">WorkflowSignalSlotTiein/tests</directory> + </testsuite> + </testsuite> + </testsuites> + + <filter> + <whitelist addUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">Workflow/src</directory> + <directory suffix=".php">WorkflowDatabaseTiein/src</directory> + <directory suffix=".php">WorkflowEventLogTiein/src</directory> + <directory suffix=".php">WorkflowSignalSlotTiein/src</directory> + + <exclude> + <file>Workflow/src/workflow_autoload.php</file> + <file>WorkflowDatabaseTiein/src/workflow_database_autoload.php</file> + <file>WorkflowEventLogTiein/src/workflow_event_autoload.php</file> + <file>WorkflowSignalSlotTiein/src/workflow_signal_autoload.php</file> + </exclude> + </whitelist> + </filter> + + <php> + <const name="ZETA_TESTSUITE_DSN" value="sqlite://:memory:"/> + </php> +</phpunit> Index: WorkflowSignalSlotTiein/tests/suite.php =================================================================== --- WorkflowSignalSlotTiein/tests/suite.php (revision 1175712) +++ WorkflowSignalSlotTiein/tests/suite.php (working copy) @@ -1,48 +0,0 @@ -<?php -/** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package WorkflowSignalSlotTiein - * @subpackage Tests - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ - -require_once 'plugin_test.php'; - -/** - * @package WorkflowSignalSlotTiein - * @subpackage Tests - */ -class ezcWorkflowSignalSlotTieinSuite extends PHPUnit_Framework_TestSuite -{ - public function __construct() - { - parent::__construct(); - $this->setName( 'WorkflowSignalSlotTiein' ); - - $this->addTest( ezcWorkflowSignalSlotTieinPluginTest::suite() ); - } - - public static function suite() - { - return new ezcWorkflowSignalSlotTieinSuite; - } -} -?> Index: bootstrap.php =================================================================== --- bootstrap.php (revision 1175712) +++ bootstrap.php (working copy) @@ -1,6 +1,6 @@ <?php /** - * File contaning the bootstrap script for the Zeta Components test runner. + * File contaning the bootstrap script for the Zeta Components test suite. * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,11 +19,9 @@ * specific language governing permissions and limitations * under the License. * - * @package UnitTest * @version //autogentag// * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); // All errors must be reported $currentErrorLevel = error_reporting(); @@ -33,7 +31,7 @@ die(); } -ini_set( 'include_path', getcwd(). PATH_SEPARATOR . dirname( __FILE__ ) . '/../..' . PATH_SEPARATOR . ini_get( 'include_path' ) ); +ini_set( 'include_path', getcwd() . PATH_SEPARATOR . ini_get( 'include_path' ) ); require_once 'Base/src/base.php'; Index: Workflow/tests/suite.php =================================================================== --- Workflow/tests/suite.php (revision 1175712) +++ Workflow/tests/suite.php (working copy) @@ -1,64 +0,0 @@ -<?php -/** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package Workflow - * @subpackage Tests - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ - -require_once 'definition_xml_test.php'; -require_once 'execution_test.php'; -require_once 'execution_listener_test.php'; -require_once 'execution_plugin_test.php'; -require_once 'execution_plugin_visualizer_test.php'; -require_once 'workflow_test.php'; -require_once 'node_test.php'; -require_once 'condition_test.php'; -require_once 'visitor_visualization_test.php'; - -/** - * @package Workflow - * @subpackage Tests - */ -class ezcWorkflowSuite extends PHPUnit_Framework_TestSuite -{ - public function __construct() - { - parent::__construct(); - $this->setName( 'Workflow' ); - - $this->addTest( ezcWorkflowDefinitionStorageXmlTest::suite() ); - $this->addTest( ezcWorkflowExecutionTest::suite() ); - $this->addTest( ezcWorkflowExecutionListenerTest::suite() ); - $this->addTest( ezcWorkflowExecutionPluginTest::suite() ); - $this->addTest( ezcWorkflowExecutionPluginVisualizerTest::suite() ); - $this->addTest( ezcWorkflowTest::suite() ); - $this->addTest( ezcWorkflowNodeTest::suite() ); - $this->addTest( ezcWorkflowConditionTest::suite() ); - $this->addTest( ezcWorkflowVisitorVisualizationTest::suite() ); - } - - public static function suite() - { - return new ezcWorkflowSuite; - } -} -?> Index: UnitTest/src/test/runner.php =================================================================== --- UnitTest/src/test/runner.php (revision 1175712) +++ UnitTest/src/test/runner.php (working copy) @@ -1,245 +0,0 @@ -<?php -/** - * File contaning the ezcTestRunner class. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -/** - * Test runner to run the Zeta Components test suite(s). - * - * @package UnitTest - * @version //autogentag// - */ -class ezcTestRunner extends PHPUnit_TextUI_Command -{ - const SUITE_FILENAME = 'tests/suite.php'; - - protected $arguments = array( - 'backupStaticAttributes' => false, - 'convertErrorsToExceptions' => true, - 'convertNoticesToExceptions' => false, - 'convertWarningsToExceptions' => false, - 'listGroups' => false, - 'loader' => null, - 'useDefaultConfiguration' => true - ); - - protected $release = 'trunk'; - - public function __construct() - { - $this->longOptions['dsn='] = 'handleDsn'; - $this->longOptions['release='] = 'handleRelease'; - } - - protected function handleCustomTestSuite() - { - $directory = getcwd(); - $packages = $this->options[1]; - - if ( isset( $this->arguments['coverageClover'] ) || - isset( $this->arguments['reportDirectory'] ) ) - { - $fillWhitelist = true; - } - else - { - $fillWhitelist = false; - } - - $this->arguments['test'] = new PHPUnit_Framework_TestSuite; - $this->arguments['test']->setName( 'Zeta Components' ); - - if ( empty( $packages ) ) - { - $packages = $this->getPackages( $directory ); - } - - foreach ( $packages as $package ) - { - $added = false; - $slashCount = substr_count( $package, DIRECTORY_SEPARATOR ); - - if ( ( $this->release == 'trunk' && $slashCount !== 0 ) || - ( $this->release == 'stable' && $slashCount > 1 ) ) - { - if ( file_exists( $package ) ) - { - PHPUnit_Util_Class::collectStart(); - require_once( $package ); - $class = PHPUnit_Util_Class::collectEnd(); - - if ( !empty( $class ) ) - { - $this->arguments['test']->addTest( call_user_func( array( array_pop( $class ), 'suite' ) ) ); - $added = true; - $package = substr($package, 0, strpos($package, DIRECTORY_SEPARATOR)); - } - else - { - die( "\n Cannot load: $package. \n" ); - } - } - } - else - { - $suite = $this->getTestSuite( $directory, $package ); - - if ( !is_null( $suite ) ) - { - $this->arguments['test']->addTest( $suite ); - $added = true; - } - } - - if ( $fillWhitelist && $added ) - { - foreach ( glob( $directory . '/' . $package . '/src/*_autoload.php' ) as $autoloadFile ) - { - foreach ( include $autoloadFile as $className => $fileName ) - { - if ( strpos($fileName, 'xmlwritersubstitute.php') === false ) - { - PHPUnit_Util_Filter::addFileToWhitelist( - $directory . '/' . str_replace( $package, $package . '/src', $fileName ) - ); - } - } - } - } - } - - if ( isset( $this->arguments['colors'] ) && $this->arguments['colors'] === true ) - { - $colors = true; - } - else - { - $colors = false; - } - - if ( isset( $this->arguments['debug'] ) && $this->arguments['debug'] === true ) - { - $debug = true; - } - else - { - $debug = false; - } - - if ( isset( $this->arguments['verbose'] ) && $this->arguments['verbose'] === true ) - { - $verbose = true; - } - else - { - $verbose = false; - } - - $this->arguments['printer'] = new ezcTestPrinter( NULL, $verbose, $colors, $debug ); - } - - protected function getPackages( $directory ) - { - $packages = array(); - - if ( is_dir( $directory ) ) - { - $entries = glob( $this->release == 'trunk' ? "$directory/*" : "$directory/*/*" ); - - foreach ( $entries as $entry ) - { - if ( $this->isPackageDir( $entry ) ) - { - $packages[] = str_replace( $directory . '/', '', $entry ); - } - } - } - - return $packages; - } - - protected function isPackageDir( $directory ) - { - if ( !is_dir( $directory ) || !file_exists( $directory . '/tests/suite.php' ) ) - { - return false; - } - - return true; - } - - protected function getTestSuite( $directory, $package ) - { - $suitePath = implode( '/', array( $directory, '..', $this->release, $package, self::SUITE_FILENAME ) ); - if ( file_exists( $suitePath ) ) - { - require_once( $suitePath ); - - if ( $this->release == 'stable' ) - { - $package = substr( $package, 0, strpos( $package, '/' ) ); - } - - $className = 'ezc'. $package . 'Suite'; - $suite = call_user_func( array( $className, 'suite' ) ); - - return $suite; - } - - return null; - } - - protected function handleDsn( $value ) - { - try - { - $ts = ezcTestSettings::getInstance(); - $settings = ezcDbFactory::parseDSN( $value ); - - $ts->db->value = $value; - - try - { - $ts->setDatabaseSettings( $settings ); - $db = ezcDbFactory::create( $settings ); - ezcDbInstance::set( $db ); - } - catch ( ezcDbException $e ) - { - die( $e->getMessage() ); - } - } - catch ( Exception $e ) - { - die( "Database initialization error: {$e->getMessage()}\n" ); - } - } - - protected function handleRelease( $value ) - { - $this->release = $value; - } -} -?> Index: UnitTest/src/test/case.php =================================================================== --- UnitTest/src/test/case.php (revision 1175712) +++ UnitTest/src/test/case.php (working copy) @@ -23,7 +23,6 @@ * @version //autogentag// * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); /** * Abstract base class for all Zeta Components test cases. Index: UnitTest/src/test/image_case.php =================================================================== --- UnitTest/src/test/image_case.php (revision 1175712) +++ UnitTest/src/test/image_case.php (working copy) @@ -23,7 +23,6 @@ * @version //autogentag// * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); /** * Abstract base class for image related test cases. Index: UnitTest/src/test/settings.php =================================================================== --- UnitTest/src/test/settings.php (revision 1175712) +++ UnitTest/src/test/settings.php (working copy) @@ -1,116 +0,0 @@ -<?php -/** - * File containing the ezcTestSettings class - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -/** - * This object stores the settings from the TestRunner. - * - * Every TestCase can get the instance of this object, and access the settings. - * - * @package UnitTest - * @version //autogentag// - */ -class ezcTestSettings -{ - /** - * Holds the properties - */ - private $properties = array(); - - /** - * Holds the one and only instance of this object. - */ - private static $instance = null; - - /** - * Use the getInstance() method instead to get an instance of this class. - */ - private function __construct() - { - $this->properties['db'] = new ezcTestDatabaseSettings; - } - - /** - * Returns an instance of this class. - */ - public static function getInstance() - { - if ( is_null( ezcTestSettings::$instance )) - { - ezcTestSettings::$instance = new ezcTestSettings(); - } - - return ezcTestSettings::$instance; - } - - /** - * No properties can be set. - * @ignore - */ - public function __set( $name, $value ) - { - switch ( $name ) - { - case 'db': - trigger_error( "Property: db is read-only", E_USER_ERROR ); - break; - } - } - - /** - * The db property can be read. - * @ignore - */ - public function __get( $name ) - { - switch ( $name ) - { - case 'db': - return $this->properties['db']; - default: - return parent::__get( $name ); - } - } - - /** - * Set all the database settings via a given settings array. - */ - public function setDatabaseSettings( $settings ) - { - $settingNames = array( - 'dsn', 'phptype', 'dbsyntax', 'username', 'password', 'protocol', - 'hostspec', 'port', 'socket', 'database' - ); - foreach ( $settingNames as $settingName ) - { - if ( isset( $settings[$settingName] ) ) - { - $this->properties['db']->$settingName = $settings[$settingName]; - } - } - } -} -?> Index: UnitTest/src/test/printer.php =================================================================== --- UnitTest/src/test/printer.php (revision 1175712) +++ UnitTest/src/test/printer.php (working copy) @@ -1,100 +0,0 @@ -<?php -/** - * File contaning the ezcTestPrinter class. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -/** - * Test printer class. - * - * @package UnitTest - * @version //autogentag// - */ -class ezcTestPrinter extends PHPUnit_TextUI_ResultPrinter -{ - protected $depth = 0; - protected $maxLength = 0; - - public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) - { - if ( $this->maxLength == 0 ) - { - $iterator = new RecursiveIteratorIterator( - new PHPUnit_Util_TestSuiteIterator( $suite ), - RecursiveIteratorIterator::SELF_FIRST - ); - - foreach ( $iterator as $item ) - { - if ( $item instanceof PHPUnit_Framework_TestSuite ) - { - $name = $item->getName(); - - if ( $name == '' ) - { - $name = '[No name given]'; - } - else - { - $name = explode( '::', $name ); - $name = array_pop( $name ); - } - - $this->maxLength = max( $this->maxLength, strlen( $name ) ); - $item->setName( $name ); - } - } - } - - if ( $this->depth > 0 ) - { - parent::write( "\n" ); - } - - if ( $this->depth == 1 ) - { - parent::write( "\n" ); - } - - parent::write( - str_pad( - str_repeat( ' ', $this->depth++ ) . $suite->getName() . ': ' , - 40, - ' ', - STR_PAD_RIGHT - ) - ); - } - - public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) - { - $this->depth--; - } - - protected function writeProgress( $progress ) - { - $this->write( $progress ); - } -} -?> Index: UnitTest/src/test/database_settings.php =================================================================== --- UnitTest/src/test/database_settings.php (revision 1175712) +++ UnitTest/src/test/database_settings.php (working copy) @@ -1,56 +0,0 @@ -<?php -/** - * File containing the ezcTestDatabaseSettings class. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -/** - * This class represents the structure of all the database settings. - * - * @package UnitTest - * @version //autogentag// - */ -class ezcTestDatabaseSettings -{ - public $dsn; - - public $phptype; - - public $dbsyntax; - - public $username; - - public $password; - - public $protocol; - - public $hostspec; - - public $port; - - public $socket; - - public $database; -} -?> Index: UnitTest/src/bootstrap.php =================================================================== --- UnitTest/src/bootstrap.php (revision 1175712) +++ UnitTest/src/bootstrap.php (working copy) @@ -1,52 +0,0 @@ -<?php -/** - * File contaning the bootstrap script for the Zeta Components test runner. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -// All errors must be reported -$currentErrorLevel = error_reporting(); -if ( ! ( $currentErrorLevel == -1 || $currentErrorLevel == ( E_ALL | E_STRICT ) ) ) -{ - echo "Your error reporting setting is not E_ALL | E_STRICT, please change\nthis in your php.ini.\n"; - die(); -} - -ini_set( 'include_path', getcwd(). PATH_SEPARATOR . dirname( __FILE__ ) . '/../..' . PATH_SEPARATOR . ini_get( 'include_path' ) ); - -require_once 'Base/src/base.php'; - -function ezc_autoload( $className ) -{ - if ( strpos( $className, '_' ) !== false ) - { - $file = str_replace( '_', '/', $className ) . '.php'; - @$val = require_once( $file ); - return $val === true; - } - ezcBase::autoload( $className ); -} - -spl_autoload_register( 'ezc_autoload' ); -?> Index: UnitTest/src/constraint/image.php =================================================================== --- UnitTest/src/constraint/image.php (revision 1175712) +++ UnitTest/src/constraint/image.php (working copy) @@ -23,7 +23,6 @@ * @version //autogentag// * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); /** * Constraint class for image comparison. Index: UnitTest/src/runtests.php =================================================================== --- UnitTest/src/runtests.php (revision 1175712) +++ UnitTest/src/runtests.php (working copy) @@ -1,43 +0,0 @@ -#!/usr/bin/env php -<?php -/** - * File contaning the execution script for the Zeta Components test runner. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package UnitTest - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ -require_once 'PHPUnit/Autoload.php'; - -$version = PHPUnit_Runner_Version::id(); - -if ( version_compare( $version, '3.5.0' ) == -1 && $version !== '@package_version@' ) -{ - die( "PHPUnit 3.5.0 (or later) is required to run this test suite.\n" ); -} - -require_once 'PHP/CodeCoverage.php'; -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( __FILE__, 'PHPUNIT' ); - -require_once 'bootstrap.php'; - -$runner = new ezcTestRunner; -$runner->run($_SERVER['argv']); -?> Index: UnitTest/src/test_autoload.php =================================================================== --- UnitTest/src/test_autoload.php (revision 1175712) +++ UnitTest/src/test_autoload.php (working copy) @@ -28,12 +28,8 @@ return array( 'ezcTestCase' => 'UnitTest/test/case.php', 'ezcTestConstraintSimilarImage' => 'UnitTest/constraint/image.php', - 'ezcTestDatabaseSettings' => 'UnitTest/test/database_settings.php', 'ezcTestImageCase' => 'UnitTest/test/image_case.php', - 'ezcTestPrinter' => 'UnitTest/test/printer.php', 'ezcTestRegressionSuite' => 'UnitTest/regression_suite.php', 'ezcTestRegressionTest' => 'UnitTest/regression_test.php', - 'ezcTestRunner' => 'UnitTest/test/runner.php', - 'ezcTestSettings' => 'UnitTest/test/settings.php', ); ?> Index: WorkflowEventLogTiein/tests/suite.php =================================================================== --- WorkflowEventLogTiein/tests/suite.php (revision 1175712) +++ WorkflowEventLogTiein/tests/suite.php (working copy) @@ -1,48 +0,0 @@ -<?php -/** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * @package WorkflowEventLogTiein - * @subpackage Tests - * @version //autogentag// - * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 - */ - -require_once 'listener_test.php'; - -/** - * @package WorkflowEventLogTiein - * @subpackage Tests - */ -class ezcWorkflowEventLogTieinSuite extends PHPUnit_Framework_TestSuite -{ - public function __construct() - { - parent::__construct(); - $this->setName( 'WorkflowEventLogTiein' ); - - $this->addTest( ezcWorkflowEventLogTieinListenerTest::suite() ); - } - - public static function suite() - { - return new ezcWorkflowEventLogTieinSuite; - } -} -?> Index: Document/tests/odt/suite.php =================================================================== --- Document/tests/odt/suite.php (revision 1175712) +++ Document/tests/odt/suite.php (working copy) @@ -42,13 +42,6 @@ require_once 'style_extractor_test.php'; require_once 'meta_generator_test.php'; -/** - * This file is not in use, yet, therefore not tested. - */ -PHP_CodeCoverage::getInstance()->filter()->addFileToBlacklist( - dirname( __FILE__ ) . '/../../src/document/xml/odt/filter/element/html_table.php' -); - class ezcDocumentOdtSuite extends PHPUnit_Framework_TestSuite { public static function suite()
