makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-bantu/ticket/10973' into develop

Browse source 
* github-bantu/ticket/10973:
  [ticket/10973] Drop all require_once for mocks. Use autoloading.
  [ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.

Conflicts:
	tests/bbcode/url_bbcode_test.php
	tests/text_processing/censor_text_test.php
This commit is contained in:
Nils Adermann 2012-07-08 23:12:22 +02:00
commit 9f0259c473
20 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/bbcode/url_bbcode_test.php
View file

@ -11,8 +11,6 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/../mock/request.php';
class phpbb_url_bbcode_test extends phpbb_test_case
{

2
tests/bootstrap.php
View file

@ -16,6 +16,8 @@ $table_prefix = 'phpbb_';
require_once $phpbb_root_path . 'includes/constants.php';
require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
$phpbb_class_loader_mock = new phpbb_class_loader('phpbb_mock_', $phpbb_root_path . '../tests/mock/', ".php");
$phpbb_class_loader_mock->register();
$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".php");
$phpbb_class_loader_ext->register();
$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".php");

2
tests/class_loader/class_loader_test.php
View file

@ -7,8 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
{
public function setUp()

2
tests/config/db_test.php
View file

@ -7,8 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
class phpbb_config_db_test extends phpbb_database_test_case
{
private $cache;

1
tests/cron/manager_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/extension_manager.php';
require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php';
require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php';
require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php';

2
tests/cron/task_provider_test.php
View file

@ -7,8 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/extension_manager.php';
class phpbb_cron_task_provider_test extends PHPUnit_Framework_TestCase
{
public function setUp()

1
tests/download/http_byte_range_test.php
View file

@ -8,7 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php';
require_once dirname(__FILE__) . '/../mock/request.php';
class phpbb_download_http_byte_range_test extends phpbb_test_case
{

3
tests/extension/finder_test.php
View file

@ -7,9 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/../mock/extension_manager.php';
class phpbb_extension_finder_test extends phpbb_test_case
{
protected $extension_manager;

1
tests/extension/manager_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/ext/bar/ext.php';
require_once dirname(__FILE__) . '/ext/foo/ext.php';
require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php';

1
tests/functions_acp/build_cfg_template_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case

1
tests/functions_acp/build_select_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
class phpbb_functions_acp_built_select_test extends phpbb_test_case

1
tests/functions_acp/h_radio_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
class phpbb_functions_acp_h_radio_test extends phpbb_test_case

1
tests/functions_acp/validate_config_vars_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case

1
tests/functions_acp/validate_range_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/lang.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';

2
tests/security/base.php
View file

@ -7,8 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/request.php';
abstract class phpbb_security_test_base extends phpbb_test_case
{
/**

1
tests/session/continue_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/testable_factory.php';
class phpbb_session_continue_test extends phpbb_database_test_case

1
tests/session/init_test.php
View file

@ -7,7 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/testable_factory.php';
class phpbb_session_init_test extends phpbb_database_test_case

3
tests/session/testable_factory.php
View file

@ -7,9 +7,6 @@
*
*/
require_once dirname(__FILE__) . '/../mock/request.php';
require_once dirname(__FILE__) . '/../mock/session_testable.php';
/**
* This class exists to setup an instance of phpbb's session class for testing.
*

1
tests/template/template_test_case.php
View file

@ -8,7 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../mock/extension_manager.php';
class phpbb_template_template_test_case extends phpbb_test_case
{

2
tests/text_processing/censor_text_test.php
View file

@ -9,8 +9,6 @@
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/../mock/cache.php';
class phpbb_text_processing_censor_text_test extends phpbb_test_case
{