From 26e749a5d35ef655540df1123a20b5eb1ce65132 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Tue, 29 Sep 2009 09:32:35 -0400 Subject: [PATCH] Require PHPUnit/Framework.php and put autoloading back in its original place --- framework/Http/test/Horde/Http/AllTests.php | 6 +++--- framework/Injector/test/Horde/Injector/AllTests.php | 9 ++++++--- framework/Log/test/Horde/Log/AllTests.php | 9 ++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/framework/Http/test/Horde/Http/AllTests.php b/framework/Http/test/Horde/Http/AllTests.php index aba389695..e2aadf5aa 100644 --- a/framework/Http/test/Horde/Http/AllTests.php +++ b/framework/Http/test/Horde/Http/AllTests.php @@ -11,11 +11,11 @@ if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'Horde_Http_AllTests::main'); } -require_once 'PHPUnit/Framework/TestSuite.php'; +require_once 'PHPUnit/Framework.php'; require_once 'PHPUnit/TextUI/TestRunner.php'; -class Horde_Http_AllTests { - +class Horde_Http_AllTests +{ public static function main() { PHPUnit_TextUI_TestRunner::run(self::suite()); diff --git a/framework/Injector/test/Horde/Injector/AllTests.php b/framework/Injector/test/Horde/Injector/AllTests.php index dc49faa5d..0bbbf8726 100644 --- a/framework/Injector/test/Horde/Injector/AllTests.php +++ b/framework/Injector/test/Horde/Injector/AllTests.php @@ -8,9 +8,8 @@ if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'Horde_Injector_AllTests::main'); } -if (!spl_autoload_functions()) { - spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); -} +require_once 'PHPUnit/Framework.php'; +require_once 'PHPUnit/TextUI/TestRunner.php'; class Horde_Injector_AllTests { @@ -21,7 +20,11 @@ class Horde_Injector_AllTests public static function suite() { + if (!spl_autoload_functions()) { + spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); + } set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path()); + $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Injector'); $basedir = dirname(__FILE__); diff --git a/framework/Log/test/Horde/Log/AllTests.php b/framework/Log/test/Horde/Log/AllTests.php index 33d1f95dc..be00b3767 100644 --- a/framework/Log/test/Horde/Log/AllTests.php +++ b/framework/Log/test/Horde/Log/AllTests.php @@ -18,9 +18,8 @@ if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'Horde_Log_AllTests::main'); } -if (!spl_autoload_functions()) { - spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); -} +require_once 'PHPUnit/Framework.php'; +require_once 'PHPUnit/TextUI/TestRunner.php'; /** * @category Horde @@ -40,7 +39,11 @@ class Horde_Log_AllTests public static function suite() { + if (!spl_autoload_functions()) { + spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); @include_once "$filename.php";')); + } set_include_path(dirname(__FILE__) . '/../../../lib' . PATH_SEPARATOR . get_include_path()); + $suite = new PHPUnit_Framework_TestSuite('Horde_Log'); $basedir = dirname(__FILE__); -- 2.11.0