cvs: pear / AllTests.php /SOAP/test AllTests.php

cweiske Thu Jul 5 06:08:50 2007 UTC Modified files: /pear AllTests.php /pear/SOAP/test AllTests.php Log: Add SOAP dir to AllTests and make soap alltests compatible http://cvs.php.net/viewvc.cgi/pear/AllTests.php?r1=1.10&r2=1.11&diff_format=u Index: pear/AllTests.php diff -u pear/AllTests.php:1.10 pear/AllTests.php:1.11 --- pear/AllTests.php:1.10 Thu Jul 5 05:59:59 2007 +++ pear/AllTests.php Thu Jul 5 06:08:50 2007 @@ -69,6 +69,13 @@ ); /** + * Also historically incorrectly named test directories + */ + protected static $additional = array( + 'SOAP/test/AllTests.php' + ); + + /** * Directories that are not going to be in include_path */ protected static $noInclude = array( @@ -132,7 +139,7 @@ public static function getClasses() { chdir(dirname(__FILE__)); - $arFiles = glob('*/tests/AllTests.php'); + $arFiles = array_merge(glob('*/tests/AllTests.php'), self::$additional); $arClasses = array(); foreach ($arFiles as $strFile) { if (!in_array($strFile, self::$incompatible)) { http://cvs.php.net/viewvc.cgi/pear/SOAP/test/AllTests.php?r1=1.1&r2=1.2&diff_format=u Index: pear/SOAP/test/AllTests.php diff -u pear/SOAP/test/AllTests.php:1.1 pear/SOAP/test/AllTests.php:1.2 --- pear/SOAP/test/AllTests.php:1.1 Wed Jun 27 07:33:13 2007 +++ pear/SOAP/test/AllTests.php Thu Jul 5 06:08:50 2007 @@ -1,7 +1,6 @@ <?php if (!defined('PHPUnit_MAIN_METHOD')) { - define('PHPUnit_MAIN_METHOD', 'AllTests::main'); - chdir(dirname(__FILE__) . '/../'); + define('PHPUnit_MAIN_METHOD', 'SOAP_AllTests::main'); } if (!defined('PHPUnit_INSIDE_OWN_TESTSUITE')) { @@ -11,10 +10,11 @@ require_once 'PHPUnit/TextUI/TestRunner.php'; +chdir(dirname(__FILE__)); require_once 'SOAP_BugsTest.php'; -class AllTests +class SOAP_AllTests { public static function main() { @@ -24,7 +24,7 @@ public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('SOAP_BugsTest'); + $suite = new PHPUnit_Framework_TestSuite('SOAP Tests'); /** Add testsuites, if there is. */ $suite->addTestSuite('SOAP_BugsTest'); @@ -32,7 +32,7 @@ } } -if (PHPUnit_MAIN_METHOD == 'AllTests::main') { - AllTests::main(); +if (PHPUnit_MAIN_METHOD == 'SOAP_AllTests::main') { + SOAP_AllTests::main(); } ?> \ No newline at end of file