Merge branch 'ticket/igorw/9979' into develop

* ticket/igorw/9979:
  [ticket/9979] Support autoloading in unit tests
This commit is contained in:
Igor Wiedler 2011-01-09 23:12:41 +01:00
commit 5373f8157d
7 changed files with 16 additions and 16 deletions

View file

@ -26,6 +26,10 @@ else
} }
require_once $phpbb_root_path . 'includes/constants.php'; require_once $phpbb_root_path . 'includes/constants.php';
require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
$class_loader->register();
require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_test_case.php';

View file

@ -14,6 +14,18 @@ require_once __DIR__ . '/../../phpBB/includes/class_loader.php';
class phpbb_class_loader_test extends PHPUnit_Framework_TestCase class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
{ {
public function setUp()
{
global $class_loader;
$class_loader->unregister();
}
public function tearDown()
{
global $class_loader;
$class_loader->register();
}
public function test_resolve_path() public function test_resolve_path()
{ {
$prefix = __DIR__ . '/'; $prefix = __DIR__ . '/';

View file

@ -8,9 +8,6 @@
* *
*/ */
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
class phpbb_deactivated_super_global_test extends phpbb_test_case class phpbb_deactivated_super_global_test extends phpbb_test_case
{ {
/** /**

View file

@ -8,11 +8,6 @@
* *
*/ */
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
require_once __DIR__ . '/../../phpBB/includes/request/request.php';
class phpbb_request_test extends phpbb_test_case class phpbb_request_test extends phpbb_test_case
{ {
private $type_cast_helper; private $type_cast_helper;

View file

@ -7,11 +7,6 @@
* *
*/ */
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
require_once __DIR__ . '/../../phpBB/includes/request/deactivated_super_global.php';
require_once __DIR__ . '/../../phpBB/includes/request/interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/request.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php'; require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';

View file

@ -9,8 +9,6 @@
*/ */
require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper_interface.php';
require_once __DIR__ . '/../../phpBB/includes/request/type_cast_helper.php';
class phpbb_type_cast_helper_test extends phpbb_test_case class phpbb_type_cast_helper_test extends phpbb_test_case
{ {

View file

@ -8,7 +8,6 @@
*/ */
require_once __DIR__ . '/base.php'; require_once __DIR__ . '/base.php';
require_once __DIR__ . '/../../phpBB/includes/functions.php'; require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/session.php'; require_once __DIR__ . '/../../phpBB/includes/session.php';