aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-14 01:32:34 -0400
committerNils Adermann <naderman@naderman.de>2013-07-14 01:32:34 -0400
commit7030578bbe9e11c18b5becaf8b06e670e3c2e3cd (patch)
treea260c846cb47713e72de11cfb9803d981ea6faaf /tests
parent4186c05bb4b97374392031a10b796e77b857afaf (diff)
downloadforums-7030578bbe9e11c18b5becaf8b06e670e3c2e3cd.tar
forums-7030578bbe9e11c18b5becaf8b06e670e3c2e3cd.tar.gz
forums-7030578bbe9e11c18b5becaf8b06e670e3c2e3cd.tar.bz2
forums-7030578bbe9e11c18b5becaf8b06e670e3c2e3cd.tar.xz
forums-7030578bbe9e11c18b5becaf8b06e670e3c2e3cd.zip
[ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
Diffstat (limited to 'tests')
-rw-r--r--tests/bootstrap.php4
-rw-r--r--tests/class_loader/class_loader_test.php10
-rw-r--r--tests/class_loader/phpbb/class_name.php (renamed from tests/class_loader/includes/class_name.php)0
-rw-r--r--tests/class_loader/phpbb/dir.php (renamed from tests/class_loader/includes/dir.php)0
-rw-r--r--tests/class_loader/phpbb/dir/class_name.php (renamed from tests/class_loader/includes/dir/class_name.php)0
-rw-r--r--tests/class_loader/phpbb/dir/subdir/class_name.php (renamed from tests/class_loader/includes/dir/subdir/class_name.php)0
-rw-r--r--tests/class_loader/phpbb/dir2/dir2.php (renamed from tests/class_loader/includes/dir2/dir2.php)0
-rw-r--r--tests/controller/controller_test.php2
-rw-r--r--tests/controller/phpbb/controller/foo.php (renamed from tests/controller/includes/controller/foo.php)0
-rw-r--r--tests/datetime/from_format_test.php3
-rw-r--r--tests/dbal/migrator_test.php2
-rw-r--r--tests/dbal/migrator_tool_config_test.php3
-rw-r--r--tests/dbal/migrator_tool_module_test.php2
-rw-r--r--tests/dbal/migrator_tool_permission_test.php2
-rw-r--r--tests/error_collector_test.php1
-rw-r--r--tests/extension/finder_test.php8
-rw-r--r--tests/extension/phpbb/default/implementation.php (renamed from tests/extension/includes/default/implementation.php)0
-rw-r--r--tests/log/function_view_log_test.php1
-rw-r--r--tests/upload/fileupload_test.php1
19 files changed, 13 insertions, 26 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a38740c82d..68cbb64c03 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -14,13 +14,13 @@ require_once $phpbb_root_path . 'includes/startup.php';
$table_prefix = 'phpbb_';
require_once $phpbb_root_path . 'includes/constants.php';
-require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
+require_once $phpbb_root_path . 'phpbb/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");
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'phpbb/', "php");
$phpbb_class_loader->register();
require_once 'test_framework/phpbb_test_case_helpers.php';
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index bf27c7c217..2b55c1ff8d 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -30,9 +30,9 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
public function test_resolve_path()
{
$prefix = dirname(__FILE__) . '/';
- $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/');
+ $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/');
- $prefix .= 'includes/';
+ $prefix .= 'phpbb/';
$this->assertEquals(
'',
@@ -71,10 +71,10 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
$cache = new phpbb_mock_cache($cache_map);
$prefix = dirname(__FILE__) . '/';
- $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache);
- $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', 'php', $cache);
+ $class_loader = new phpbb_class_loader('phpbb_', $prefix . 'phpbb/', 'php', $cache);
+ $class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'phpbb/', 'php', $cache);
- $prefix .= 'includes/';
+ $prefix .= 'phpbb/';
$this->assertEquals(
$prefix . 'dir/class_name.php',
diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/phpbb/class_name.php
index e941173cdd..e941173cdd 100644
--- a/tests/class_loader/includes/class_name.php
+++ b/tests/class_loader/phpbb/class_name.php
diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/phpbb/dir.php
index 1c8930d8e7..1c8930d8e7 100644
--- a/tests/class_loader/includes/dir.php
+++ b/tests/class_loader/phpbb/dir.php
diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/phpbb/dir/class_name.php
index 0675aa8fc5..0675aa8fc5 100644
--- a/tests/class_loader/includes/dir/class_name.php
+++ b/tests/class_loader/phpbb/dir/class_name.php
diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/phpbb/dir/subdir/class_name.php
index 7321a609cc..7321a609cc 100644
--- a/tests/class_loader/includes/dir/subdir/class_name.php
+++ b/tests/class_loader/phpbb/dir/subdir/class_name.php
diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/phpbb/dir2/dir2.php
index 01cf4086ff..01cf4086ff 100644
--- a/tests/class_loader/includes/dir2/dir2.php
+++ b/tests/class_loader/phpbb/dir2/dir2.php
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index c06bf7d548..dfc4f80469 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -59,7 +59,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
}
if (!class_exists('phpbb_controller_foo'))
{
- include(__DIR__.'/includes/controller/foo.php');
+ include(__DIR__.'/phpbb/controller/foo.php');
}
$resolver = new phpbb_controller_resolver(new phpbb_user, $container);
diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/phpbb/controller/foo.php
index 04576e16c4..04576e16c4 100644
--- a/tests/controller/includes/controller/foo.php
+++ b/tests/controller/phpbb/controller/foo.php
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
index c28925272e..2d97672878 100644
--- a/tests/datetime/from_format_test.php
+++ b/tests/datetime/from_format_test.php
@@ -7,9 +7,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/user.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/datetime.php';
require_once dirname(__FILE__) . '/../mock/lang.php';
class phpbb_datetime_from_format_test extends phpbb_test_case
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 1e40c9c6d6..07eb666e93 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -8,8 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migrator.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/migration.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
require_once dirname(__FILE__) . '/migration/dummy.php';
diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php
index 7d582f230b..b82d1ef48d 100644
--- a/tests/dbal/migrator_tool_config_test.php
+++ b/tests/dbal/migrator_tool_config_test.php
@@ -7,9 +7,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/config.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
-
class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case
{
public function setup()
diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 3303086b26..828fb76c65 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -8,8 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/module.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
{
diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php
index 438ab2b28e..79d9db66da 100644
--- a/tests/dbal/migrator_tool_permission_test.php
+++ b/tests/dbal/migrator_tool_permission_test.php
@@ -8,8 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/permission.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php';
class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
{
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
index d67dea3719..fceb8aa3d8 100644
--- a/tests/error_collector_test.php
+++ b/tests/error_collector_test.php
@@ -8,7 +8,6 @@
*/
require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
class phpbb_error_collector_test extends phpbb_test_case
{
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index 6f3cebbd7c..3bf2c42573 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -36,7 +36,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function test_suffix_get_classes()
{
$classes = $this->finder
- ->core_path('includes/default/')
+ ->core_path('phpbb/default/')
->extension_suffix('_class')
->get_classes();
@@ -81,7 +81,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function test_prefix_get_classes()
{
$classes = $this->finder
- ->core_path('includes/default/')
+ ->core_path('phpbb/default/')
->extension_prefix('hidden_')
->get_classes();
@@ -98,7 +98,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function test_directory_get_classes()
{
$classes = $this->finder
- ->core_path('includes/default/')
+ ->core_path('phpbb/default/')
->extension_directory('type')
->get_classes();
@@ -209,7 +209,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
public function test_cached_get_files()
{
$query = array(
- 'core_path' => 'includes/foo',
+ 'core_path' => 'phpbb/foo',
'core_suffix' => false,
'core_prefix' => false,
'core_directory' => 'bar',
diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/phpbb/default/implementation.php
index 91d5f8aa2f..91d5f8aa2f 100644
--- a/tests/extension/includes/default/implementation.php
+++ b/tests/extension/phpbb/default/implementation.php
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php
index 1ab9488568..6827aaa1b6 100644
--- a/tests/log/function_view_log_test.php
+++ b/tests/log/function_view_log_test.php
@@ -11,7 +11,6 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/../mock/cache.php';
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 1665c493be..8b9df33a63 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -10,6 +10,7 @@
require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+require_once __DIR__ . '/../mock/filespec.php';
class phpbb_fileupload_test extends phpbb_test_case
{
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-22 13:39:16 +0000