L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-73278 phpunit: Fix namespaces for the renamed classes

Browse Source 
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.
This commit is contained in:
Eloy Lafuente (stronk7)
2021-12-07 23:54:34 +01:00
parent 2c30590d5d
commit 3a08925b79
22 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/tests/caching_content_item_readonly_repository_test.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tests\core_course;
namespace core_course;
defined('MOODLE_INTERNAL') || die();
course/tests/category_hooks_test.php
+2 -1
View File
@@ -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.
course/tests/content_item_readonly_repository_test.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tests\core_course;
namespace core_course;
defined('MOODLE_INTERNAL') || die();
course/tests/content_item_test.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tests\core_course;
namespace core_course;
defined('MOODLE_INTERNAL') || die();
course/tests/course_image_cache_test.php
+1 -1
View File
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tests\core_course;
namespace core_course;
use context_user;
use context_course;
course/tests/course_summary_exporter_test.php
+1 -1
View File
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace tests\core_course;
namespace core_course;
use core_course\external\course_summary_exporter;
use context_user;
course/tests/exporters_content_item_test.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tests\core_course;
namespace core_course;
defined('MOODLE_INTERNAL') || die();
course/tests/exporters_content_items_test.php
+1 -1
View File
@@ -22,7 +22,7 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace tests\core_course;
namespace core_course;
defined('MOODLE_INTERNAL') || die();
course/tests/fixtures/mock_hooks.php
Vendored
+12 -10
View File
@@ -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();
}
}
}
course/tests/services_content_item_service_test.php
+3 -3
View File
@@ -22,12 +22,12 @@
* @copyright 2020 Jake Dallimore <[email protected]>
* @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.
grade/grading/form/guide/tests/generator_test.php
+1 -1
View File
@@ -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;
grade/grading/form/rubric/tests/generator_test.php
+1 -1
View File
@@ -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;
grade/grading/form/rubric/tests/privacy_test.php
+1 -1
View File
@@ -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;
grade/grading/tests/generator_test.php
+1 -1
View File
@@ -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;
mod/assign/feedback/comments/tests/privacy_test.php
+1 -1
View File
@@ -34,7 +34,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/assign/feedback/editpdf/tests/privacy_test.php
+1 -1
View File
@@ -37,7 +37,7 @@ use \mod_assign\privacy\assign_plugin_request_data;
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/assign/feedback/file/tests/privacy_test.php
+1 -1
View File
@@ -36,7 +36,7 @@ use mod_assign\privacy\assign_plugin_request_data;
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/assign/submission/comments/tests/privacy_test.php
+1 -1
View File
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/assign/submission/file/tests/privacy_test.php
+1 -1
View File
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/assign/submission/onlinetext/tests/privacy_test.php
+1 -1
View File
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/mod/assign/tests/privacy_test.php');
* @copyright 2018 Adrian Greeve <[email protected]>
* @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.
mod/forum/tests/grades_forum_gradeitem_test.php
+1 -1
View File
@@ -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;
mod/forum/tests/grades_gradeitems_test.php
+1 -1
View File
@@ -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;