From 3a08925b798a5a5869b60f4d8300a14c879d0b52 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 6 Dec 2021 11:27:06 +0100 Subject: [PATCH] MDL-73278 phpunit: Fix namespaces for the renamed classes Within the renamed classes in the previous commit, there were a few incorrect namespace, this commit fixes all them to be correct component[\api] ones. Also fix a few incorrect leading backslashes in namespace/use statements. And tests extending renamed tests. --- ..._content_item_readonly_repository_test.php | 2 +- course/tests/category_hooks_test.php | 3 ++- .../content_item_readonly_repository_test.php | 2 +- course/tests/content_item_test.php | 2 +- course/tests/course_image_cache_test.php | 2 +- course/tests/course_summary_exporter_test.php | 2 +- course/tests/exporters_content_item_test.php | 2 +- course/tests/exporters_content_items_test.php | 2 +- course/tests/fixtures/mock_hooks.php | 22 ++++++++++--------- .../services_content_item_service_test.php | 6 ++--- .../form/guide/tests/generator_test.php | 2 +- .../form/rubric/tests/generator_test.php | 2 +- .../form/rubric/tests/privacy_test.php | 2 +- grade/grading/tests/generator_test.php | 2 +- .../feedback/comments/tests/privacy_test.php | 2 +- .../feedback/editpdf/tests/privacy_test.php | 2 +- .../feedback/file/tests/privacy_test.php | 2 +- .../comments/tests/privacy_test.php | 2 +- .../submission/file/tests/privacy_test.php | 2 +- .../onlinetext/tests/privacy_test.php | 2 +- .../tests/grades_forum_gradeitem_test.php | 2 +- mod/forum/tests/grades_gradeitems_test.php | 2 +- 22 files changed, 36 insertions(+), 33 deletions(-) diff --git a/course/tests/caching_content_item_readonly_repository_test.php b/course/tests/caching_content_item_readonly_repository_test.php index 19eb4a75a5c..ffb76c63901 100644 --- a/course/tests/caching_content_item_readonly_repository_test.php +++ b/course/tests/caching_content_item_readonly_repository_test.php @@ -22,7 +22,7 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); diff --git a/course/tests/category_hooks_test.php b/course/tests/category_hooks_test.php index 0281a7d9994..17d347a465c 100644 --- a/course/tests/category_hooks_test.php +++ b/course/tests/category_hooks_test.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); @@ -31,6 +31,7 @@ global $CFG; require_once($CFG->dirroot . '/course/tests/fixtures/mock_hooks.php'); use PHPUnit\Framework\MockObject\MockObject; +use core_course\test\mock_hooks; /** * Functional test for class core_course_category methods invoking hooks. diff --git a/course/tests/content_item_readonly_repository_test.php b/course/tests/content_item_readonly_repository_test.php index 2375adcea10..e055209f85e 100644 --- a/course/tests/content_item_readonly_repository_test.php +++ b/course/tests/content_item_readonly_repository_test.php @@ -22,7 +22,7 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); diff --git a/course/tests/content_item_test.php b/course/tests/content_item_test.php index 5a2cc5920a0..172d7c1a879 100644 --- a/course/tests/content_item_test.php +++ b/course/tests/content_item_test.php @@ -22,7 +22,7 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); diff --git a/course/tests/course_image_cache_test.php b/course/tests/course_image_cache_test.php index 4056092e1ae..c3fffd79c21 100644 --- a/course/tests/course_image_cache_test.php +++ b/course/tests/course_image_cache_test.php @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -namespace tests\core_course; +namespace core_course; use context_user; use context_course; diff --git a/course/tests/course_summary_exporter_test.php b/course/tests/course_summary_exporter_test.php index 13345301d39..b9fb8f120d0 100644 --- a/course/tests/course_summary_exporter_test.php +++ b/course/tests/course_summary_exporter_test.php @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -namespace tests\core_course; +namespace core_course; use core_course\external\course_summary_exporter; use context_user; diff --git a/course/tests/exporters_content_item_test.php b/course/tests/exporters_content_item_test.php index 4d213e911bf..5b239c09b9c 100644 --- a/course/tests/exporters_content_item_test.php +++ b/course/tests/exporters_content_item_test.php @@ -22,7 +22,7 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); diff --git a/course/tests/exporters_content_items_test.php b/course/tests/exporters_content_items_test.php index 42908044e62..9e4b6db53be 100644 --- a/course/tests/exporters_content_items_test.php +++ b/course/tests/exporters_content_items_test.php @@ -22,7 +22,7 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); diff --git a/course/tests/fixtures/mock_hooks.php b/course/tests/fixtures/mock_hooks.php index d5fc095ef8c..b1bc5bcdfd5 100644 --- a/course/tests/fixtures/mock_hooks.php +++ b/course/tests/fixtures/mock_hooks.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_course { +namespace core_course\test { /** * Class mock_hooks @@ -129,13 +129,15 @@ namespace tests\core_course { namespace { + use core_course\test\mock_hooks; + /** * Test pre_course_category_delete callback. * * @param object $category */ function tool_unittest_pre_course_category_delete(object $category) { - \tests\core_course\mock_hooks::set_calling_arguments(func_get_args()); + mock_hooks::set_calling_arguments(func_get_args()); } /** @@ -145,7 +147,7 @@ namespace { * @param core_course_category $newcategory */ function tool_unittest_pre_course_category_delete_move(core_course_category $category, core_course_category $newcategory) { - \tests\core_course\mock_hooks::set_calling_arguments(func_get_args()); + mock_hooks::set_calling_arguments(func_get_args()); } /** @@ -155,8 +157,8 @@ namespace { * @return bool */ function tool_unittest_can_course_category_delete(core_course_category $category) { - \tests\core_course\mock_hooks::set_calling_arguments(func_get_args()); - return \tests\core_course\mock_hooks::get_can_course_category_delete_return(); + mock_hooks::set_calling_arguments(func_get_args()); + return mock_hooks::get_can_course_category_delete_return(); } /** @@ -167,8 +169,8 @@ namespace { * @return bool */ function tool_unittest_can_course_category_delete_move(core_course_category $category, core_course_category $newcategory) { - \tests\core_course\mock_hooks::set_calling_arguments(func_get_args()); - return \tests\core_course\mock_hooks::get_can_course_category_delete_move_return(); + mock_hooks::set_calling_arguments(func_get_args()); + return mock_hooks::get_can_course_category_delete_move_return(); } /** @@ -178,7 +180,7 @@ namespace { * @return string */ function tool_unittest_get_course_category_contents(core_course_category $category) { - \tests\core_course\mock_hooks::set_calling_arguments(func_get_args()); - return \tests\core_course\mock_hooks::get_get_course_category_contents_return(); + mock_hooks::set_calling_arguments(func_get_args()); + return mock_hooks::get_get_course_category_contents_return(); } -} \ No newline at end of file +} diff --git a/course/tests/services_content_item_service_test.php b/course/tests/services_content_item_service_test.php index c92d79167b6..edccbd4d66b 100644 --- a/course/tests/services_content_item_service_test.php +++ b/course/tests/services_content_item_service_test.php @@ -22,12 +22,12 @@ * @copyright 2020 Jake Dallimore * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\course; +namespace core_course; defined('MOODLE_INTERNAL') || die(); -use \core_course\local\service\content_item_service; -use \core_course\local\repository\content_item_readonly_repository; +use core_course\local\service\content_item_service; +use core_course\local\repository\content_item_readonly_repository; /** * The tests for the content_item_service class. diff --git a/grade/grading/form/guide/tests/generator_test.php b/grade/grading/form/guide/tests/generator_test.php index dce0a7a1e5d..950c98f5743 100644 --- a/grade/grading/form/guide/tests/generator_test.php +++ b/grade/grading/form/guide/tests/generator_test.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\gradingform_guide; +namespace gradingform_guide; use context_module; use gradingform_controller; diff --git a/grade/grading/form/rubric/tests/generator_test.php b/grade/grading/form/rubric/tests/generator_test.php index 9d06272b546..44b4f439a63 100644 --- a/grade/grading/form/rubric/tests/generator_test.php +++ b/grade/grading/form/rubric/tests/generator_test.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\gradingform_rubric; +namespace gradingform_rubric; use advanced_testcase; use context_module; diff --git a/grade/grading/form/rubric/tests/privacy_test.php b/grade/grading/form/rubric/tests/privacy_test.php index 696a91d3ca0..6705ed38de3 100644 --- a/grade/grading/form/rubric/tests/privacy_test.php +++ b/grade/grading/form/rubric/tests/privacy_test.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\gradingform_rubric; +namespace gradingform_rubric; use core_privacy\tests\provider_testcase; use core_privacy\local\request\writer; diff --git a/grade/grading/tests/generator_test.php b/grade/grading/tests/generator_test.php index 497057fc878..8b7eb5a5d36 100644 --- a/grade/grading/tests/generator_test.php +++ b/grade/grading/tests/generator_test.php @@ -23,7 +23,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\core_grading; +namespace core_grading; use advanced_testcase; use context_module; diff --git a/mod/assign/feedback/comments/tests/privacy_test.php b/mod/assign/feedback/comments/tests/privacy_test.php index d89b1958bba..c2707f0ee85 100644 --- a/mod/assign/feedback/comments/tests/privacy_test.php +++ b/mod/assign/feedback/comments/tests/privacy_test.php @@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignfeedback_comments_privacy_testcase extends \mod_assign\tests\privacy_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/feedback/editpdf/tests/privacy_test.php b/mod/assign/feedback/editpdf/tests/privacy_test.php index cfd355eb84a..9b041976a2d 100644 --- a/mod/assign/feedback/editpdf/tests/privacy_test.php +++ b/mod/assign/feedback/editpdf/tests/privacy_test.php @@ -37,7 +37,7 @@ use \mod_assign\privacy\assign_plugin_request_data; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignfeedback_editpdf_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignfeedback_editpdf_privacy_testcase extends \mod_assign\tests\privacy_test { public function setUp(): void { // Skip this test if ghostscript is not supported. diff --git a/mod/assign/feedback/file/tests/privacy_test.php b/mod/assign/feedback/file/tests/privacy_test.php index 38bd49b77f7..c162dae2523 100644 --- a/mod/assign/feedback/file/tests/privacy_test.php +++ b/mod/assign/feedback/file/tests/privacy_test.php @@ -36,7 +36,7 @@ use mod_assign\privacy\assign_plugin_request_data; * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignfeedback_file_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignfeedback_file_privacy_testcase extends \mod_assign\tests\privacy_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/comments/tests/privacy_test.php b/mod/assign/submission/comments/tests/privacy_test.php index 1e9c02c4ba8..20fa6be382d 100644 --- a/mod/assign/submission/comments/tests/privacy_test.php +++ b/mod/assign/submission/comments/tests/privacy_test.php @@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignsubmission_comments_privacy_testcase extends \mod_assign\tests\privacy_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/file/tests/privacy_test.php b/mod/assign/submission/file/tests/privacy_test.php index 99dda2620f9..524e9cec7b6 100644 --- a/mod/assign/submission/file/tests/privacy_test.php +++ b/mod/assign/submission/file/tests/privacy_test.php @@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignsubmission_file_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignsubmission_file_privacy_testcase extends \mod_assign\tests\privacy_test { /** * Convenience function for creating feedback data. diff --git a/mod/assign/submission/onlinetext/tests/privacy_test.php b/mod/assign/submission/onlinetext/tests/privacy_test.php index ed7342c307a..aee80f7ceb6 100644 --- a/mod/assign/submission/onlinetext/tests/privacy_test.php +++ b/mod/assign/submission/onlinetext/tests/privacy_test.php @@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php'); * @copyright 2018 Adrian Greeve * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class assignsubmission_online_privacy_testcase extends \mod_assign\tests\mod_assign_privacy_testcase { +class assignsubmission_online_privacy_testcase extends \mod_assign\tests\privacy_test { /** * Convenience function for creating feedback data. diff --git a/mod/forum/tests/grades_forum_gradeitem_test.php b/mod/forum/tests/grades_forum_gradeitem_test.php index 7d2b7f6da9d..a7da3930c25 100644 --- a/mod/forum/tests/grades_forum_gradeitem_test.php +++ b/mod/forum/tests/grades_forum_gradeitem_test.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tests\mod_forum\grades; +namespace mod_forum\grade; use core_grades\component_gradeitem; use mod_forum\grades\forum_gradeitem as gradeitem; diff --git a/mod/forum/tests/grades_gradeitems_test.php b/mod/forum/tests/grades_gradeitems_test.php index 9b38bb6bb42..d3e2321bef0 100644 --- a/mod/forum/tests/grades_gradeitems_test.php +++ b/mod/forum/tests/grades_gradeitems_test.php @@ -25,7 +25,7 @@ declare(strict_types = 1); -namespace tests\mod_forum\grades; +namespace mod_forum\grade; use advanced_testcase; use core_grades\component_gradeitems;