From 132282634ff746c6c4627b87e307df3748f7bbd9 Mon Sep 17 00:00:00 2001 From: JoshyPHP Date: Fri, 29 May 2015 17:36:06 +0200 Subject: [PATCH] [ticket/13803] Moved tests to a subdir PHPBB3-13803 --- .../text_reparser/{ => plugins}/contact_admin_info_test.php | 6 +++--- .../{ => plugins}/fixtures/contact_admin_info.xml | 0 tests/text_reparser/{ => plugins}/fixtures/forums.xml | 0 tests/text_reparser/{ => plugins}/fixtures/groups.xml | 0 tests/text_reparser/{ => plugins}/fixtures/poll_options.xml | 0 tests/text_reparser/{ => plugins}/fixtures/polls.xml | 0 tests/text_reparser/{ => plugins}/fixtures/posts.xml | 0 tests/text_reparser/{ => plugins}/fixtures/privmsgs.xml | 0 tests/text_reparser/{ => plugins}/fixtures/users.xml | 0 .../text_reparser/{ => plugins}/forum_description_test.php | 0 tests/text_reparser/{ => plugins}/forum_rules_test.php | 0 .../text_reparser/{ => plugins}/group_description_test.php | 0 tests/text_reparser/{ => plugins}/pm_text_test.php | 0 tests/text_reparser/{ => plugins}/poll_option_test.php | 6 +++--- tests/text_reparser/{ => plugins}/poll_title_test.php | 0 tests/text_reparser/{ => plugins}/post_text_test.php | 0 tests/text_reparser/{ => plugins}/test_row_based_plugin.php | 6 +++--- tests/text_reparser/{ => plugins}/user_signature_test.php | 0 18 files changed, 9 insertions(+), 9 deletions(-) rename tests/text_reparser/{ => plugins}/contact_admin_info_test.php (89%) rename tests/text_reparser/{ => plugins}/fixtures/contact_admin_info.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/forums.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/groups.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/poll_options.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/polls.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/posts.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/privmsgs.xml (100%) rename tests/text_reparser/{ => plugins}/fixtures/users.xml (100%) rename tests/text_reparser/{ => plugins}/forum_description_test.php (100%) rename tests/text_reparser/{ => plugins}/forum_rules_test.php (100%) rename tests/text_reparser/{ => plugins}/group_description_test.php (100%) rename tests/text_reparser/{ => plugins}/pm_text_test.php (100%) rename tests/text_reparser/{ => plugins}/poll_option_test.php (91%) rename tests/text_reparser/{ => plugins}/poll_title_test.php (100%) rename tests/text_reparser/{ => plugins}/post_text_test.php (100%) rename tests/text_reparser/{ => plugins}/test_row_based_plugin.php (93%) rename tests/text_reparser/{ => plugins}/user_signature_test.php (100%) diff --git a/tests/text_reparser/contact_admin_info_test.php b/tests/text_reparser/plugins/contact_admin_info_test.php similarity index 89% rename from tests/text_reparser/contact_admin_info_test.php rename to tests/text_reparser/plugins/contact_admin_info_test.php index 5cccdfa4d5..e577d2fd3d 100644 --- a/tests/text_reparser/contact_admin_info_test.php +++ b/tests/text_reparser/plugins/contact_admin_info_test.php @@ -10,9 +10,9 @@ * the docs/CREDITS.txt file. * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; -require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; -require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions_content.php'; +require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php'; class phpbb_textreparser_contact_admin_info_test extends phpbb_database_test_case { diff --git a/tests/text_reparser/fixtures/contact_admin_info.xml b/tests/text_reparser/plugins/fixtures/contact_admin_info.xml similarity index 100% rename from tests/text_reparser/fixtures/contact_admin_info.xml rename to tests/text_reparser/plugins/fixtures/contact_admin_info.xml diff --git a/tests/text_reparser/fixtures/forums.xml b/tests/text_reparser/plugins/fixtures/forums.xml similarity index 100% rename from tests/text_reparser/fixtures/forums.xml rename to tests/text_reparser/plugins/fixtures/forums.xml diff --git a/tests/text_reparser/fixtures/groups.xml b/tests/text_reparser/plugins/fixtures/groups.xml similarity index 100% rename from tests/text_reparser/fixtures/groups.xml rename to tests/text_reparser/plugins/fixtures/groups.xml diff --git a/tests/text_reparser/fixtures/poll_options.xml b/tests/text_reparser/plugins/fixtures/poll_options.xml similarity index 100% rename from tests/text_reparser/fixtures/poll_options.xml rename to tests/text_reparser/plugins/fixtures/poll_options.xml diff --git a/tests/text_reparser/fixtures/polls.xml b/tests/text_reparser/plugins/fixtures/polls.xml similarity index 100% rename from tests/text_reparser/fixtures/polls.xml rename to tests/text_reparser/plugins/fixtures/polls.xml diff --git a/tests/text_reparser/fixtures/posts.xml b/tests/text_reparser/plugins/fixtures/posts.xml similarity index 100% rename from tests/text_reparser/fixtures/posts.xml rename to tests/text_reparser/plugins/fixtures/posts.xml diff --git a/tests/text_reparser/fixtures/privmsgs.xml b/tests/text_reparser/plugins/fixtures/privmsgs.xml similarity index 100% rename from tests/text_reparser/fixtures/privmsgs.xml rename to tests/text_reparser/plugins/fixtures/privmsgs.xml diff --git a/tests/text_reparser/fixtures/users.xml b/tests/text_reparser/plugins/fixtures/users.xml similarity index 100% rename from tests/text_reparser/fixtures/users.xml rename to tests/text_reparser/plugins/fixtures/users.xml diff --git a/tests/text_reparser/forum_description_test.php b/tests/text_reparser/plugins/forum_description_test.php similarity index 100% rename from tests/text_reparser/forum_description_test.php rename to tests/text_reparser/plugins/forum_description_test.php diff --git a/tests/text_reparser/forum_rules_test.php b/tests/text_reparser/plugins/forum_rules_test.php similarity index 100% rename from tests/text_reparser/forum_rules_test.php rename to tests/text_reparser/plugins/forum_rules_test.php diff --git a/tests/text_reparser/group_description_test.php b/tests/text_reparser/plugins/group_description_test.php similarity index 100% rename from tests/text_reparser/group_description_test.php rename to tests/text_reparser/plugins/group_description_test.php diff --git a/tests/text_reparser/pm_text_test.php b/tests/text_reparser/plugins/pm_text_test.php similarity index 100% rename from tests/text_reparser/pm_text_test.php rename to tests/text_reparser/plugins/pm_text_test.php diff --git a/tests/text_reparser/poll_option_test.php b/tests/text_reparser/plugins/poll_option_test.php similarity index 91% rename from tests/text_reparser/poll_option_test.php rename to tests/text_reparser/plugins/poll_option_test.php index 669d859f9a..e043858597 100644 --- a/tests/text_reparser/poll_option_test.php +++ b/tests/text_reparser/plugins/poll_option_test.php @@ -10,9 +10,9 @@ * the docs/CREDITS.txt file. * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; -require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; -require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions_content.php'; +require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php'; class phpbb_textreparser_poll_option_test extends phpbb_database_test_case { diff --git a/tests/text_reparser/poll_title_test.php b/tests/text_reparser/plugins/poll_title_test.php similarity index 100% rename from tests/text_reparser/poll_title_test.php rename to tests/text_reparser/plugins/poll_title_test.php diff --git a/tests/text_reparser/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php similarity index 100% rename from tests/text_reparser/post_text_test.php rename to tests/text_reparser/plugins/post_text_test.php diff --git a/tests/text_reparser/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php similarity index 93% rename from tests/text_reparser/test_row_based_plugin.php rename to tests/text_reparser/plugins/test_row_based_plugin.php index 489dff280b..befcb48bda 100644 --- a/tests/text_reparser/test_row_based_plugin.php +++ b/tests/text_reparser/plugins/test_row_based_plugin.php @@ -10,9 +10,9 @@ * the docs/CREDITS.txt file. * */ -require_once __DIR__ . '/../../phpBB/includes/functions.php'; -require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; -require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../../phpBB/includes/functions_content.php'; +require_once __DIR__ . '/../../test_framework/phpbb_database_test_case.php'; abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_test_case { diff --git a/tests/text_reparser/user_signature_test.php b/tests/text_reparser/plugins/user_signature_test.php similarity index 100% rename from tests/text_reparser/user_signature_test.php rename to tests/text_reparser/plugins/user_signature_test.php